Skip to content

Commit 3b6335d

Browse files
authored
adjust versions (#641)
* adjust versions * adjust versions * adjust versions * limit to celery 3.x only for a while * limit to celery 3.x only for a while * limit pip and setuptools as well
1 parent 5a78871 commit 3b6335d

File tree

5 files changed

+8
-13
lines changed

5 files changed

+8
-13
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,9 @@ jobs:
1313
runs-on: ubuntu-22.04
1414
strategy:
1515
matrix:
16-
python-version: ["3.7","3.8","3.9"]
16+
python-version: ["3.7"]
1717
django: [ "1.11", "2.2",]
18-
exclude:
19-
- python-version: "3.8"
20-
django: "1.11"
2118

22-
- python-version: "3.9"
23-
django: "1.11"
2419

2520

2621
services:
@@ -44,7 +39,7 @@ jobs:
4439
- uses: actions/setup-python@v3
4540
with:
4641
python-version: ${{ matrix.python-version }}
47-
- run: pip install setuptools==56.0.0 pip==23.0 tox==3.5.2
42+
- run: pip install "setuptools<57.0.0" "pip<23.0" tox
4843
- run: tox -v -- -v
4944
env:
5045
TOXENV: py${{ matrix.python-version }}-django${{ matrix.django }}

requirements/default.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
celery>=3.1.26,<4.1.0
1+
celery>=3.1.26,<4.0.0

requirements/docs.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Django>=1.11.29
1+
Django==1.11.29
22
Sphinx
33
sphinxcontrib-issuetracker
44
python-memcached

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,8 +181,8 @@ def extra_args(self):
181181
package_data=package_data,
182182
zip_safe=False,
183183
install_requires=[
184-
'celery>=3.1.26,<4.1.0',
185-
'django>=1.11.17,<3.0',
184+
'celery>=3.1.26,<4.0.0',
185+
'django>=1.11.29,<3.0',
186186
],
187187
cmdclass={'test': RunTests,
188188
'quicktest': QuickRunTests,

tox.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
[tox]
2-
envlist = py37-django{1.11,2.2}, py38-django{2.2}, py39-django{2.2}
2+
envlist = py37-django{1.11,2.2}
33

44
[testenv]
55
sitepackages = False
66
deps =
77
-r{toxinidir}/requirements/default.txt
88
-r{toxinidir}/requirements/test.txt
99

10-
django1.11: Django==1.11.17
10+
django1.11: Django==1.11.29
1111
django2.2: Django==2.2.17
1212

1313
setenv =

0 commit comments

Comments
 (0)