Skip to content

Commit e562d96

Browse files
author
M. Zulqarnain
authored
refactor: Drop Python 3.5 Support (#201)
1 parent e612fe3 commit e562d96

33 files changed

+350
-373
lines changed

‎.travis.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
dist: latest
22
language: python
33
python:
4-
- 3.5
54
- 3.8
65
env:
76
matrix:
87
- TOXENV=django22
8+
- TOXENV=django30
99
global:
1010
- DOCKER_USERNAME=edxbuilder
1111
- secure: L3RJviQKzXNRYpsnO4Nt8VgHMiKZxkvZP7omKn3bMXNk3h3K6z9IluaHA8Icec7ZA+bStQxjNHd+OG9MqsixbfAlVFw6Iw9UZAcDHmK8pLxSzecSojiGMSWH+AndDnHO0qMUPJNawV7mVinaf4r8FqjoTktL/eUkfWZkH6dBAiQ=
@@ -40,7 +40,7 @@ deploy:
4040
distributions: sdist bdist_wheel
4141
on:
4242
tags: true
43-
python: 3.5
43+
python: 3.8
4444
condition: "$TOXENV=django22"
4545
after_deploy:
4646
- make travis_docker_push

‎constraints.txt

+3
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,6 @@
77
# link to other information that will help people in the future to remove the
88
# pin when possible. Writing an issue against the offending project and
99
# linking to it here is good.
10+
11+
# Common constraints for edx repos
12+
-c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt

‎doc/conf.py

+8-10
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# -*- coding: utf-8 -*-
21
#
32
# XBlock documentation build configuration file, created by
43
# sphinx-quickstart on Fri Dec 28 11:23:23 2012.
@@ -11,7 +10,6 @@
1110
# All configuration values have a default; values that are commented out
1211
# serve to show the default.
1312

14-
from __future__ import absolute_import
1513

1614
import os
1715
import sys
@@ -49,8 +47,8 @@
4947
master_doc = 'index'
5048

5149
# General information about the project.
52-
project = u'XBlock'
53-
copyright = u'2012\N{en dash}2013, edX.org'
50+
project = 'XBlock'
51+
copyright = '2012\N{en dash}2013, edX.org'
5452

5553
# The version info for the project you're documenting, acts as replacement for
5654
# |version| and |release|, also used in various other places throughout the
@@ -197,8 +195,8 @@
197195
latex_documents = [
198196
('index',
199197
'XBlock.tex',
200-
u'XBlock Documentation',
201-
u'edX.org',
198+
'XBlock Documentation',
199+
'edX.org',
202200
'manual'),
203201
]
204202

@@ -228,8 +226,8 @@
228226
# One entry per manual page. List of tuples
229227
# (source start file, name, description, authors, manual section).
230228
man_pages = [
231-
('index', 'xblock', u'XBlock Documentation',
232-
[u'edX.org'], 1)
229+
('index', 'xblock', 'XBlock Documentation',
230+
['edX.org'], 1)
233231
]
234232

235233
# If true, show URL addresses after external links.
@@ -244,8 +242,8 @@
244242
texinfo_documents = [
245243
('index',
246244
'XBlock',
247-
u'XBlock Documentation',
248-
u'edX.org',
245+
'XBlock Documentation',
246+
'edX.org',
249247
'XBlock',
250248
'One line description of project.',
251249
'Miscellaneous'),

‎prototype/{{cookiecutter.short_name}}/setup.py

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
"""Setup for {{cookiecutter.short_name|lower}} XBlock."""
22

3-
from __future__ import absolute_import
43

54
import os
65

‎requirements/base.txt

+19-21
Original file line numberDiff line numberDiff line change
@@ -5,44 +5,42 @@
55
# make upgrade
66
#
77
appdirs==1.4.4 # via fs
8-
arrow==0.15.7 # via jinja2-time
8+
arrow==1.1.0 # via jinja2-time
99
binaryornot==0.4.4 # via cookiecutter
10-
boto3==1.14.26 # via fs-s3fs
10+
boto3==1.17.60 # via fs-s3fs
1111
boto==2.49.0 # via -r requirements/base.in
12-
botocore==1.17.26 # via boto3, s3transfer
13-
certifi==2020.6.20 # via requests
14-
chardet==3.0.4 # via binaryornot, requests
12+
botocore==1.20.60 # via boto3, s3transfer
13+
certifi==2020.12.5 # via requests
14+
chardet==4.0.0 # via binaryornot, requests
1515
click==7.1.2 # via cookiecutter
1616
cookiecutter==1.7.2 # via -r requirements/base.in
17-
django-pyfs==2.2 # via -r requirements/base.in
18-
django==2.2.14 # via -r requirements/base.in, django-pyfs
19-
docutils==0.15.2 # via botocore
17+
django-pyfs==3.0 # via -r requirements/base.in
18+
django==2.2.20 # via -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt, -r requirements/base.in, django-pyfs
2019
fs-s3fs==1.1.1 # via -r requirements/base.in, django-pyfs
21-
fs==2.4.11 # via django-pyfs, fs-s3fs, xblock
20+
fs==2.4.13 # via django-pyfs, fs-s3fs, xblock
2221
idna==2.10 # via requests
2322
jinja2-time==0.2.0 # via cookiecutter
24-
jinja2==2.11.2 # via cookiecutter, jinja2-time
23+
jinja2==2.11.3 # via cookiecutter, jinja2-time
2524
jmespath==0.10.0 # via boto3, botocore
2625
lazy==1.4 # via -r requirements/base.in
27-
lxml==4.5.2 # via -r requirements/base.in, xblock
26+
lxml==4.6.3 # via -r requirements/base.in, xblock
2827
markupsafe==1.1.1 # via cookiecutter, jinja2, xblock
2928
poyo==0.5.0 # via cookiecutter
3029
pypng==0.0.20 # via -r requirements/base.in
3130
python-dateutil==2.8.1 # via arrow, botocore, xblock
3231
python-slugify==4.0.1 # via cookiecutter
33-
pytz==2020.1 # via django, fs, xblock
34-
pyyaml==5.3.1 # via xblock
35-
requests==2.24.0 # via -r requirements/base.in, cookiecutter
36-
s3transfer==0.3.3 # via boto3
32+
pytz==2021.1 # via django, fs, xblock
33+
pyyaml==5.4.1 # via xblock
34+
requests==2.25.1 # via -r requirements/base.in, cookiecutter
35+
s3transfer==0.4.2 # via boto3
3736
simplejson==3.17.2 # via -r requirements/base.in
3837
six==1.15.0 # via cookiecutter, fs, fs-s3fs, python-dateutil, xblock
39-
sqlparse==0.3.1 # via django
38+
sqlparse==0.4.1 # via django
4039
text-unidecode==1.3 # via python-slugify
41-
typing==3.7.4.3 # via fs
42-
urllib3==1.25.10 # via botocore, requests
43-
web-fragments==0.3.2 # via -r requirements/base.in, xblock
44-
webob==1.8.6 # via -r requirements/base.in, xblock
45-
xblock==1.3.1 # via -r requirements/base.in
40+
urllib3==1.26.4 # via botocore, requests
41+
web-fragments==1.0.0 # via -r requirements/base.in, xblock
42+
webob==1.8.7 # via -r requirements/base.in, xblock
43+
xblock==1.4.0 # via -r requirements/base.in
4644

4745
# The following packages are considered to be unsafe in a requirements file:
4846
# setuptools

‎requirements/dev.txt

+52-57
Original file line numberDiff line numberDiff line change
@@ -4,91 +4,86 @@
44
#
55
# make upgrade
66
#
7-
-e git+https://github.com/edx/acid-block.git@98aecba94ecbfa934e2d00262741c0ea9f557fc9#egg=acid-xblock # via -r requirements/test.in, -r requirements/test.txt
7+
-e git+https://github.com/edx/acid-block.git@98aecba94ecbfa934e2d00262741c0ea9f557fc9#egg=acid-xblock # via -r requirements/test.in
88
appdirs==1.4.4 # via -r requirements/test.txt, fs, virtualenv
9-
arrow==0.15.7 # via -r requirements/test.txt, jinja2-time
10-
astroid==2.3.3 # via pylint, pylint-celery
11-
attrs==19.3.0 # via -r requirements/test.txt, pytest
9+
arrow==1.1.0 # via -r requirements/test.txt, jinja2-time
10+
astroid==2.5.6 # via pylint, pylint-celery
11+
attrs==20.3.0 # via -r requirements/test.txt, pytest
1212
binaryornot==0.4.4 # via -r requirements/test.txt, cookiecutter
1313
bok_choy==0.7.1 # via -r requirements/test.in, -r requirements/test.txt
14-
boto3==1.14.26 # via -r requirements/test.txt, fs-s3fs
14+
boto3==1.17.60 # via -r requirements/test.txt, fs-s3fs
1515
boto==2.49.0 # via -r requirements/base.in, -r requirements/test.txt
16-
botocore==1.17.26 # via -r requirements/test.txt, boto3, s3transfer
17-
certifi==2020.6.20 # via -r requirements/test.txt, requests
18-
chardet==3.0.4 # via -r requirements/test.txt, binaryornot, requests
16+
botocore==1.20.60 # via -r requirements/test.txt, boto3, s3transfer
17+
certifi==2020.12.5 # via -r requirements/test.txt, requests
18+
chardet==4.0.0 # via -r requirements/test.txt, binaryornot, requests
1919
click-log==0.3.2 # via edx-lint
20-
click==7.1.2 # via -r requirements/test.txt, click-log, cookiecutter, edx-lint
20+
click==7.1.2 # via -r requirements/test.txt, click-log, code-annotations, cookiecutter, edx-lint
21+
code-annotations==1.1.1 # via edx-lint
2122
cookiecutter==1.7.2 # via -r requirements/base.in, -r requirements/test.txt
22-
coverage==5.2 # via -r requirements/test.in, -r requirements/test.txt, pytest-cov
23-
ddt==1.4.1 # via -r requirements/test.in, -r requirements/test.txt
23+
coverage==5.5 # via -r requirements/test.in, -r requirements/test.txt, pytest-cov
24+
ddt==1.4.2 # via -r requirements/test.in, -r requirements/test.txt
2425
distlib==0.3.1 # via -r requirements/test.txt, virtualenv
25-
django-pyfs==2.2 # via -r requirements/base.in, -r requirements/test.txt
26-
django==2.2.14 # via -r requirements/base.in, -r requirements/test.txt, django-pyfs
27-
docutils==0.15.2 # via -r requirements/test.txt, botocore
28-
edx-lint==1.5.0 # via -r requirements/quality.in
26+
django-pyfs==3.0 # via -r requirements/base.in, -r requirements/test.txt
27+
django==2.2.20 # via -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt, -r requirements/base.in, -r requirements/test.txt, code-annotations, django-pyfs, edx-lint
28+
edx-lint==5.0.0 # via -r requirements/quality.in
2929
filelock==3.0.12 # via -r requirements/test.txt, tox, virtualenv
3030
fs-s3fs==1.1.1 # via -r requirements/base.in, -r requirements/test.txt, django-pyfs
31-
fs==2.4.11 # via -r requirements/test.txt, django-pyfs, fs-s3fs, xblock
31+
fs==2.4.13 # via -r requirements/test.txt, django-pyfs, fs-s3fs, xblock
3232
idna==2.10 # via -r requirements/test.txt, requests
33-
importlib-metadata==1.7.0 # via -r requirements/test.txt, pluggy, pytest, tox, virtualenv
34-
importlib-resources==3.0.0 # via -r requirements/test.txt, virtualenv
35-
isort==4.3.21 # via -r requirements/quality.in, pylint
33+
iniconfig==1.1.1 # via -r requirements/test.txt, pytest
34+
isort==5.8.0 # via -r requirements/quality.in, pylint
3635
jinja2-time==0.2.0 # via -r requirements/test.txt, cookiecutter
37-
jinja2==2.11.2 # via -r requirements/test.txt, cookiecutter, jinja2-time
36+
jinja2==2.11.3 # via -r requirements/test.txt, code-annotations, cookiecutter, jinja2-time
3837
jmespath==0.10.0 # via -r requirements/test.txt, boto3, botocore
39-
lazy-object-proxy==1.4.3 # via astroid
38+
lazy-object-proxy==1.6.0 # via astroid
4039
lazy==1.4 # via -r requirements/base.in, -r requirements/test.txt, acid-xblock, bok-choy
41-
lxml==4.5.2 # via -r requirements/base.in, -r requirements/test.txt, xblock
42-
mako==1.1.3 # via -r requirements/test.txt, acid-xblock
40+
lxml==4.6.3 # via -r requirements/base.in, -r requirements/test.txt, xblock
41+
mako==1.1.4 # via -r requirements/test.txt, acid-xblock
4342
markupsafe==1.1.1 # via -r requirements/test.txt, cookiecutter, jinja2, mako, xblock
4443
mccabe==0.6.1 # via pylint
45-
mock==3.0.5 # via -r requirements/test.in, -r requirements/test.txt
46-
more-itertools==8.4.0 # via -r requirements/test.txt, pytest
44+
mock==4.0.3 # via -r requirements/test.in, -r requirements/test.txt
4745
needle==0.5.0 # via -r requirements/test.txt, bok-choy
4846
nose==1.3.7 # via -r requirements/test.txt, needle
49-
packaging==20.4 # via -r requirements/test.txt, pytest, tox
50-
pathlib2==2.3.5 # via -r requirements/test.txt, pytest
51-
pillow==7.2.0 # via -r requirements/test.txt, needle
47+
packaging==20.9 # via -r requirements/test.txt, pytest, tox
48+
pbr==5.6.0 # via stevedore
49+
pillow==8.2.0 # via -r requirements/test.txt, needle
5250
pluggy==0.13.1 # via -r requirements/test.txt, pytest, tox
5351
poyo==0.5.0 # via -r requirements/test.txt, cookiecutter
54-
py==1.9.0 # via -r requirements/test.txt, pytest, tox
55-
pycodestyle==2.6.0 # via -r requirements/quality.in
56-
pydocstyle==5.0.2 # via -r requirements/quality.in
52+
py==1.10.0 # via -r requirements/test.txt, pytest, tox
53+
pycodestyle==2.7.0 # via -r requirements/quality.in
54+
pydocstyle==6.0.0 # via -r requirements/quality.in
5755
pylint-celery==0.3 # via edx-lint
58-
pylint-django==2.0.11 # via edx-lint
56+
pylint-django==2.4.4 # via edx-lint
5957
pylint-plugin-utils==0.6 # via pylint-celery, pylint-django
60-
pylint==2.4.4 # via edx-lint, pylint-celery, pylint-django, pylint-plugin-utils
58+
pylint==2.8.2 # via edx-lint, pylint-celery, pylint-django, pylint-plugin-utils
6159
pyparsing==2.4.7 # via -r requirements/test.txt, packaging
6260
pypng==0.0.20 # via -r requirements/base.in, -r requirements/test.txt
63-
pytest-cov==2.10.0 # via -r requirements/test.in, -r requirements/test.txt
64-
pytest-django==3.9.0 # via -r requirements/test.in, -r requirements/test.txt
65-
pytest-rerunfailures==9.0 # via -r requirements/test.in, -r requirements/test.txt
66-
pytest==5.4.3 # via -r requirements/test.txt, pytest-cov, pytest-django, pytest-rerunfailures
61+
pytest-cov==2.11.1 # via -r requirements/test.in, -r requirements/test.txt
62+
pytest-django==4.2.0 # via -r requirements/test.in, -r requirements/test.txt
63+
pytest-rerunfailures==9.1.1 # via -r requirements/test.in, -r requirements/test.txt
64+
pytest==6.2.3 # via -r requirements/test.txt, pytest-cov, pytest-django, pytest-rerunfailures
6765
python-dateutil==2.8.1 # via -r requirements/test.txt, arrow, botocore, xblock
68-
python-slugify==4.0.1 # via -r requirements/test.txt, cookiecutter
69-
pytz==2020.1 # via -r requirements/test.txt, django, fs, xblock
70-
pyyaml==5.3.1 # via -r requirements/test.txt, xblock
71-
requests==2.24.0 # via -r requirements/base.in, -r requirements/test.txt, cookiecutter
72-
s3transfer==0.3.3 # via -r requirements/test.txt, boto3
66+
python-slugify==4.0.1 # via -r requirements/test.txt, code-annotations, cookiecutter
67+
pytz==2021.1 # via -r requirements/test.txt, django, fs, xblock
68+
pyyaml==5.4.1 # via -r requirements/test.txt, code-annotations, xblock
69+
requests==2.25.1 # via -r requirements/base.in, -r requirements/test.txt, cookiecutter
70+
s3transfer==0.4.2 # via -r requirements/test.txt, boto3
7371
selenium==3.4.1 # via -r requirements/test.in, -r requirements/test.txt, bok-choy, needle
7472
simplejson==3.17.2 # via -r requirements/base.in, -r requirements/test.txt
75-
six==1.15.0 # via -r requirements/test.txt, astroid, bok-choy, cookiecutter, edx-lint, fs, fs-s3fs, mock, packaging, pathlib2, python-dateutil, tox, virtualenv, xblock
76-
snowballstemmer==2.0.0 # via pydocstyle
77-
sqlparse==0.3.1 # via -r requirements/test.txt, django
73+
six==1.15.0 # via -r requirements/test.txt, bok-choy, cookiecutter, edx-lint, fs, fs-s3fs, python-dateutil, tox, virtualenv, xblock
74+
snowballstemmer==2.1.0 # via pydocstyle
75+
sqlparse==0.4.1 # via -r requirements/test.txt, django
76+
stevedore==3.3.0 # via code-annotations
7877
text-unidecode==1.3 # via -r requirements/test.txt, python-slugify
79-
toml==0.10.1 # via -r requirements/test.txt, tox
78+
toml==0.10.2 # via -r requirements/test.txt, pylint, pytest, tox
8079
tox-battery==0.6.1 # via -r requirements/test.in, -r requirements/test.txt
81-
tox==3.17.1 # via -r requirements/test.in, -r requirements/test.txt, tox-battery
82-
typed-ast==1.4.1 # via astroid
83-
typing==3.7.4.3 # via -r requirements/test.txt, fs
84-
urllib3==1.25.10 # via -r requirements/test.txt, botocore, requests
85-
virtualenv==20.0.27 # via -r requirements/test.txt, tox
86-
wcwidth==0.2.5 # via -r requirements/test.txt, pytest
87-
web-fragments==0.3.2 # via -r requirements/base.in, -r requirements/test.txt, xblock
88-
webob==1.8.6 # via -r requirements/base.in, -r requirements/test.txt, xblock
89-
wrapt==1.11.2 # via astroid
90-
xblock==1.3.1 # via -r requirements/base.in, -r requirements/test.txt, acid-xblock
91-
zipp==1.2.0 # via -r requirements/test.txt, importlib-metadata, importlib-resources
80+
tox==3.23.0 # via -r requirements/test.in, -r requirements/test.txt, tox-battery
81+
urllib3==1.26.4 # via -r requirements/test.txt, botocore, requests
82+
virtualenv==20.4.4 # via -r requirements/test.txt, tox
83+
web-fragments==1.0.0 # via -r requirements/base.in, -r requirements/test.txt, xblock
84+
webob==1.8.7 # via -r requirements/base.in, -r requirements/test.txt, xblock
85+
wrapt==1.12.1 # via astroid
86+
xblock==1.4.0 # via -r requirements/base.in, -r requirements/test.txt, acid-xblock
9287

9388
# The following packages are considered to be unsafe in a requirements file:
9489
# setuptools

0 commit comments

Comments
 (0)