From 9a048d7c518e8abf31996ffd01b003a9062f5ae7 Mon Sep 17 00:00:00 2001 From: Asif Saif Uddin Date: Tue, 20 May 2025 16:32:29 +0600 Subject: [PATCH 1/6] adjust versions --- .github/workflows/ci.yml | 4 +--- requirements/docs.txt | 2 +- setup.py | 2 +- tox.ini | 4 ++-- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 39ad3006..559b6b3d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,14 +13,12 @@ jobs: runs-on: ubuntu-22.04 strategy: matrix: - python-version: ["3.7","3.8","3.9"] + python-version: ["3.7","3.8"] django: [ "1.11", "2.2",] exclude: - python-version: "3.8" django: "1.11" - - python-version: "3.9" - django: "1.11" services: diff --git a/requirements/docs.txt b/requirements/docs.txt index 4732107c..1edf4439 100644 --- a/requirements/docs.txt +++ b/requirements/docs.txt @@ -1,4 +1,4 @@ -Django>=1.11.29 +Django==1.11.29 Sphinx sphinxcontrib-issuetracker python-memcached diff --git a/setup.py b/setup.py index 48847597..8b9b4007 100755 --- a/setup.py +++ b/setup.py @@ -182,7 +182,7 @@ def extra_args(self): zip_safe=False, install_requires=[ 'celery>=3.1.26,<4.1.0', - 'django>=1.11.17,<3.0', + 'django>=1.11.29,<3.0', ], cmdclass={'test': RunTests, 'quicktest': QuickRunTests, diff --git a/tox.ini b/tox.ini index c2025f5e..c5f7da75 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py37-django{1.11,2.2}, py38-django{2.2}, py39-django{2.2} +envlist = py37-django{1.11,2.2}, py38-django{2.2} [testenv] sitepackages = False @@ -7,7 +7,7 @@ deps = -r{toxinidir}/requirements/default.txt -r{toxinidir}/requirements/test.txt - django1.11: Django==1.11.17 + django1.11: Django==1.11.29 django2.2: Django==2.2.17 setenv = From a5459d548056477ad21c03a168b67ce93812db53 Mon Sep 17 00:00:00 2001 From: Asif Saif Uddin Date: Tue, 20 May 2025 16:37:55 +0600 Subject: [PATCH 2/6] adjust versions --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 559b6b3d..d598e976 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,7 +42,7 @@ jobs: - uses: actions/setup-python@v3 with: python-version: ${{ matrix.python-version }} - - run: pip install setuptools==56.0.0 pip==23.0 tox==3.5.2 + - run: pip install pip tox - run: tox -v -- -v env: TOXENV: py${{ matrix.python-version }}-django${{ matrix.django }} From 431e32e5a2db2f41a998e226a8d7d3a1f72cfac6 Mon Sep 17 00:00:00 2001 From: Asif Saif Uddin Date: Tue, 20 May 2025 16:40:54 +0600 Subject: [PATCH 3/6] adjust versions --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d598e976..f3e0e49e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,7 +42,7 @@ jobs: - uses: actions/setup-python@v3 with: python-version: ${{ matrix.python-version }} - - run: pip install pip tox + - run: pip install pip==23.0.1 tox - run: tox -v -- -v env: TOXENV: py${{ matrix.python-version }}-django${{ matrix.django }} From 523ec1dacc2cf5b868ec7ebf14bd5e0e99b75ed5 Mon Sep 17 00:00:00 2001 From: Asif Saif Uddin Date: Tue, 20 May 2025 16:47:35 +0600 Subject: [PATCH 4/6] limit to celery 3.x only for a while --- requirements/default.txt | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements/default.txt b/requirements/default.txt index 2cffcc02..8f4cda07 100644 --- a/requirements/default.txt +++ b/requirements/default.txt @@ -1 +1 @@ -celery>=3.1.26,<4.1.0 \ No newline at end of file +celery>=3.1.26,<4.0.0 diff --git a/setup.py b/setup.py index 8b9b4007..306c8941 100755 --- a/setup.py +++ b/setup.py @@ -181,7 +181,7 @@ def extra_args(self): package_data=package_data, zip_safe=False, install_requires=[ - 'celery>=3.1.26,<4.1.0', + 'celery>=3.1.26,<4.0.0', 'django>=1.11.29,<3.0', ], cmdclass={'test': RunTests, From 655dd0505bc89db4c8670bf9e37aa9152db1a462 Mon Sep 17 00:00:00 2001 From: Asif Saif Uddin Date: Tue, 20 May 2025 16:53:01 +0600 Subject: [PATCH 5/6] limit to celery 3.x only for a while --- .github/workflows/ci.yml | 5 +---- tox.ini | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f3e0e49e..59d06ece 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,11 +13,8 @@ jobs: runs-on: ubuntu-22.04 strategy: matrix: - python-version: ["3.7","3.8"] + python-version: ["3.7"] django: [ "1.11", "2.2",] - exclude: - - python-version: "3.8" - django: "1.11" diff --git a/tox.ini b/tox.ini index c5f7da75..edd8235d 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py37-django{1.11,2.2}, py38-django{2.2} +envlist = py37-django{1.11,2.2} [testenv] sitepackages = False From ecfa46ecad740c8a11c34615edf3945a5c75e9b1 Mon Sep 17 00:00:00 2001 From: Asif Saif Uddin Date: Tue, 20 May 2025 17:00:50 +0600 Subject: [PATCH 6/6] limit pip and setuptools as well --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 59d06ece..64864035 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,7 +39,7 @@ jobs: - uses: actions/setup-python@v3 with: python-version: ${{ matrix.python-version }} - - run: pip install pip==23.0.1 tox + - run: pip install "setuptools<57.0.0" "pip<23.0" tox - run: tox -v -- -v env: TOXENV: py${{ matrix.python-version }}-django${{ matrix.django }}