Skip to content

Commit

Permalink
feat: Added support for django3.2 (#105)
Browse files Browse the repository at this point in the history
  • Loading branch information
Jawayria authored Jul 29, 2021
1 parent d335bb3 commit d8fd602
Show file tree
Hide file tree
Showing 14 changed files with 178 additions and 133 deletions.
40 changes: 40 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
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, django30, django31, django32, quality, docs]

steps:
- uses: actions/checkout@v2
- name: setup python
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}

- 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
30 changes: 30 additions & 0 deletions .github/workflows/pypi-publish.yml
Original file line number Diff line number Diff line change
@@ -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@v2
- name: setup python
uses: actions/setup-python@v2
with:
python-version: 3.8

- name: Install Dependencies
run: pip install setuptools wheel

- 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: ${{ secrets.PYPI_UPLOAD_TOKEN }}
37 changes: 0 additions & 37 deletions .travis.yml

This file was deleted.

5 changes: 5 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@ Change Log
Unreleased
~~~~~~~~~~

[1.2.0] - 2021-07-16
~~~~~~~~~~~~~~~~~~~~

* Added support for django 3.2

[1.1.1] - 2021-07-09
~~~~~~~~~~~~~~~~~~~~

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ upgrade: ## update the requirements/*.txt files with the latest packages satisfy
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
sed '/^django==/d' requirements/test.txt > requirements/test.tmp
mv requirements/test.tmp requirements/test.txt
Expand Down
2 changes: 1 addition & 1 deletion edx_ace/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
from .recipient import Recipient
from .recipient_resolver import RecipientResolver

__version__ = '1.1.1'
__version__ = '1.2.0'

default_app_config = 'edx_ace.apps.EdxAceConfig'

Expand Down
2 changes: 1 addition & 1 deletion requirements/travis.in → requirements/ci.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Requirements for running tests in Travis
# Requirements for running tests in Github CI

-c constraints.txt

