From ef260968ac796e03e535273d0f6643606a69feed Mon Sep 17 00:00:00 2001 From: Mohammad Ahtasham ul Hassan Date: Wed, 16 Feb 2022 17:56:02 +0500 Subject: [PATCH] chore: Post Django 3.2 cleanup --- .github/workflows/ci.yml | 46 +++++++++++++++++++++------------------ Makefile | 3 ++- requirements/celery44.in | 1 + requirements/celery44.txt | 27 ++++++++++++++++------- requirements/celery52.txt | 2 +- requirements/ci.txt | 2 +- requirements/dev.txt | 2 +- setup.py | 7 ++---- tox.ini | 28 ++++++++++++------------ 9 files changed, 66 insertions(+), 52 deletions(-) create mode 100644 requirements/celery44.in diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 79a88772..ce960090 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,8 +4,6 @@ on: push: branches: [master] pull_request: - branches: - - '**' jobs: run_tests: @@ -14,28 +12,34 @@ jobs: strategy: matrix: os: [ubuntu-20.04] - python-version: ['3.8'] - toxenv: [celery44-django32, celery52-django32] + python-version: ["3.8"] + toxenv: + [ + celery44-django32, + celery52-django32, + celery44-django40, + celery52-django40, + ] steps: - - uses: actions/checkout@v2 - - name: setup python - uses: actions/setup-python@v2 - with: - python-version: ${{ matrix.python-version }} + - uses: actions/checkout@v2 + - name: setup python + uses: actions/setup-python@v2 + with: + python-version: ${{ matrix.python-version }} - - name: Start MongoDB - uses: supercharge/mongodb-github-action@1.6.0 - with: - mongodb-version: 4.0 + - name: Start MongoDB + uses: supercharge/mongodb-github-action@1.6.0 + with: + mongodb-version: 4.0 - - name: Install pip - run: pip install -r requirements/pip.txt + - name: Install pip + run: pip install -r requirements/pip.txt - - name: Install Dependencies - run: make test.setup install + - name: Install Dependencies + run: make test.setup install - - name: Run Tests - env: - TOXENV: ${{ matrix.toxenv }} - run: tox + - name: Run Tests + env: + TOXENV: ${{ matrix.toxenv }} + run: tox diff --git a/Makefile b/Makefile index 4822fcae..84e36025 100644 --- a/Makefile +++ b/Makefile @@ -69,8 +69,9 @@ upgrade: ## update the requirements/*.txt files with the latest packages satisfy pip-compile --upgrade -o requirements/test.txt requirements/test.in pip-compile --upgrade -o requirements/ci.txt requirements/ci.in pip-compile --upgrade -o requirements/dev.txt requirements/dev.in + pip-compile --upgrade -o requirements/celery44.txt requirements/celery44.in # Let tox control the Django version for tests - grep -e "^amqp==\|^anyjson==\|^billiard==\|^celery==\|^kombu==\|^click-didyoumean==\|^click-repl==\|^click==\|^prompt-toolkit==\|^vine==" requirements/base.txt > requirements/celery44.txt + grep -e "^amqp==\|^anyjson==\|^billiard==\|^celery==\|^kombu==\|^click-didyoumean==\|^click-repl==\|^click==\|^prompt-toolkit==\|^vine==" requirements/base.txt > requirements/celery52.txt sed -i.tmp '/^[d|D]jango==/d' requirements/test.txt sed -i.tmp '/^djangorestframework==/d' requirements/test.txt sed -i.tmp '/^amqp==/d' requirements/test.txt diff --git a/requirements/celery44.in b/requirements/celery44.in new file mode 100644 index 00000000..033b967a --- /dev/null +++ b/requirements/celery44.in @@ -0,0 +1 @@ +celery>=4.4,<4.5 diff --git a/requirements/celery44.txt b/requirements/celery44.txt index 1274bceb..86551bab 100644 --- a/requirements/celery44.txt +++ b/requirements/celery44.txt @@ -1,9 +1,20 @@ -amqp==5.0.9 +# +# This file is autogenerated by pip-compile with python 3.8 +# To update, run: +# +# make upgrade +# +amqp==2.6.1 + # via kombu billiard==3.6.4.0 -celery==5.2.3 -click==8.0.3 -click-didyoumean==0.3.0 -click-repl==0.2.0 -kombu==5.2.3 -prompt-toolkit==3.0.28 -vine==5.0.0 + # via celery +celery==4.4.7 + # via -r requirements/celery44.in +kombu==4.6.11 + # via celery +pytz==2021.3 + # via celery +vine==1.3.0 + # via + # amqp + # celery diff --git a/requirements/celery52.txt b/requirements/celery52.txt index 82ae3a36..1274bceb 100644 --- a/requirements/celery52.txt +++ b/requirements/celery52.txt @@ -5,5 +5,5 @@ click==8.0.3 click-didyoumean==0.3.0 click-repl==0.2.0 kombu==5.2.3 -prompt-toolkit==3.0.27 +prompt-toolkit==3.0.28 vine==5.0.0 diff --git a/requirements/ci.txt b/requirements/ci.txt index bf868408..98387219 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -14,7 +14,7 @@ coverage==6.3.1 # via codecov distlib==0.3.4 # via virtualenv -filelock==3.4.2 +filelock==3.5.0 # via # tox # virtualenv diff --git a/requirements/dev.txt b/requirements/dev.txt index a7fa89ed..2a0b96f5 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -109,7 +109,7 @@ edx-lint==5.2.1 # via # -r requirements/dev.in # -r requirements/test.txt -filelock==3.4.2 +filelock==3.5.0 # via # -r requirements/ci.txt # tox diff --git a/setup.py b/setup.py index 4d464318..eba948e7 100644 --- a/setup.py +++ b/setup.py @@ -5,8 +5,7 @@ import os import re -from setuptools import setup -from setuptools import find_packages +from setuptools import find_packages, setup # allow setup.py to be run from any path os.chdir(os.path.normpath(os.path.join(os.path.abspath(__file__), os.pardir))) @@ -81,10 +80,8 @@ def get_version(*file_paths): 'Development Status :: 2 - Pre-Alpha', 'Environment :: Web Environment', 'Framework :: Django', - 'Framework :: Django :: 2.2', - 'Framework :: Django :: 3.0', - 'Framework :: Django :: 3.1', 'Framework :: Django :: 3.2', + 'Framework :: Django :: 4.0', 'Intended Audience :: Developers', 'License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)', 'Operating System :: OS Independent', diff --git a/tox.ini b/tox.ini index 0ecf38bb..a5ded378 100644 --- a/tox.ini +++ b/tox.ini @@ -1,18 +1,18 @@ [tox] -envlist = py38-celery{44,52}-django{32} +envlist = py38-celery{44,52}-django{32,40} [testenv] -setenv = - DJANGO_SETTINGS_MODULE = eventtracking.django.tests.settings - PYTHONPATH = {toxinidir} -deps = - celery44: -r{toxinidir}/requirements/celery44.txt - celery52: -r{toxinidir}/requirements/celery52.txt - -r{toxinidir}/requirements/test.txt -commands = - django32: pip install 'Django>=3.2,<3.3' - pytest --cov-report=html --cov-report term-missing --cov-branch -k 'not integration and not performance' --cov-fail-under=95 --cov=eventtracking - pytest --verbose -s -k 'integration' - pycodestyle --config=setup.cfg eventtracking setup.py - pylint --rcfile=pylintrc eventtracking setup.py +setenv = + DJANGO_SETTINGS_MODULE = eventtracking.django.tests.settings + PYTHONPATH = {toxinidir} +deps = + celery44: -r{toxinidir}/requirements/celery44.txt + celery52: -r{toxinidir}/requirements/celery52.txt + -r{toxinidir}/requirements/test.txt +commands = + django32: pip install 'Django>=3.2,<3.3' + pytest --cov-report=html --cov-report term-missing --cov-branch -k 'not integration and not performance' --cov-fail-under=95 --cov=eventtracking + pytest --verbose -s -k 'integration' + pycodestyle --config=setup.cfg eventtracking setup.py + pylint --rcfile=pylintrc eventtracking setup.py