Skip to content

Commit

Permalink
Merge branch 'release/0.3.60' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
erikvw committed Mar 27, 2024
2 parents 3c04360 + 62a79d8 commit 3090ed9
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 20 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ jobs:
sudo apt-get -y update
sudo apt-get install libcups2-dev wamerican
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

Expand All @@ -48,7 +48,7 @@ jobs:
echo "dir=$(pip cache dir)" >>$GITHUB_OUTPUT
- name: Cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ${{ steps.pip-cache.outputs.dir }}
key:
Expand Down
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ repos:
- "-x *test*.py"

- repo: https://github.com/psf/black
rev: 24.1.1
rev: 24.2.0
hooks:
- id: black
language_version: python3.10
language_version: python3.11

- repo: https://github.com/pycqa/flake8
rev: 7.0.0
Expand Down Expand Up @@ -42,7 +42,7 @@ repos:
- id: detect-private-key

- repo: https://github.com/adrienverge/yamllint
rev: v1.33.0
rev: v1.34.0
hooks:
- id: yamllint
args:
Expand Down
28 changes: 14 additions & 14 deletions edc_dashboard/__init__.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
from importlib.metadata import version

__version__ = version("edc_dashboard")

from django.conf import settings
from django.core.exceptions import ImproperlyConfigured

from .url_config import UrlConfig
from .url_names import url_names
from .utils import insert_bootstrap_version, select_edc_template

name = "edc_dashboard.middleware.DashboardMiddleware"
if name not in settings.MIDDLEWARE:
raise ImproperlyConfigured(f"Missing middleware. Expected {name}.")
# from importlib.metadata import version
#
# __version__ = version("edc_dashboard")
#
# from django.conf import settings
# from django.core.exceptions import ImproperlyConfigured
#
# from .url_config import UrlConfig
# from .url_names import url_names
# from .utils import insert_bootstrap_version, select_edc_template
#
# name = "edc_dashboard.middleware.DashboardMiddleware"
# if name not in settings.MIDDLEWARE:
# raise ImproperlyConfigured(f"Missing middleware. Expected {name}.")

0 comments on commit 3090ed9

Please sign in to comment.