diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 39ad3006..64864035 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,14 +13,9 @@ jobs: runs-on: ubuntu-22.04 strategy: matrix: - python-version: ["3.7","3.8","3.9"] + python-version: ["3.7"] django: [ "1.11", "2.2",] - exclude: - - python-version: "3.8" - django: "1.11" - - python-version: "3.9" - django: "1.11" services: @@ -44,7 +39,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 "setuptools<57.0.0" "pip<23.0" tox - run: tox -v -- -v env: TOXENV: py${{ matrix.python-version }}-django${{ matrix.django }} 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/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..306c8941 100755 --- a/setup.py +++ b/setup.py @@ -181,8 +181,8 @@ def extra_args(self): package_data=package_data, zip_safe=False, install_requires=[ - 'celery>=3.1.26,<4.1.0', - 'django>=1.11.17,<3.0', + 'celery>=3.1.26,<4.0.0', + 'django>=1.11.29,<3.0', ], cmdclass={'test': RunTests, 'quicktest': QuickRunTests, diff --git a/tox.ini b/tox.ini index c2025f5e..edd8235d 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} [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 =