Skip to content

Commit

Permalink
[deps] Added support for Django 4.1.0 and 4.2.0
Browse files Browse the repository at this point in the history
- Dropped support for Python 3.7
- Dropped support for Django 3.0 and 3.1
- Added support for Python 3.10
- Bumped django-leaflet~=0.28.0
- Bumped Pillow~=9.4.0
- Bumped geopy~=2.2.0
  • Loading branch information
pandafy committed Jun 14, 2023
1 parent 2f36fca commit d9d6f40
Show file tree
Hide file tree
Showing 8 changed files with 22 additions and 24 deletions.
3 changes: 3 additions & 0 deletions .coveragerc
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,6 @@ omit =
/*/__init__.py
/setup.py
/*/migrations/*
source = django_loci
parallel = true
concurrency = multiprocessing
17 changes: 8 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,14 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: [3.7, 3.8, 3.9]
python-version:
- "3.8"
- "3.9"
- "3.10"
django-version:
- django~=3.0.0
- django~=3.1.0
- django~=3.2.0
include:
- django-version: django~=4.0.0
python-version: 3.9
- django-version: django~=4.0.0
python-version: 3.8
- django~=4.1.0
- django~=4.2.0

steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -62,7 +60,8 @@ jobs:

- name: Tests
run: |
coverage run --source=django_loci runtests.py
coverage run runtests.py --parallel
coverage combine
- name: Upload Coverage
run: coveralls --service=github
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ pip-delete-this-directory.txt
# Unit test / coverage reports
htmlcov/
.tox/
.coverage
.coverage*
.cache
nosetests.xml
coverage.xml
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ Reusable django-app for storing GIS and indoor coordinates of objects.
Dependencies
------------

* Python >= 3.7
* Python >= 3.8
* GeoDjango (`see GeoDjango Install Instructions <https://docs.djangoproject.com/en/dev/ref/contrib/gis/install/#requirements>`_)
* One of the databases supported by GeoDjango

Expand Down
3 changes: 0 additions & 3 deletions django_loci/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,3 @@ def get_version():
rev = 0
version = '%s%s%s' % (version, VERSION[3][0:1], rev)
return version


default_app_config = 'django_loci.apps.LociConfig'
9 changes: 4 additions & 5 deletions requirements-test.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
attrs>=17.4.0
pytest-django~=4.4.0
pytest-asyncio~=0.15.0
pytest-cov~=2.12.0
responses~=0.13.0
pytest-django~=4.5.0
pytest-asyncio~=0.21.0
pytest-cov~=4.0.0
responses~=0.23.1
openwisp-utils[qa] @ https://github.com/openwisp/openwisp-utils/tarball/master
9 changes: 5 additions & 4 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
django>=3.0,<4.1.0
# Does not supports Django 4.0.0
django>=3.2.18,!=4.0.*,<4.3
channels~=3.0.4
django-leaflet~=0.28.0
Pillow~=9.4.0
geopy~=2.2.0
django-leaflet~=0.29.0
Pillow~=9.5.0
geopy~=2.3.0
openwisp-utils @ https://github.com/openwisp/openwisp-utils/tarball/master
1 change: 0 additions & 1 deletion tests/openwisp2/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@
LANGUAGE_CODE = 'en-gb'
USE_TZ = True
USE_I18N = False
USE_L10N = False
STATIC_URL = '/static/'
MEDIA_URL = '/media/'
MEDIA_ROOT = '{0}/media/'.format(BASE_DIR)
Expand Down

0 comments on commit d9d6f40

Please sign in to comment.