feat: support for python/django versions (un33k#97)

antonrom1 · Sep 18, 2023 · 6ceecbf · 6ceecbf
1 parent 7da8f15
commit 6ceecbf
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 18 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -20,18 +20,12 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.7, 3.8, 3.9, "3.10", 3.11, pypy3.9]
-        django-version: [3.2, 4.0, 4.1]
+        python-version: [3.8, 3.9, "3.10", "3.11"]
+        django-version: [3.2, 4.1, 4.2]
         exclude:
           # excludes list
-          - python-version: 3.7
-            django-version: 4.0
-          - python-version: 3.7
-            django-version: 4.1
           - python-version: 3.11
             django-version: 3.2
-          - python-version: 3.11
-            django-version: 4.0
 
     steps:
       - uses: actions/checkout@v3
@@ -44,7 +38,7 @@ jobs:
           python -m pip install --upgrade pip
           pip install -e .
           pip install --upgrade coveralls ruff
-          pip install "django~=${{ matrix.django-version }}.0"
+          pip install "django~=${{ matrix.django-version }}"
       - name: Run ruff
         run: ruff --format=github .
       - name: Run test

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,12 @@
+# Unreleased
+
+Enhancement:
+
+- Drop Python 3.7 support
+- Add support for Django 4.2
+- Drop support for Django 4.0
+- Drop support for PyPy
+
 # 5.0.0
 
 Enhancement:

diff --git a/README.md b/README.md
@@ -123,7 +123,6 @@ IPWARE_PRIVATE_IP_PREFIX = getattr(settings,
      '233.', '234.', '235.', '236.', '237.', '238.', '239.',  # multicast
      '240.', '241.', '242.', '243.', '244.', '245.', '246.', '247.', '248.',
      '249.', '250.', '251.', '252.', '253.', '254.', '255.',  # reserved
-   ) + (
      '::',  # Unspecified address
      '::ffff:', '2001:10:', '2001:20:',  # messages to software
      '2001::',  # TEREDO

diff --git a/ipware/defaults.py b/ipware/defaults.py
@@ -58,7 +58,6 @@
         '233.', '234.', '235.', '236.', '237.', '238.', '239.',  # multicast
         '240.', '241.', '242.', '243.', '244.', '245.', '246.', '247.', '248.',
         '249.', '250.', '251.', '252.', '253.', '254.', '255.',  # reserved
-    ) + (
         '::',  # Unspecified address
         '::ffff:', '2001:10:', '2001:20:',  # messages to software
         '2001::',  # TEREDO

diff --git a/pyproject.toml b/pyproject.toml
@@ -31,7 +31,7 @@ select = [
 ]
 ignore = ["PGH004", "TID252"]
 line-length = 107
-target-version = "py37"
+target-version = "py311"
 
 [tool.ruff.mccabe]
 max-complexity = 16
diff --git a/requirement-dev.txt b/requirement-dev.txt
@@ -1,4 +1,4 @@
-Django==4.0
-pycodestyle==2.7.0
-flake8==3.9.2
-twine==3.4.2
+Django==4.2.4
+pycodestyle==2.11.0
+flake8==6.1.0
+twine==4.0.2
diff --git a/setup.py b/setup.py
@@ -8,7 +8,7 @@
 from setuptools import setup
 
 package = 'ipware'
-python_requires = ">=3.7"
+python_requires = ">=3.8"
 here = os.path.abspath(os.path.dirname(__file__))
 
 requires = []
@@ -69,7 +69,6 @@ def status(s):
         'License :: OSI Approved :: MIT License',
         'Programming Language :: Python',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',