Skip to content
This repository has been archived by the owner on Dec 21, 2018. It is now read-only.

Commit

Permalink
Merge pull request #385 from pmac/upgrade-django-1.11
Browse files Browse the repository at this point in the history
Fix #382: Upgrade Django to 1.11.1
  • Loading branch information
pmac committed May 9, 2017
2 parents 2b92e86 + d51e817 commit 7070ace
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 4 deletions.
1 change: 0 additions & 1 deletion requirements-dev.txt
Expand Up @@ -21,7 +21,6 @@ docutils==0.12 --hash=sha256:dcebd4928112631626f4c4d0df59787c748404e66dda9521100
alabaster==0.7.8 --hash=sha256:e86ae2eb1a0297454ce6bbe94414fbb272ed9f148b9ca5344dc213164e0d3d74
babel==2.3.4 --hash=sha256:3318ed2960240d61cbc6558858ee00c10eed77a6508c4d1ed8e6f7f48399c975
snowballstemmer==1.2.1 --hash=sha256:9f3bcd3c401c3e862ec0ebe6d2c069ebc012ce142cce209c098ccb5b09136e89
pytz==2016.6.1 --hash=sha256:7833bf559800232d3965b70e69642ebdadc76f7988f8d0a1440e072193ecd949
urlwait==0.3 \
--hash=sha256:2b1fb4e5085344f91f1aaaa3c1809e44d100691b20c2431cb81af1824d82939c \
--hash=sha256:54eb1cc8346f24fd906d379447b49c25a19af220cf7be35c8bac136ee8f09105
Expand Down
16 changes: 13 additions & 3 deletions requirements.txt
Expand Up @@ -15,9 +15,9 @@ everett==0.7 \
dj-database-url==0.4.1 --hash=sha256:7f4c78d2a090df8dfaf56d5d3ff7bbee17360436e4879558317e2314424864cd

# base
Django==1.10.7 \
--hash=sha256:e68fd450154ad7ee2c88472bb812350490232462adc6e3c6bcb544abe5212134 \
--hash=sha256:593d779dbc2350a245c4f76d26bdcad58a39895e87304fe6d725bbdf84b5b0b8
Django==1.11.1 \
--hash=sha256:bb3109a31cfa016e5f234223665f80fc06107f2169afb9f6dc8828295db73547 \
--hash=sha256:bbcefdf822eeef2cd04718ebcc24dd2ecf47407258cfcde2b4f95df57ce33a8c
bleach==2.0.0 \
--hash=sha256:a6d9d5f5b7368c1689ad7f128af8e792beea23393688872b576c0271e6564a16 \
--hash=sha256:b9522130003e4caedf4f00a39c120a906dcd4242329c1c8f621f5370203cbc30
Expand Down Expand Up @@ -91,3 +91,13 @@ simplejson==3.10.0 \
--hash=sha256:7e6f55c72388afa83c38fda0d5dab710f364476b661d8b5441ab79c1d402e9be
webencodings==0.5 \
--hash=sha256:a5c55ee93b24e740fe951c37b5c228dccc1f171450e188555a775261cce1b904
pytz==2017.2 \
--hash=sha256:c883c2d6670042c7bc1688645cac73dd2b03193d1f7a6847b6154e96890be06d \
--hash=sha256:03c9962afe00e503e2d96abab4e8998a0f84d4230fa57afe1e0528473698cdd9 \
--hash=sha256:487e7d50710661116325747a9cd1744d3323f8e49748e287bc9e659060ec6bf9 \
--hash=sha256:43f52d4c6a0be301d53ebd867de05e2926c35728b3260157d274635a0a947f1c \
--hash=sha256:d1d6729c85acea5423671382868627129432fba9a89ecbb248d8d1c7a9f01c67 \
--hash=sha256:54a935085f7bf101f86b2aff75bd9672b435f51c3339db2ff616e66845f2b8f9 \
--hash=sha256:39504670abb5dae77f56f8eb63823937ce727d7cdd0088e6909e6dcac0f89043 \
--hash=sha256:ddc93b6d41cfb81266a27d23a79e13805d4a5521032b512643af8729041a81b4 \
--hash=sha256:f5c056e8f62d45ba8215e5cb8f50dfccb198b4b9fbea8500674f3443e4689589

0 comments on commit 7070ace

Please sign in to comment.