Expand Down
24 changes: 13 additions & 11 deletions requirements/travis.txt → requirements/ci.txt
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
#
# This file is autogenerated by pip-compile
# This file is autogenerated by pip-compile with python 3.8
# To update, run:
#
# make upgrade
#
appdirs==1.4.4
backports.entry-points-selectable==1.1.0
# via virtualenv
certifi==2021.5.30
# via requests
chardet==4.0.0
charset-normalizer==2.0.3
# via requests
codecov==2.1.11
# via -r requirements/travis.in
# via -r requirements/ci.in
coverage==5.5
# via codecov
distlib==0.3.2
Expand All @@ -20,31 +20,33 @@ filelock==3.0.12
# via
# tox
# virtualenv
idna==2.10
idna==3.2
# via requests
packaging==21.0
# via tox
platformdirs==2.1.0
# via virtualenv
pluggy==0.13.1
# via tox
py==1.10.0
# via tox
pyparsing==2.4.7
# via packaging
requests==2.25.1
requests==2.26.0
# via codecov
six==1.16.0
# via
# tox
# virtualenv
toml==0.10.2
# via tox
tox-battery==0.2
# via -r requirements/travis.in
tox==3.23.1
tox==3.24.0
# via
# -r requirements/travis.in
# -r requirements/ci.in
# tox-battery
tox-battery==0.2
# via -r requirements/ci.in
urllib3==1.26.6
# via requests
virtualenv==20.4.7
virtualenv==20.6.0
# via tox
73 changes: 37 additions & 36 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
@@ -1,38 +1,38 @@
#
# This file is autogenerated by pip-compile
# This file is autogenerated by pip-compile with python 3.8
# To update, run:
#
# make upgrade
#
appdirs==1.4.4
# via virtualenv
astroid==2.6.2
astroid==2.6.5
# via
# pylint
# pylint-celery
attrs==21.2.0
# via -r requirements/base.in
bleach==3.3.0
backports.entry-points-selectable==1.1.0
# via virtualenv
bleach==3.3.1
# via readme-renderer
certifi==2021.5.30
# via requests
chardet==4.0.0
# via
# diff-cover
# requests
click-log==0.3.2
# via edx-lint
# via diff-cover
charset-normalizer==2.0.3
# via requests
click==8.0.1
# via
# click-log
# code-annotations
# edx-lint
# pip-tools
code-annotations==1.1.2
click-log==0.3.2
# via edx-lint
code-annotations==1.2.0
# via edx-lint
colorama==0.4.4
# via twine
diff-cover==6.0.0
diff-cover==6.2.0
# via -r requirements/dev.in
distlib==0.3.2
# via virtualenv
Expand All @@ -44,7 +44,7 @@ django==2.2.24
# edx-lint
docutils==0.17.1
# via readme-renderer
edx-i18n-tools==0.5.3
edx-i18n-tools==0.7.0
# via -r requirements/dev.in
edx-lint==5.0.0
# via
Expand All @@ -54,7 +54,7 @@ filelock==3.0.12
# via
# tox
# virtualenv
idna==2.10
idna==3.2
# via requests
importlib-metadata==4.6.1
# via
Expand All @@ -66,13 +66,13 @@ isort==5.9.2
# via
# -r requirements/quality.in
# pylint
jinja2-pluralize==0.3.0
# via diff-cover
jinja2==3.0.1
# via
# code-annotations
# diff-cover
# jinja2-pluralize
jinja2-pluralize==0.3.0
# via diff-cover
keyring==23.0.1
# via twine
lazy-object-proxy==1.6.0
Expand All @@ -85,18 +85,18 @@ packaging==21.0
# via
# bleach
# tox
path.py==12.5.0
path==16.2.0
# via edx-i18n-tools
path==16.0.0
# via path.py
pbr==5.6.0
# via stevedore
pep517==0.10.0
pep517==0.11.0
# via pip-tools
pip-tools==6.2.0
# via -r requirements/dev.in
pkginfo==1.7.0
pkginfo==1.7.1
# via twine
platformdirs==2.1.0
# via virtualenv
pluggy==0.13.1
# via
# diff-cover
Expand All @@ -113,6 +113,12 @@ pygments==2.9.0
# via
# diff-cover
# readme-renderer
pylint==2.9.5
# via
# edx-lint
# pylint-celery
# pylint-django
# pylint-plugin-utils
pylint-celery==0.3
# via edx-lint
pylint-django==2.4.4
Expand All @@ -121,15 +127,9 @@ pylint-plugin-utils==0.6
# via
# pylint-celery
# pylint-django
pylint==2.9.3
# via
# edx-lint
# pylint-celery
# pylint-django
# pylint-plugin-utils
pyparsing==2.4.7
# via packaging
python-dateutil==2.8.1
python-dateutil==2.8.2
# via -r requirements/base.in
python-slugify==5.0.2
# via code-annotations
Expand All @@ -141,18 +141,18 @@ pyyaml==5.4.1
# edx-i18n-tools
readme-renderer==29.0
# via twine
requests-toolbelt==0.9.1
# via twine
requests==2.25.1
requests==2.26.0
# via
# requests-toolbelt
# sailthru-client
# twine
requests-toolbelt==0.9.1
# via twine
rfc3986==1.5.0
# via twine
sailthru-client==2.2.3
# via -r requirements/base.in
simplejson==3.17.2
simplejson==3.17.3
# via sailthru-client
six==1.16.0
# via
Expand All @@ -176,18 +176,19 @@ text-unidecode==1.3
# via python-slugify
toml==0.10.2
# via
# pep517
# pylint
# tox
tox==3.23.1
tomli==1.1.0
# via pep517
tox==3.24.0
# via -r requirements/dev.in
tqdm==4.61.2
# via twine
twine==3.4.1
twine==3.4.2
# via -r requirements/dev.in
urllib3==1.26.6
# via requests
virtualenv==20.4.7
virtualenv==20.6.0
# via tox
webencodings==0.5.1
# via bleach
Expand Down
Loading

0 comments on commit d8fd602

Please sign in to comment.