Skip to content

Commit c78192e

Browse files
authored
Merge pull request #23 from edx/jenkins/cleanup-python-code-84ac1df
Python Code Cleanup
2 parents 84ac1df + f149fac commit c78192e

File tree

21 files changed

+129
-153
lines changed

21 files changed

+129
-153
lines changed

.github/workflows/ci.yml

Lines changed: 37 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,43 @@
11
name: Python CI
22

33
on:
4-
push:
5-
branches: [ master ]
6-
pull_request:
7-
branches:
8-
- '**'
4+
push:
5+
branches: [master]
6+
pull_request:
7+
branches:
8+
- '**'
99

1010

1111
jobs:
12-
run_tests:
13-
name: tests
14-
runs-on: ${{ matrix.os }}
15-
strategy:
16-
matrix:
17-
os: [ ubuntu-20.04 ]
18-
python-version: ['3.5','3.8']
19-
toxenv: ['django22', 'quality']
20-
exclude:
21-
- python-version: '3.5'
22-
toxenv: 'quality'
23-
24-
steps:
25-
- uses: actions/checkout@v2
26-
- name: setup python
27-
uses: actions/setup-python@v2
28-
with:
29-
python-version: ${{ matrix.python-version }}
30-
31-
- name: Install pip
32-
run: pip install -r requirements/pip.txt
33-
34-
- name: Install Dependencies
35-
run: pip install -r requirements/ci.txt
36-
37-
- name: Run Tests
38-
env:
39-
TOXENV: ${{ matrix.toxenv }}
40-
run: tox
41-
42-
- name: Run Coverage
43-
if: matrix.python-version == '3.8' && matrix.toxenv=='django22'
44-
uses: codecov/codecov-action@v1
45-
with:
46-
flags: unittests
47-
fail_ci_if_error: true
12+
run_tests:
13+
name: tests
14+
runs-on: ${{ matrix.os }}
15+
strategy:
16+
matrix:
17+
os: [ubuntu-20.04]
18+
python-version: ['3.8']
19+
toxenv: [django22, quality]
20+
steps:
21+
- uses: actions/checkout@v2
22+
- name: setup python
23+
uses: actions/setup-python@v2
24+
with:
25+
python-version: ${{ matrix.python-version }}
26+
27+
- name: Install pip
28+
run: pip install -r requirements/pip.txt
29+
30+
- name: Install Dependencies
31+
run: pip install -r requirements/ci.txt
32+
33+
- name: Run Tests
34+
env:
35+
TOXENV: ${{ matrix.toxenv }}
36+
run: tox
37+
38+
- name: Run Coverage
39+
if: matrix.python-version == '3.8' && matrix.toxenv=='django22'
40+
uses: codecov/codecov-action@v1
41+
with:
42+
flags: unittests
43+
fail_ci_if_error: true

CHANGELOG.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@ Change Log
1111

1212
.. There should always be an "Unreleased" section for changes pending release.
1313
14+
15+
[2.0.0] - 2020-01-19
16+
====================
17+
18+
* Removed support of python3.5
19+
1420
[1.1.0] - 2020-05-05
1521
====================
1622

help_tokens/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44

55
from .context_processor import context_processor
66

7-
__version__ = '1.1.3'
7+
__version__ = '2.0.0'
88

99
default_app_config = 'help_tokens.apps.HelpTokensConfig' # pylint: disable=invalid-name

help_tokens/apps.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# -*- coding: utf-8 -*-
21
"""
32
help_tokens Django application initialization.
43
"""

help_tokens/context_processor.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# -*- coding: utf-8 -*-
21
"""
32
The context processor for injecting information into Django templates for help_tokens.
43
"""

help_tokens/core.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# -*- coding: utf-8 -*-
21
"""
32
The core logic for help-tokens.
43
"""

help_tokens/models.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# -*- coding: utf-8 -*-
21
"""
32
Database models for help_tokens.
43
"""

help_tokens/urls.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# -*- coding: utf-8 -*-
21
"""
32
URLs for help_tokens.
43
"""

help_tokens/views.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# -*- coding: utf-8 -*-
21
"""URL views for help-tokens."""
32

43
from django.http import HttpResponseRedirect

requirements/ci.txt

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,21 @@
55
# make upgrade
66
#
77
appdirs==1.4.4 # via virtualenv
8-
certifi==2020.11.8 # via requests
9-
chardet==3.0.4 # via requests
10-
codecov==2.1.10 # via -r requirements/ci.in
11-
coverage==5.3 # via codecov
8+
certifi==2020.12.5 # via requests
9+
chardet==4.0.0 # via requests
10+
codecov==2.1.11 # via -r requirements/ci.in
11+
coverage==5.3.1 # via codecov
1212
distlib==0.3.1 # via virtualenv
1313
filelock==3.0.12 # via tox, virtualenv
1414
idna==2.10 # via requests
15-
importlib-metadata==2.1.0 # via pluggy, tox, virtualenv
16-
importlib-resources==3.2.1 # via virtualenv
17-
packaging==20.7 # via tox
15+
packaging==20.8 # via tox
1816
pluggy==0.13.1 # via tox
19-
py==1.9.0 # via tox
17+
py==1.10.0 # via tox
2018
pyparsing==2.4.7 # via packaging
21-
requests==2.25.0 # via codecov
19+
requests==2.25.1 # via codecov
2220
six==1.15.0 # via tox, virtualenv
2321
toml==0.10.2 # via tox
2422
tox-battery==0.6.1 # via -r requirements/ci.in
25-
tox==3.20.1 # via -r requirements/ci.in, tox-battery
23+
tox==3.21.2 # via -r requirements/ci.in, tox-battery
2624
urllib3==1.26.2 # via requests
27-
virtualenv==20.2.1 # via tox
28-
zipp==1.2.0 # via importlib-metadata, importlib-resources
25+
virtualenv==20.4.0 # via tox

0 commit comments

Comments
 (0)