parent 19b9b2b

author Jawayria <[email protected]> 1607969382 +0500
committer Jawayria <[email protected]> 1608826681 +0500

Added Github Actions to replace Travis CI and dropped python 3.5 support

Author: Jawayria

.github/workflows/ci.yml

@@ -0,0 +1,43 @@
+name: Python CI
+
+on:
+   push:
+     branches: [ master ]
+   pull_request:
+     branches:
+       - '**'
+
+jobs:
+   run_tests:
+     name: tests
+     runs-on: ${{ matrix.os }}
+     strategy:
+       matrix:
+         os: [ubuntu-20.04]
+         python-version: ['3.8']
+         toxenv: ['django22','quality','docs']
+
+     steps:
+       - uses: actions/checkout@v1
+       - name: setup python
+         uses: actions/setup-python@v2
+         with:
+           python-version: ${{ matrix.python-version }}
+
+       - name: Install pip
+         run: pip install -r requirements/pip.txt
+
+       - name: Install Dependencies
+         run: pip install -r requirements/ci.txt
+
+       - name: Run Tests
+         env:
+           TOXENV: ${{ matrix.toxenv }}
+         run: tox
+
+       - name: Run coverage
+         if: matrix.python-version == '3.8' && matrix.toxenv == 'django22'
+         uses: codecov/codecov-action@v1
+         with:
+           flags: unittests
+           fail_ci_if_error: true

.github/workflows/publish_pypi.yml

@@ -0,0 +1,30 @@
+name: Publish package to PyPi
+
+on:
+   release:
+     types: [published]
+
+jobs:
+
+   push:
+     runs-on: ubuntu-20.04
+
+     steps:
+       - name: Checkout
+         uses: actions/checkout@v1
+       - name: setup python
+         uses: actions/setup-python@v2
+         with:
+           python-version: 3.8
+
+       - name: Install pip
+         run: pip install -r requirements/pip.txt
+
+       - name: Build package
+         run: python setup.py sdist bdist_wheel
+
+       - name: Publish to PyPi
+         uses: pypa/gh-action-pypi-publish@master
+         with:
+           user: __token__
+           password: ${{ PYPI_UPLOAD_TOKEN }}

.travis.yml

@@ -10,7 +10,7 @@ env:
 cache:
   - pip
 install:
-  - pip install -r requirements/travis.txt
+  - pip install -r requirements/ci.txt
 script:
   - tox
 after_success:

Makefile

@@ -39,12 +39,13 @@ docs: ## generate Sphinx HTML documentation, including API docs
 upgrade: export CUSTOM_COMPILE_COMMAND=make upgrade
 upgrade: ## update the requirements/*.txt files with the latest packages satisfying requirements/*.in
 	pip install -q pip-tools
+	pip-compile --upgrade --allow-unsafe --rebuild -o requirements/pip.txt requirements/pip.in
 	pip-compile --rebuild  --upgrade -o requirements/base.txt requirements/base.in
 	pip-compile --rebuild  --upgrade -o requirements/dev.txt requirements/dev.in requirements/quality.in
 	pip-compile --rebuild  --upgrade -o requirements/doc.txt requirements/base.in requirements/doc.in
 	pip-compile --rebuild  --upgrade -o requirements/quality.txt requirements/quality.in
 	pip-compile --rebuild  --upgrade -o requirements/test.txt requirements/base.in requirements/test.in
-	pip-compile --rebuild  --upgrade -o requirements/travis.txt requirements/travis.in
+	pip-compile --rebuild  --upgrade -o requirements/ci.txt requirements/ci.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/celery50.txt
 	sed -i.tmp '/^[d|D]jango==/d' requirements/test.txt
@@ -61,6 +62,7 @@ quality: ## check coding style with pycodestyle and pylint
 	tox -e quality
 
 requirements: ## install development environment requirements
+	pip install -qr requirements/pip.txt
 	pip install -qr requirements/dev.txt --exists-action w
 	pip-sync requirements/base.txt requirements/dev.txt requirements/private.* requirements/test.txt
 

celery_utils/logged_task.py

@@ -21,7 +21,7 @@ def apply_async(self, args=None, kwargs=None, **options):  # pylint: disable=arg
         """
         Emit a log statement when the task is submitted.
         """
