Skip to content

Commit 4e0ba4c

Browse files
committed
Bump python packages
1 parent 1f3826f commit 4e0ba4c

File tree

4 files changed

+111
-108
lines changed

4 files changed

+111
-108
lines changed

src/Makefile

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
1-
.PHONY: install frontend messages pip node_modules requirements upgrade
1+
.PHONY: install frontend messages env sync node_modules requirements upgrade
22

3-
install: pip node_modules frontend
3+
install: env node_modules frontend
44

55
requirements: requirements/base.in
66
pip-compile -v --output-file requirements/base.txt requirements/base.in
77

8-
pip:
8+
env:
99
pip install -r requirements/dev.txt
1010

11+
sync:
12+
pip-sync requirements/dev.txt requirements/base.txt
13+
1114
upgrade:
12-
pip install pip-tools pur
1315
pur --patch=Django -r requirements/base.in
1416
pur --no-recursive -r requirements/docker.txt
1517
pur --no-recursive -r requirements/dev.txt

src/requirements/base.in

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Install with: `pip install -r requirements/base.txt`
22

33
# Infrastructure
4-
Django == 1.11.28
4+
Django == 1.11.29
55
Pillow == 7.0.0
66
psycopg2 == 2.8.4
77
python-memcached == 1.59
@@ -37,17 +37,17 @@ fluentcms-twitterfeed == 1.0.3
3737
brotlipy >= 0.7.0
3838
django-admin-tools == 0.9.0
3939
django-analytical == 2.5.0
40-
django-any-imagefield == 1.0
40+
django-any-imagefield == 1.1
4141
django-any-urlfield == 2.6.2
42-
django-axes == 5.2.2
42+
django-axes == 5.3.0
4343
django-categories-i18n == 1.1.1
4444
django-compressor == 2.4
4545
django-contrib-comments == 1.9.2
46-
django-crispy-forms == 1.8.1
46+
django-crispy-forms == 1.9.0
4747
django-environ == 0.4.5
4848
django-filebrowser-no-grappelli == 3.8.0
4949
django-forms-builder == 0.14.0
50-
django-gravatar2 == 1.4.3
50+
django-gravatar2 == 1.4.4
5151
django-healthchecks == 1.4.2
5252
django-mptt == 0.11.0
5353
django-parler == 2.0.1
@@ -66,27 +66,27 @@ django-webmaster-verification == 0.3.0
6666
django-wysiwyg == 0.8.0
6767
docutils == 0.16
6868
html5lib == 1.0.1
69-
Markdown == 3.1.1
69+
Markdown == 3.2.1
7070
micawber == 0.5.1
7171
netaddr == 0.7.19
7272
pytz == 2019.3
7373
redis == 3.4.1
7474
smartypants == 2.0.1
75-
sorl-thumbnail == 12.6.2
75+
sorl-thumbnail == 12.6.3
7676
taggit-selectize == 2.7.1
7777
whitenoise == 5.0.1
7878
xlwt == 1.3.0
7979

8080
# Installed dependencies
8181
django-template-analyzer >= 1.6.2
82-
phonenumberslite >= 8.11.3
82+
phonenumberslite >= 8.11.5
8383
python-akismet >= 0.4.1
8484

8585
# Testing
86-
mock == 3.0.5
86+
mock == 4.0.2
8787
coverage == 5.0.3
8888

89-
# Pytest (optional testrunner)
89+
# Pytest
9090
pytest == 5.3.5
9191
pytest-django == 3.8.0
9292
pytest-cov == 2.8.1

src/requirements/base.txt

