Merge pull request #19 from infoscout/PIT-6096-Update-django-geosimpl…

…e-repo-to-support-up-to-Django-5.1

[PIT-6096] update repo to add support upto django 5.1

.github/workflows/pr-checks.yaml

@@ -0,0 +1,35 @@
+name: Test With Various Python/Django Versions
+on: [push]
+
+# Cancel running workflows for this same branch on each push
+concurrency:
+  group: ${{ github.ref }}
+  cancel-in-progress: true
+
+# Jobs
+jobs:
+  py-tests:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: [3.9, 3.10.15, 3.11]
+        django-version: [40, 41, 42, 50, 51]
+        exclude:
+          - python-version: 3.9
+            django-version: 50
+          - python-version: 3.9
+            django-version: 51
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install tox
+        run: pip install tox
+      - name: Run tests with tox
+        run: tox -e django${{ matrix.django-version }}
+      - name: Upload to Coveralls
+        uses: coverallsapp/[email protected]
+        with:
+          github-token: ${{ github.token }}
+          path-to-lcov: ./coverage.xml

requirements.txt

@@ -1,6 +1,6 @@
-Django==4.0.10
-geopy==2.3.0
+Django>=4.0.10
+geopy>=2.3.0
 python-geohash==0.8.5
-flake8==6.1.0
-coverage==4.2
+flake8>=6.1.0
+coverage>=4.2
 six>=1.10.0

requirements/requirements-tests.txt

@@ -1,5 +1,5 @@
-geopy==2.3.0
+geopy>=2.3.0
 python-geohash==0.8.5
-flake8==6.1.0
-coverage==4.2
-six==1.10.0
+flake8>=6.1.0
+coverage>=4.2
+six>=1.10.0

runtests.py

@@ -5,7 +5,7 @@
 
 logger = logging.getLogger(__name__)
 FLAKE8_ARGS = ['geosimple/', '--ignore=E501', '--exclude=__init__.py']
-COVERAGE_ARGS = ['--source=geosimple', '--omit=**tests**', 'manage.py', 'test']
+COVERAGE_ARGS = ['--source=geosimple', '--omit=**/tests/**', 'manage.py', 'test']
 
 
 def exit_on_failure(command, message=None):

setup.py

@@ -14,7 +14,7 @@
 author = 'Jamie Matthews'
 author_email = '[email protected]'
 license = 'BSD'
-install_requires = ['geopy==2.3.0', 'python-geohash==0.8.5', 'six>=1.10.0']
+install_requires = ['geopy>=2.3.0', 'python-geohash==0.8.5', 'six>=1.10.0']
 
 
 def get_version(package):

tox.ini

@@ -1,11 +1,18 @@
 [tox]
 envlist =
-      {py34, py36, py38, py39, py310}-django{32},
+      django{32,40,41,42,50,51}
 
 [testenv]
-commands = python runtests.py
+commands = 
+      python runtests.py
+      coverage xml
 setenv =
       PYTHONDONTWRITEBYTECODE=1
 deps =
       -rrequirements/requirements-tests.txt
-      django32: Django==3.2.22
+      django32: Django>=3.2, <4.0
+      django40: Django>=4.0, <4.1
+      django41: Django>=4.1, <4.2
+      django42: Django>=4.2, <5.0
+      django50: Django>=5.0, <5.1
+      django51: Django>=5.1, <5.2