-        result = super(LoggedTask, self).apply_async(args=args, kwargs=kwargs, **options)
+        result = super().apply_async(args=args, kwargs=kwargs, **options)
         log.info('Task {}[{}] submitted with arguments {}, {}'.format(
             self.name,
             result.id,
@@ -34,12 +34,12 @@ def on_retry(self, exc, task_id, args, kwargs, einfo):
         """
         Capture the exception that caused the task to be retried, if any.
         """
-        super(LoggedTask, self).on_retry(exc, task_id, args, kwargs, einfo)
+        super().on_retry(exc, task_id, args, kwargs, einfo)
         log.warning('[{}] retried due to {}'.format(task_id, getattr(einfo, 'traceback', None)))
 
     def on_failure(self, exc, task_id, args, kwargs, einfo):
         """
         Capture the exception that caused the task to fail, if any.
         """
         log.error('[{}] failed due to {}'.format(task_id, getattr(einfo, 'traceback', None)))
-        super(LoggedTask, self).on_failure(exc, task_id, args, kwargs, einfo)
+        super().on_failure(exc, task_id, args, kwargs, einfo)

celery_utils/persist_on_failure.py

@@ -31,7 +31,7 @@ def on_failure(self, exc, task_id, args, kwargs, einfo):
                 # TODO: Remove ".replace(',', ''))" when python 3.5 support is dropped
                 exc=_truncate_to_field(FailedTask, 'exc', repr(exc).replace(',', '')),
             )
-        super(PersistOnFailureTask, self).on_failure(exc, task_id, args, kwargs, einfo)
+        super().on_failure(exc, task_id, args, kwargs, einfo)
 
 
 class LoggedPersistOnFailureTask(PersistOnFailureTask, LoggedTask):

celery_utils/tasks.py

@@ -15,5 +15,5 @@ def mark_resolved(task_id):
     If more than one record exists with the specified task id, they will all be
     marked resolved.
     """
-    from . import models   # pylint: disable=import-outside-toplevel
+    from . import models  # pylint: disable=import-outside-toplevel
     models.FailedTask.objects.filter(task_id=task_id, datetime_resolved=None).update(datetime_resolved=now())

requirements/base.txt

@@ -14,7 +14,7 @@ click==7.1.2              # via celery, click-didyoumean, click-plugins, click-r
 django-model-utils==4.1.1  # via -r requirements/base.in
 django==2.2.17            # via -c requirements/constraints.txt, -r requirements/base.in, django-model-utils, jsonfield2
 future==0.18.2            # via -r requirements/base.in
-jsonfield2==3.0.3         # via -c requirements/constraints.txt, -r requirements/base.in
+jsonfield2==4.0.0.post0   # via -r requirements/base.in
 kombu==5.0.2              # via celery
 prompt-toolkit==3.0.8     # via click-repl
 pytz==2020.4              # via celery, django

requirements/travis.in renamed to requirements/ci.in

@@ -6,20 +6,20 @@
 #
 appdirs==1.4.4            # via virtualenv
 certifi==2020.12.5        # via requests
-chardet==3.0.4            # via requests
-codecov==2.1.10           # via -r requirements/travis.in
-coverage==5.3             # via codecov
+chardet==4.0.0            # via requests
+codecov==2.1.11           # via -r requirements/ci.in
+coverage==5.3.1           # via codecov
 distlib==0.3.1            # via virtualenv
 filelock==3.0.12          # via tox, virtualenv
 idna==2.10                # via requests
-packaging==20.7           # via tox
+packaging==20.8           # via tox
 pluggy==0.13.1            # via tox
-py==1.9.0                 # via tox
+py==1.10.0                # via tox
 pyparsing==2.4.7          # via packaging
-requests==2.25.0          # via codecov
+requests==2.25.1          # via codecov
 six==1.15.0               # via tox, virtualenv
 toml==0.10.2              # via tox
-tox-battery==0.6.1        # via -r requirements/travis.in
-tox==3.20.1               # via -r requirements/travis.in, tox-battery
+tox-battery==0.6.1        # via -r requirements/ci.in
+tox==3.20.1               # via -r requirements/ci.in, tox-battery
 urllib3==1.26.2           # via requests
 virtualenv==20.2.2        # via tox