Skip to content

Commit

Permalink
Fix gh actions
Browse files Browse the repository at this point in the history
  • Loading branch information
Gagaro committed Apr 12, 2021
1 parent 6bd46e2 commit f2d4216
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/python-app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- django_version: '3.1'
python_version: '3.5'

- django_version: '3.1'
- django_version: '3.2'
python_version: '3.5'
include:
- django_version: '2.2'
Expand Down Expand Up @@ -66,7 +66,7 @@ jobs:
sudo apt-get install -y libproj-dev libgeos-dev gdal-bin libgdal-dev
python -m pip install --upgrade pip
pip install -U flake8 coveralls psycopg2-binary argparse
pip install -U Django~=${{ matrix.django_version }}
pip install -U Django~=${{ matrix.django_version }}.0
- name: Lint with flake8
run: |
flake8 --ignore=E501,W504 leaflet
Expand Down
5 changes: 4 additions & 1 deletion leaflet/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
from collections import OrderedDict
from distutils.version import LooseVersion
from urllib.parse import urlparse

import django
from django.conf import settings
from django.core.exceptions import ImproperlyConfigured
from django.templatetags.static import static
Expand Down Expand Up @@ -182,4 +184,5 @@ def _normalize_plugins_config():
PLUGINS['__is_normalized__'] = True


default_app_config = 'leaflet.apps.LeafletConfig'
if LooseVersion(django.__version__) < LooseVersion('3.2'):
default_app_config = 'leaflet.apps.LeafletConfig'
8 changes: 4 additions & 4 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ envlist =
[testenv]
commands = python -W error::DeprecationWarning -W error::PendingDeprecationWarning -m coverage run ./quicktest.py leaflet --db={env:DATABASE:}
deps =
django22: Django~=2.2
django30: Django~=3.0
django31: Django~=3.1
django32: Django~=3.2
django22: Django~=2.2.0
django30: Django~=3.0.0
django31: Django~=3.1.0
django32: Django~=3.2.0
djangomain: https://github.com/django/django/archive/main.tar.gz
postgres: psycopg2-binary
coverage
Expand Down

0 comments on commit f2d4216

Please sign in to comment.