Skip to content

Commit 3bbdba2

Browse files
authored
Merge pull request #21 from edx/feanil/make_upgrade
Run `make upgrade`
2 parents c02e8d3 + 097e9a5 commit 3bbdba2

File tree

16 files changed

+166
-144
lines changed

16 files changed

+166
-144
lines changed

requirements/base.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# Core requirements for using this application
2+
-c constraints.txt
23

34
Django>=1.8,<2 # Web application framework
45
djangorestframework>=3.6,<3.7

requirements/base.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
#
55
# make upgrade
66
#
7-
django==1.11.14
7+
django==1.11.20
88
djangorestframework==3.6.4
9-
pytz==2018.5 # via django
9+
pytz==2019.1 # via django

requirements/constraints.txt

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Version constraints for pip installation.
2+
#
3+
# This file doesn't install any packages. It specifies version constraints
4+
# that will be applied if a package is needed.
5+
#
6+
# When pinning something here, please provide an explanation of why. Ideally,
7+
# link to other information that will help people in the future to remove the
8+
# pin when possible. Writing an issue against the offending project and
9+
# linking to it here is good.
10+
11+
# Sphinx 2.0.0 drops support for python 2.7 which we still need.
12+
Sphinx<2.0.0
13+
14+
15+
# A dependency of pytest. Pytest doesn't constrain it and 6.0.0 onward
16+
# only works with python 3
17+
more-itertools<6.0.0

requirements/dev.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# Additional requirements for development of this application
2+
-c constraints.txt
23

34
-r pip-tools.txt # Dependencies for requirements file management
45
-r quality.txt # All dependencies needed to run and test django-config-models

requirements/dev.txt

Lines changed: 43 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -5,56 +5,59 @@
55
# make upgrade
66
#
77
argparse==1.4.0
8-
astroid==1.5.2
9-
atomicwrites==1.1.5
10-
attrs==18.1.0
8+
astroid==1.5.3
9+
atomicwrites==1.3.0
10+
attrs==19.1.0
1111
backports.functools-lru-cache==1.5
1212
caniusepython3==7.0.0
13-
certifi==2018.4.16
13+
certifi==2019.3.9
1414
chardet==3.0.4
15-
click-log==0.1.8
16-
click==6.7
15+
click-log==0.3.2
16+
click==7.0
1717
codecov==2.0.15
18-
coverage==4.5.1
19-
ddt==1.1.3
20-
distlib==0.2.7
21-
django==1.11.14
18+
coverage==4.5.3
19+
ddt==1.2.1
20+
distlib==0.2.8
21+
django==1.11.20
2222
djangorestframework==3.6.4
23-
edx-i18n-tools==0.4.7
24-
edx-lint==0.5.5
25-
first==2.0.1
26-
freezegun==0.3.10
27-
idna==2.7
28-
isort==4.3.4
23+
edx-i18n-tools==0.4.8
24+
edx-lint==1.1.2
25+
filelock==3.0.10
26+
freezegun==0.3.11
27+
idna==2.8
28+
importlib-metadata==0.9 # via path.py
29+
isort==4.3.17
2930
lazy-object-proxy==1.3.1
3031
mccabe==0.6.1
3132
mock==2.0.0
32-
more-itertools==4.2.0
33-
packaging==17.1
34-
path.py==11.0.1 # via edx-i18n-tools
35-
pbr==4.1.0
36-
pip-tools==2.0.2
37-
pluggy==0.6.0
33+
more-itertools==5.0.0
34+
packaging==19.0
35+
path.py==12.0.1 # via edx-i18n-tools
36+
pbr==5.1.3
37+
pip-tools==3.6.0
38+
pluggy==0.9.0
3839
polib==1.1.0 # via edx-i18n-tools
39-
py==1.5.4
40-
pycodestyle==2.4.0
41-
pydocstyle==2.1.1
40+
py==1.8.0
41+
pycodestyle==2.5.0
42+
pydocstyle==3.0.0
4243
pylint-celery==0.3
4344
pylint-django==0.7.2
44-
pylint-plugin-utils==0.3
45-
pylint==1.7.1
46-
pyparsing==2.2.0
47-
pytest-cov==2.5.1
48-
pytest-django==3.3.2
49-
pytest==3.6.3
50-
python-dateutil==2.7.3
51-
pytz==2018.5
52-
pyyaml==3.13 # via edx-i18n-tools
53-
requests==2.19.1
54-
six==1.11.0
45+
pylint-plugin-utils==0.5
46+
pylint==1.7.6
47+
pyparsing==2.4.0
48+
pytest-cov==2.6.1
49+
pytest-django==3.4.8
50+
pytest==4.4.1
51+
python-dateutil==2.8.0
52+
pytz==2019.1
53+
pyyaml==5.1 # via edx-i18n-tools
54+
requests==2.21.0
55+
six==1.12.0
5556
snowballstemmer==1.2.1
57+
toml==0.10.0
5658
tox-battery==0.5.1
57-
tox==3.1.2
58-
urllib3==1.23
59-
virtualenv==16.0.0
60-
wrapt==1.10.11
59+
tox==3.9.0
60+
urllib3==1.24.2
61+
virtualenv==16.4.3
62+
wrapt==1.11.1
63+
zipp==0.3.3 # via importlib-metadata

