Merge branch 'master' into dev

un33k · Feb 4, 2024 · f400693 · f400693
2 parents 4e8d16e + 410e179
commit f400693
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -20,15 +20,23 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.8, 3.9, "3.10", "3.11"]
-        django-version: [3.2, 4.1, 4.2]
+        python-version: [3.8, 3.9, "3.10", 3.11, 3.12]
+        django-version: [3.2, 4.1, 4.2, "5.0"]
         exclude:
           # excludes list
           - python-version: 3.11
             django-version: 3.2
+          - python-version: 3.12
+            django-version: 3.2
+          - python-version: 3.12
+            django-version: 4.1
+          - python-version: 3.8
+            django-version: 5.0
+          - python-version: 3.9
+            django-version: 5.0
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: setup python
         uses: actions/setup-python@v4
         with:
@@ -40,10 +48,10 @@ jobs:
           pip install --upgrade coveralls ruff
           pip install "django~=${{ matrix.django-version }}"
       - name: Run ruff
-        run: ruff .
+        run: ruff --output-format=github
       - name: Run test
         run: coverage run --source=ipware manage.py test
       - name: Coveralls
         run: coveralls --service=github
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,14 @@
+# 6.0.3
+
+Enhancement:
+- Show in Pypi Python 3.12 is supported (thx: @jrobichaud)
+
+# 6.0.2
+
+Enhancement:
+- Add support for Django 5.0 (thx: @cclauss)
+- Add support for Python 3.12 (thx: @cclauss)
+
 # 6.0.1
 
 Enhancement:

diff --git a/ipware/__version__.py b/ipware/__version__.py
@@ -4,5 +4,5 @@
 __description__ = "A Django application to retrieve user's IP address"
 __url__ = 'https://github.com/un33k/django-ipware'
 __license__ = 'MIT'
-__copyright__ = 'Copyright 2020 Val Neekman @ Neekware Inc.'
-__version__ = '6.0.1'
+__copyright__ = 'Copyright 2023 Val Neekman @ Neekware Inc.'
+__version__ = '6.0.3'
diff --git a/setup.py b/setup.py
@@ -73,6 +73,7 @@ def status(s):
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',
         'Programming Language :: Python :: 3.11',
+        'Programming Language :: Python :: 3.12',
     ],
     cmdclass={},
     tests_require=test_requirements,