Lines changed: 88 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -7,123 +7,123 @@
77
attrs==19.3.0 # via pytest
88
babel==2.8.0 # via django-phonenumber-field
99
beautifulsoup4==4.8.2 # via django-fluent-contents, fluentcms-emailtemplates
10-
brotlipy==0.7.0
10+
brotlipy==0.7.0 # via -r requirements/base.in
1111
certifi==2019.11.28 # via requests
12-
cffi==1.13.2 # via brotlipy
12+
cffi==1.14.0 # via brotlipy
1313
chardet==3.0.4 # via requests
14-
coverage==5.0.3
15-
django-admin-tools==0.9.0
16-
django-analytical==2.5.0
17-
django-any-imagefield==1.0
18-
django-any-urlfield==2.6.2
14+
coverage==5.0.3 # via -r requirements/base.in, pytest-cov
15+
django-admin-tools==0.9.0 # via -r requirements/base.in, django-fluent-dashboard
16+
django-analytical==2.5.0 # via -r requirements/base.in
17+
django-any-imagefield==1.1 # via -r requirements/base.in
18+
django-any-urlfield==2.6.2 # via -r requirements/base.in
1919
django-appconf==1.0.3 # via django-axes, django-compressor, fluentcms-emailtemplates
20-
django-axes==5.2.2
21-
django-categories-i18n==1.1.1
22-
django-compressor==2.4
23-
django-contrib-comments==1.9.2
24-
django-crispy-forms==1.8.1
20+
django-axes==5.3.0 # via -r requirements/base.in
21+
django-categories-i18n==1.1.1 # via -r requirements/base.in, django-fluent-blogs
22+
django-compressor==2.4 # via -r requirements/base.in
23+
django-contrib-comments==1.9.2 # via -r requirements/base.in, django-fluent-comments, django-threadedcomments
24+
django-crispy-forms==1.9.0 # via -r requirements/base.in, django-fluent-comments, fluentcms-contactform
2525
django-email-extras==0.3.4 # via django-forms-builder
26-
django-environ==0.4.5
27-
django-filebrowser-no-grappelli==3.8.0
28-
django-fluent-blogs==2.0.5
29-
django-fluent-comments==2.1
30-
django-fluent-contents[code,markup,oembeditem,text]==2.0.7
31-
django-fluent-dashboard==1.0.1
32-
django-fluent-pages==2.0.7
33-
django-fluent-utils==2.0.1
34-
django-forms-builder==0.14.0
26+
django-environ==0.4.5 # via -r requirements/base.in
27+
django-filebrowser-no-grappelli==3.8.0 # via -r requirements/base.in
28+
django-fluent-blogs==2.0.5 # via -r requirements/base.in
29+
django-fluent-comments==2.1 # via -r requirements/base.in
30+
django-fluent-contents[code,markup,oembeditem,text]==2.0.7 # via -r requirements/base.in, django-fluent-blogs, fluentcms-button, fluentcms-contactform, fluentcms-cookielaw, fluentcms-countdown, fluentcms-emailtemplates, fluentcms-file, fluentcms-forms-builder, fluentcms-googlemaps, fluentcms-jumbotron, fluentcms-link, fluentcms-pager, fluentcms-privatenotes, fluentcms-teaser, fluentcms-twitterfeed
31+
django-fluent-dashboard==1.0.1 # via -r requirements/base.in
32+
django-fluent-pages==2.0.7 # via -r requirements/base.in
33+
django-fluent-utils==2.0.1 # via -r requirements/base.in, django-fluent-blogs, django-fluent-contents, django-fluent-pages, fluentcms-emailtemplates
34+
django-forms-builder==0.14.0 # via -r requirements/base.in, fluentcms-forms-builder
3535
django-geoposition==0.3.0 # via fluentcms-googlemaps
36-
django-gravatar2==1.4.3
37-
django-healthchecks==1.4.2
36+
django-gravatar2==1.4.4 # via -r requirements/base.in
37+
django-healthchecks==1.4.2 # via -r requirements/base.in
3838
django-ipware==2.1.0 # via django-axes
3939
django-js-asset==1.2.2 # via django-mptt
40-
django-mptt==0.11.0
41-
django-parler==2.0.1
42-
django-phonenumber-field==4.0.0
43-
django-polymorphic-tree==1.5.1
44-
django-polymorphic==2.1.2
40+
django-mptt==0.11.0 # via -r requirements/base.in, django-categories-i18n, django-fluent-pages, django-polymorphic-tree
41+
django-parler==2.0.1 # via -r requirements/base.in, django-categories-i18n, django-fluent-blogs, django-fluent-contents, django-fluent-pages, fluentcms-emailtemplates
42+
django-phonenumber-field==4.0.0 # via -r requirements/base.in, fluentcms-contactform
43+
django-polymorphic-tree==1.5.1 # via -r requirements/base.in, django-fluent-pages
44+
django-polymorphic==2.1.2 # via -r requirements/base.in, django-fluent-contents, django-fluent-pages, django-polymorphic-tree
4545
django-ranged-response==0.2.0 # via django-simple-captcha
46-
django-redis==4.11.0
47-
django-simple-captcha==0.5.12
48-
django-slug-preview==1.0.4
49-
django-staff-toolbar==1.2
50-
django-tag-parser==3.2
51-
django-taggit==1.2.0
52-
django-template-analyzer==1.6.2
53-
django-threadedcomments==1.2
54-
django-tinymce==2.8.0
55-
django-webmaster-verification==0.3.0
56-
django-wysiwyg==0.8.0
57-
django==1.11.28
58-
docutils==0.16
59-
fluentcms-button==2.0
60-
fluentcms-contactform==2.0
61-
fluentcms-cookielaw==2.0
62-
fluentcms-countdown==1.2
63-
fluentcms-emailtemplates==2.0
64-
fluentcms-file==1.0.2
65-
fluentcms-forms-builder==1.0.5
66-
fluentcms-googlemaps==1.4
67-
fluentcms-jumbotron==2.0
68-
fluentcms-link==1.0.2
69-
fluentcms-pager==2.0
70-
fluentcms-privatenotes==2.0
71-
fluentcms-teaser==1.1.2
72-
fluentcms-twitterfeed==1.0.3
46+
django-redis==4.11.0 # via -r requirements/base.in
47+
django-simple-captcha==0.5.12 # via -r requirements/base.in
48+
django-slug-preview==1.0.4 # via -r requirements/base.in, django-fluent-blogs, django-fluent-pages
49+
django-staff-toolbar==1.2 # via -r requirements/base.in
50+
django-tag-parser==3.2 # via -r requirements/base.in, django-fluent-blogs, django-fluent-comments, django-fluent-contents, django-fluent-pages, django-polymorphic-tree
51+
django-taggit==1.2.0 # via -r requirements/base.in
52+
django-template-analyzer==1.6.2 # via -r requirements/base.in, django-fluent-contents
53+
django-threadedcomments==1.2 # via -r requirements/base.in
54+
django-tinymce==2.8.0 # via -r requirements/base.in
55+
django-webmaster-verification==0.3.0 # via -r requirements/base.in
56+
django-wysiwyg==0.8.0 # via -r requirements/base.in, django-fluent-contents, fluentcms-googlemaps
57+
django==1.11.29 # via -r requirements/base.in, django-analytical, django-appconf, django-axes, django-contrib-comments, django-forms-builder, django-healthchecks, django-mptt, django-phonenumber-field, django-polymorphic, django-ranged-response, django-redis, django-simple-captcha, django-taggit, django-webmaster-verification
58+
docutils==0.16 # via -r requirements/base.in, django-fluent-contents
59+
fluentcms-button==2.0 # via -r requirements/base.in
60+
fluentcms-contactform==2.0 # via -r requirements/base.in
61+
fluentcms-cookielaw==2.0 # via -r requirements/base.in
62+
fluentcms-countdown==1.2 # via -r requirements/base.in
63+
fluentcms-emailtemplates==2.0 # via -r requirements/base.in
64+
fluentcms-file==1.0.2 # via -r requirements/base.in
65+
fluentcms-forms-builder==1.0.5 # via -r requirements/base.in
66+
fluentcms-googlemaps==1.4 # via -r requirements/base.in
67+
fluentcms-jumbotron==2.0 # via -r requirements/base.in
68+
fluentcms-link==1.0.2 # via -r requirements/base.in
69+
fluentcms-pager==2.0 # via -r requirements/base.in
70+
fluentcms-privatenotes==2.0 # via -r requirements/base.in
71+
fluentcms-teaser==1.1.2 # via -r requirements/base.in
72+
fluentcms-twitterfeed==1.0.3 # via -r requirements/base.in
7373
future==0.15.0 # via django-fluent-contents, django-fluent-dashboard, django-fluent-pages, django-forms-builder, django-polymorphic-tree
7474
geographiclib==1.50 # via geopy
7575
geopy==1.21.0 # via fluentcms-googlemaps
7676
html2text==2020.1.16 # via fluentcms-emailtemplates
77-
html5lib==1.0.1
78-
idna==2.8 # via requests
77+
html5lib==1.0.1 # via -r requirements/base.in, django-fluent-contents, textile
78+
idna==2.9 # via requests
7979
importlib-metadata==1.5.0 # via pluggy, pytest
80-
markdown==3.1.1
81-
micawber==0.5.1
82-
mock==3.0.5
80+
markdown==3.2.1 # via -r requirements/base.in, django-fluent-contents
81+
micawber==0.5.1 # via -r requirements/base.in, django-fluent-contents
82+
mock==4.0.2 # via -r requirements/base.in
8383
more-itertools==8.2.0 # via pytest
84-
netaddr==0.7.19
85-
packaging==20.1 # via pytest, pytest-sugar
86-
phonenumberslite==8.11.3
87-
pillow==7.0.0
84+
netaddr==0.7.19 # via -r requirements/base.in
85+
packaging==20.3 # via pytest, pytest-sugar
86+
phonenumberslite==8.11.5 # via -r requirements/base.in
87+
pillow==7.0.0 # via -r requirements/base.in, django-fluent-pages, django-simple-captcha
8888
pluggy==0.13.1 # via pytest
89-
psycopg2==2.8.4
89+
psycopg2==2.8.4 # via -r requirements/base.in
9090
py==1.8.1 # via pytest
91-
pycparser==2.19 # via cffi
92-
pygments==2.5.2 # via django-fluent-contents
91+
pycparser==2.20 # via cffi
92+
pygments==2.6.1 # via django-fluent-contents
9393
pyparsing==2.4.6 # via packaging
94-
pytest-cov==2.8.1
95-
pytest-django==3.8.0
96-
pytest-sugar==0.9.2
97-
pytest==5.3.5
98-
python-akismet==0.4.1
94+
pytest-cov==2.8.1 # via -r requirements/base.in
95+
pytest-django==3.8.0 # via -r requirements/base.in
96+
pytest-sugar==0.9.2 # via -r requirements/base.in
97+
pytest==5.3.5 # via -r requirements/base.in, pytest-cov, pytest-django, pytest-sugar
98+
python-akismet==0.4.1 # via -r requirements/base.in, django-fluent-comments
9999
python-gnupg==0.4.5 # via django-email-extras
100-
python-memcached==1.59
101-
pytz==2019.3
102-
raven==6.10.0
100+
python-memcached==1.59 # via -r requirements/base.in
101+
pytz==2019.3 # via -r requirements/base.in, babel, django
102+
raven==6.10.0 # via -r requirements/base.in
103103
rcssmin==1.0.6 # via django-compressor
104-
redis==3.4.1
105-
regex==2020.1.8 # via textile
106-
requests==2.22.0 # via django-healthchecks, python-akismet
104+
redis==3.4.1 # via -r requirements/base.in, django-redis
105+
regex==2020.2.20 # via textile
106+
requests==2.23.0 # via django-healthchecks, python-akismet
107107
rjsmin==1.1.0 # via django-compressor
108-
six==1.14.0 # via django-appconf, django-compressor, django-contrib-comments, django-filebrowser-no-grappelli, django-fluent-contents, django-healthchecks, django-parler, django-simple-captcha, html5lib, mock, packaging, python-memcached
109-
smartypants==2.0.1
110-
sorl-thumbnail==12.6.2
111-
soupsieve==1.9.5 # via beautifulsoup4
108+
six==1.14.0 # via django-appconf, django-compressor, django-contrib-comments, django-filebrowser-no-grappelli, django-fluent-contents, django-healthchecks, django-parler, django-simple-captcha, html5lib, packaging, python-memcached
109+
smartypants==2.0.1 # via -r requirements/base.in
110+
sorl-thumbnail==12.6.3 # via -r requirements/base.in
111+
soupsieve==2.0 # via beautifulsoup4
112112
sphinx-me==0.3 # via django-forms-builder
113-
taggit-selectize==2.7.1
113+
taggit-selectize==2.7.1 # via -r requirements/base.in
114114
termcolor==1.1.0 # via pytest-sugar
115115
textile==4.0.1 # via django-fluent-contents
116116
twitter-text==3.0 # via fluentcms-twitterfeed
117117
unicodecsv==0.14.1 # via fluentcms-googlemaps
118118
unidecode==1.1.1 # via django-forms-builder
119119
urllib3==1.25.8 # via requests
120-
uwsgi==2.0.18
120+
uwsgi==2.0.18 # via -r requirements/base.in
121121
wcwidth==0.1.8 # via pytest
122122
webencodings==0.5.1 # via html5lib
123-
whitenoise==5.0.1
124-
wsgiunproxy==1.0
125-
xlwt==1.3.0
126-
zipp==2.1.0 # via importlib-metadata
123+
whitenoise==5.0.1 # via -r requirements/base.in
124+
wsgiunproxy==1.0 # via -r requirements/base.in
125+
xlwt==1.3.0 # via -r requirements/base.in
126+
zipp==3.1.0 # via importlib-metadata
127127

128128
# The following packages are considered to be unsafe in a requirements file:
129129
# setuptools

src/requirements/dev.txt

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,17 @@
33
-r ./base.txt
44

55
# Tools for building
6-
pip-tools == 4.4.1
6+
pip-tools == 4.5.1
7+
pur == 5.3.0
78

89
# Useful extra developer packages:
910

1011
# Debugging
1112
django-debug-toolbar == 2.2
12-
django-extensions == 2.2.6
13+
django-extensions == 2.2.8
1314

1415
# Documentation
15-
Sphinx == 2.3.1
16+
Sphinx == 2.4.4
1617
sphinx-rtd-theme >= 0.4.3
1718

1819
# Profiling
@@ -21,6 +22,6 @@ geordi == 0.3
2122
yet-another-django-profiler == 1.1.0
2223

2324
# Debugging
24-
django-debugtools == 1.7.4
25-
ipython == 7.12.0
26-
ptpython == 3.0.0
25+
django-debugtools == 1.8
26+
ipython == 7.13.0
27+
ptpython == 3.0.1

0 commit comments

Comments
 (0)