requirements/doc.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# Requirements for documentation validation
2+
-c constraints.txt
23

34
-r test.txt # Core and test dependencies so sphinx-apidoc can import the code to document
45

requirements/doc.txt

Lines changed: 32 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -4,47 +4,42 @@
44
#
55
# make upgrade
66
#
7-
alabaster==0.7.11 # via sphinx
8-
atomicwrites==1.1.5
9-
attrs==18.1.0
7+
alabaster==0.7.12 # via sphinx
8+
atomicwrites==1.3.0
9+
attrs==19.1.0
1010
babel==2.6.0 # via sphinx
11-
bleach==2.1.3 # via readme-renderer
12-
certifi==2018.4.16 # via requests
13-
cffi==1.11.5 # via cmarkgfm
11+
bleach==3.1.0 # via readme-renderer
12+
certifi==2019.3.9 # via requests
1413
chardet==3.0.4 # via requests
15-
cmarkgfm==0.4.2 # via readme-renderer
16-
coverage==4.5.1
17-
ddt==1.1.3
18-
django==1.11.14
14+
coverage==4.5.3
15+
ddt==1.2.1
16+
django==1.11.20
1917
djangorestframework==3.6.4
2018
docutils==0.14 # via readme-renderer, sphinx
21-
freezegun==0.3.10
22-
future==0.16.0 # via readme-renderer
23-
html5lib==1.0.1 # via bleach
24-
idna==2.7 # via requests
25-
imagesize==1.0.0 # via sphinx
26-
jinja2==2.10 # via sphinx
27-
markupsafe==1.0 # via jinja2
19+
freezegun==0.3.11
20+
idna==2.8 # via requests
21+
imagesize==1.1.0 # via sphinx
22+
jinja2==2.10.1 # via sphinx
23+
markupsafe==1.1.1 # via jinja2
2824
mock==2.0.0
29-
more-itertools==4.2.0
30-
packaging==17.1 # via sphinx
31-
pbr==4.1.0
32-
pluggy==0.6.0
33-
py==1.5.4
34-
pycparser==2.18 # via cffi
35-
pygments==2.2.0 # via readme-renderer, sphinx
36-
pyparsing==2.2.0 # via packaging
37-
pytest-cov==2.5.1
38-
pytest-django==3.3.2
39-
pytest==3.6.3
40-
python-dateutil==2.7.3
41-
pytz==2018.5
42-
readme-renderer==21.0
43-
requests==2.19.1 # via sphinx
44-
six==1.11.0
25+
more-itertools==5.0.0
26+
packaging==19.0 # via sphinx
27+
pbr==5.1.3
28+
pluggy==0.9.0
29+
py==1.8.0
30+
pygments==2.3.1 # via readme-renderer, sphinx
31+
pyparsing==2.4.0 # via packaging
32+
pytest-cov==2.6.1
33+
pytest-django==3.4.8
34+
pytest==4.4.1
35+
python-dateutil==2.8.0
36+
pytz==2019.1
37+
readme-renderer==24.0
38+
requests==2.21.0 # via sphinx
39+
six==1.12.0
4540
snowballstemmer==1.2.1 # via sphinx
46-
sphinx-rtd-theme==0.4.0
47-
sphinx==1.7.5
41+
sphinx-rtd-theme==0.4.3
42+
sphinx==1.8.5
4843
sphinxcontrib-websupport==1.1.0 # via sphinx
49-
urllib3==1.23 # via requests
50-
webencodings==0.5.1 # via html5lib
44+
urllib3==1.24.2 # via requests
45+
webencodings==0.5.1 # via bleach

requirements/pip-tools.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
# Just the dependencies to run pip-tools, mainly for the "upgrade" make target
2+
-c constraints.txt
23

34
pip-tools # Contains pip-compile, used to generate pip requirements files

requirements/pip-tools.txt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
#
55
# make upgrade
66
#
7-
click==6.7 # via pip-tools
8-
first==2.0.1 # via pip-tools
9-
pip-tools==2.0.2
10-
six==1.11.0 # via pip-tools
7+
click==7.0 # via pip-tools
8+
pip-tools==3.6.0
9+
six==1.12.0 # via pip-tools

requirements/quality.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# Requirements for code quality checks
2+
-c constraints.txt
23

34
-r test.txt # Core and test dependencies, for pylint analysis
45

0 commit comments

Comments
 (0)