Skip to content

Commit

Permalink
feat: Added support for Django 3.2 (#89)
Browse files Browse the repository at this point in the history
  • Loading branch information
Jawayria authored Jul 29, 2021
1 parent dd713b6 commit 9756ed5
Show file tree
Hide file tree
Showing 20 changed files with 153 additions and 91 deletions.
44 changes: 44 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
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-celery44, django22-celery50, django30-celery50, django31-celery50, django32-celery50,
quality, docs, pii_check]

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

- name: Upgrade 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-celery44'
uses: codecov/codecov-action@v1
with:
flags: unittests
fail_ci_if_error: true
33 changes: 33 additions & 0 deletions .github/workflows/pypi-publish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
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 pip
run: pip install -r requirements/pip.txt

- 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 }}
32 changes: 0 additions & 32 deletions .travis.yml

This file was deleted.

7 changes: 7 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,17 @@ Unreleased
[0.8.14] - 2021-07-12
* Update csv import error message
~~~~~~~~~~

[0.9.0] - 2021-07-20
~~~~~~~~~~~~~~~~~~~~
* Added support for django 3.2

[0.8.13] - 2021-07-12
~~~~~~~~~~~~~~~~~~~~~
* Fix bug where we ignore repeat user in the csv import

[0.8.12] - 2021-06-21
~~~~~~~~~~~~~~~~~~~~~
* Fixed import csv to not working with multiple sections per-user override

[0.8.11] - 2021-07-09
Expand Down
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,13 @@ upgrade: export CUSTOM_COMPILE_COMMAND=make upgrade
upgrade: ## update the requirements/*.txt files with the latest packages satisfying requirements/*.in
pip install -qr requirements/pip-tools.txt
# Make sure to compile files after any other files they include!
pip-compile --allow-unsafe --rebuild -o requirements/pip.txt requirements/pip.in
pip-compile --upgrade -o requirements/pip-tools.txt requirements/pip-tools.in
pip-compile --upgrade -o requirements/base.txt requirements/base.in
pip-compile --upgrade -o requirements/test.txt requirements/test.in
pip-compile --upgrade -o requirements/doc.txt requirements/doc.in
pip-compile --upgrade -o requirements/quality.txt requirements/quality.in
pip-compile --upgrade -o requirements/travis.txt requirements/travis.in
pip-compile --upgrade -o requirements/ci.txt requirements/ci.in
pip-compile --upgrade -o requirements/pii_check.txt requirements/pii_check.in
pip-compile --upgrade -o requirements/dev.txt requirements/dev.in
# Let tox control the Django,celery versions for tests
Expand Down
2 changes: 1 addition & 1 deletion bulk_grades/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
Support for bulk scoring and grading.
"""

__version__ = '0.8.14'
__version__ = '0.9.0'

default_app_config = 'bulk_grades.apps.BulkGradesConfig' # pylint: disable=invalid-name
2 changes: 1 addition & 1 deletion requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ stevedore==3.3.0
# via
# edx-django-utils
# edx-opaque-keys
super-csv==2.0.1
super-csv==2.1.0
# via -r requirements/base.in
urllib3==1.26.6
# via requests
Expand Down
File renamed without changes.
8 changes: 4 additions & 4 deletions requirements/travis.txt → requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ certifi==2021.5.30
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 @@ -24,7 +24,7 @@ idna==3.2
# via requests
packaging==21.0
# via tox
platformdirs==2.0.2
platformdirs==2.1.0
# via virtualenv
pluggy==0.13.1
# via tox
Expand All @@ -42,10 +42,10 @@ toml==0.10.2
# via tox
tox==3.24.0
# via
# -r requirements/travis.in
# -r requirements/ci.in
# tox-battery
tox-battery==0.6.1
# via -r requirements/travis.in
# via -r requirements/ci.in
urllib3==1.26.6
# via requests
virtualenv==20.6.0
Expand Down
2 changes: 1 addition & 1 deletion requirements/dev.in
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

-r pip-tools.txt # pip-tools and its dependencies, for managing requirements files
-r quality.txt # Core and quality check dependencies
-r travis.txt # tox and related dependencies
-r ci.txt # tox and related dependencies

diff-cover # Changeset diff test coverage
edx-i18n-tools # For i18n_tool dummy
Loading

0 comments on commit 9756ed5

Please sign in to comment.