Merge pull request #18 from maykinmedia/bugfix/pip-issue

Tiny dependency fix and test it against modern Django/Pip/Python versions
maykinmedia · Dec 23, 2024 · 4dd2363 · 4dd2363
2 parents 7665fbd + 5739d8c
commit 4dd2363
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 45 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -7,28 +7,11 @@ jobs:
 
     name: Python ${{ matrix.python-version }}, Django ${{ matrix.django-version }} (${{ matrix.variant }})
     runs-on: ubuntu-latest
-    continue-on-error: ${{ matrix.experimental == 'true' }}
     strategy:
       matrix:
-        python-version: ['3.6', '3.7', '3.8']
-        django-version: ['2.2', '3.0', '3.1']
+        python-version: ['3.9', '3.10', '3.11', '3.12']
+        django-version: ['4.2']
         variant: [normal, yubikey, custom_user]
-        experimental: ['true', 'false']
-        exclude:
-          - python-version: '3.5'
-            django-version: '3.0'
-          - python-version: '3.5'
-            django-version: '3.1'
-          - python-version: '3.5'
-            django-version: master
-          - django-version: '2.2'
-            experimental: 'true'
-          - django-version: '3.0'
-            experimental: 'true'
-          - django-version: '3.1'
-            experimental: 'true'
-          - django-version: master
-            experimental: 'false'
 
     steps:
       - uses: actions/checkout@v2

diff --git a/.gitignore b/.gitignore
@@ -10,3 +10,4 @@ example/settings_private.py
 .eggs/
 
 .idea/
+env/
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,14 @@
 Change history
 ==============
 
+2.0.5
+=====
+
+*September 9, 2024*
+
+* Fixed incorrect dependancy format causing pip>=24 to fail.
+
+
 2.0.4
 =====
 

diff --git a/README.rst b/README.rst
@@ -13,7 +13,7 @@ which uses the upstream library under the hood.
 Django Two-Factor Authentication
 ================================
 
-:Version: 2.0.4
+:Version: 2.0.5
 :Download: https://pypi.python.org/pypi/maykin-django-two-factor-auth
 :Source: https://github.com/maykinmedia/django-two-factor-auth
 :Keywords: django, admin, 2fa, two-factor

diff --git a/docs/conf.py b/docs/conf.py
@@ -59,7 +59,7 @@
 #
 
 # The full version, including alpha/beta/rc tags.
-release = '2.0.4'
+release = '2.0.5'
 
 # The short X.Y version.
 version = '.'.join(release.split('.')[0:2])

diff --git a/tox.ini b/tox.ini
@@ -2,39 +2,30 @@
 ; Minimum version of Tox
 minversion = 1.8
 envlist =
-    py{35,36,37,38}-dj22-{normal,yubikey,custom_user},
-    py{36,37,38}-dj30-{normal,yubikey,custom_user},
-    py{36,37,38}-dj31-{normal,yubikey,custom_user},
-    py{36,37,38}-djmaster-{normal,yubikey,custom_user}
+    py{39,310,311,312}-dj42-{normal,yubikey,custom_user}
 skipsdist = True
 
 [travis]
 unignore_outcomes = True
 
 [travis:env]
 DJANGO =
-    2.2: dj22
-    3.0: dj30
-    3.1: dj31
-    master: djmaster
+    4.2: dj42
 VARIANT =
     normal: normal
     yubikey: yubikey
     custom_user: custom_user
 
 [gh-actions]
 python =
-    3.5: py35
-    3.6: py36
-    3.7: py37
-    3.8: py38, mypy
+    3.9: py39
+    3.10: py310
+    3.11: py311
+    3.12: py312
 
 [gh-actions:env]
 DJANGO =
-    2.2: dj22
-    3.0: dj30
-    3.1: dj31
-    master: djmaster
+    4.2: dj42
 VARIANT =
     normal: normal
     yubikey: yubikey
@@ -46,15 +37,12 @@ setenv =
     PYTHONWARNINGS=always
     custom_user: AUTH_USER_MODEL=tests.User
 basepython =
-    py35: python3.5
-    py36: python3.6
-    py37: python3.7
-    py38: python3.8
+    py39: python3.9
+    py310: python3.10
+    py311: python3.11
+    py312: python3.12
 deps =
-    dj22: Django<2.3
-    dj30: Django<3.1
-    dj31: Django<3.2
-    djmaster: https://github.com/django/django/archive/master.tar.gz
+    dj42: Django>=4.2,<4.3
     yubikey: django-otp-yubikey
     coverage
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,3 +10,4 @@ example/settings_private.py
		.eggs/

		.idea/
		env/