From 8f18c69cbabbe57321666da9847ce315d8817b44 Mon Sep 17 00:00:00 2001 From: Oleg Lavrovsky Date: Wed, 12 Sep 2018 09:02:07 +0200 Subject: [PATCH 1/6] Requirements unlocked --- requirements.txt | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/requirements.txt b/requirements.txt index 63b0239..7569e8e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,32 +1,32 @@ # Updated: 16.5.2018 # Core -wagtail>=1.13.1,<2.0.0 -Django>=1.11.7,<2.0.0 +wagtail>=1.13.1 +Django>=1.11.7 elasticsearch>=2.0.0,<3.0.0 # Database -psycopg2==2.7.5 -psycopg2-binary==2.7.5 -dj-database-url==0.5.0 +psycopg2>=2.7.5 +psycopg2-binary>=2.7.5 +dj-database-url>=0.5.0 # Content -puput==0.9.2 -guess-language-spirit==0.5.3 +puput>=0.9.2 +guess-language-spirit>=0.5.3 # Caching -django-redis==4.9.0 +django-redis>=4.9.0 # Frontend -django-libsass==0.7 -libsass==0.14.5 -Pillow==5.2.0 +django-libsass>=0.7 +libsass>=0.14.5 +Pillow>=5.2.0 # Development tools -stellar==0.4.5 +stellar>=0.4.5 # Production dependencies -gunicorn==19.9.0 -whitenoise==3.3.1 -ConcurrentLogHandler==0.9.1 -django-anymail==3.0 +gunicorn>=19.9.0 +whitenoise>=3.3.1 +ConcurrentLogHandler>=0.9.1 +django-anymail>=3.0 From cbb7f76348014cd7b18e26c22d28cdd2deea765c Mon Sep 17 00:00:00 2001 From: Oleg Lavrovsky Date: Wed, 12 Sep 2018 09:10:45 +0200 Subject: [PATCH 2/6] Requirements unlocked --- publichealth/settings/base.py | 1 - requirements.txt | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/publichealth/settings/base.py b/publichealth/settings/base.py index 81aa2cf..f58587a 100644 --- a/publichealth/settings/base.py +++ b/publichealth/settings/base.py @@ -36,7 +36,6 @@ INSTALLED_APPS = [ 'publichealth.home.templatetags', 'publichealth.search', - 'wagtail.contrib.wagtailsearchpromotions', 'wagtail.contrib.wagtailroutablepage', 'wagtail.contrib.wagtailsitemaps', 'wagtail.contrib.modeladmin', diff --git a/requirements.txt b/requirements.txt index 7569e8e..a27446c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,8 +1,8 @@ # Updated: 16.5.2018 # Core -wagtail>=1.13.1 -Django>=1.11.7 +wagtail>=1.13.1,<2.2.0 +Django>=1.11.7,<2.1.0 elasticsearch>=2.0.0,<3.0.0 # Database From cab4c2b59ccc433217ee4818f366d9f55cd977bb Mon Sep 17 00:00:00 2001 From: Oleg Lavrovsky Date: Mon, 13 May 2019 17:11:16 +0200 Subject: [PATCH 3/6] Wagtail module path updates --- Pipfile | 35 +- Pipfile.lock | 446 +++++++++--------- feedler/__init__.py | 6 +- feedler/admin.py | 2 +- feedler/migrations/0002_feedpage.py | 4 +- feedler/models/models.py | 6 +- .../migrations/0003_auto_20170223_0959.py | 26 +- .../migrations/0004_auto_20170308_2020.py | 6 +- .../migrations/0005_auto_20170308_2023.py | 10 +- .../migrations/0006_auto_20170308_2025.py | 6 +- ...09_contact_contactform_contactformfield.py | 10 +- .../migrations/0010_auto_20170410_2307.py | 18 +- .../migrations/0012_auto_20170419_1749.py | 14 +- .../migrations/0019_auto_20170908_1505.py | 12 +- .../migrations/0020_auto_20170920_1204.py | 10 +- .../migrations/0022_auto_20180525_1520.py | 18 +- publichealth/home/models/forms.py | 6 +- publichealth/home/models/models.py | 14 +- publichealth/home/models/snippets.py | 6 +- publichealth/home/routes.py | 6 +- publichealth/search/views.py | 4 +- publichealth/settings/base.py | 30 +- publichealth/settings/dev.py | 2 +- publichealth/settings/production.py | 6 +- publichealth/urls.py | 6 +- tests/testapp/settings.py | 4 +- 26 files changed, 357 insertions(+), 356 deletions(-) diff --git a/Pipfile b/Pipfile index 2e770e5..bc88aed 100644 --- a/Pipfile +++ b/Pipfile @@ -6,23 +6,22 @@ name = "pypi" [dev-packages] [packages] -Django = "<2.0.0,>=1.11.7" -wagtail = "<2.0.0,>=1.13.1" -elasticsearch = "<3.0.0,>=2.0.0" -"psycopg2" = ">=2.7.4" -"psycopg2-binary" = ">=2.7.4" -dj-database-url = ">=0.5.0" -puput = "==0.9.2" -django-redis = ">=4.9.0" -django-libsass = ">=0.7" -libsass = ">=0.14.5" -stellar = ">=0.4.5" -gunicorn = ">=19.8.1" -whitenoise = ">=3.3.1" -django-anymail = ">=2.2" -guess_language-spirit = ">=0.5.3" -Pillow = ">=5.1.0" -ConcurrentLogHandler = ">=0.9.1" +ConcurrentLogHandler = "*" +Django = ">=2.0,<2.2" +django-anymail = "*" +django-libsass = "*" +django-redis = "*" +dj-database-url = "*" +elasticsearch = "*" +guess_language-spirit = "*" +gunicorn = "*" +libsass = "*" +Pillow = ">=4.0.0,<6.0" +"psycopg2-binary" = "*" +puput = ">=1.0.0,<1.5" +stellar = "*" +wagtail = ">=2.0,<2.4" +whitenoise = "*" [requires] -python_version = "3.5" +python_version = "3.6.8" diff --git a/Pipfile.lock b/Pipfile.lock index 6289b38..d8dc03b 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,11 +1,11 @@ { "_meta": { "hash": { - "sha256": "df501ca072f36a5a3b92917ef767d62a6cabdcf2fc2bfe7e5eeee236c050ebe5" + "sha256": "cbfc07950cfbe622b61ff50609b67c60aae2de3cf56d3c20789c5a6388a57180" }, "pipfile-spec": 6, "requires": { - "python_version": "3.5" + "python_version": "3.6.8" }, "sources": [ { @@ -26,10 +26,10 @@ }, "certifi": { "hashes": [ - "sha256:13e698f54293db9f89122b0581843a782ad0934a4fe0172d2a980ba77fc61bb7", - "sha256:9fa520c1bacfb634fa7af20a76bcbd3d5fb390481724c597da32c719a7dca4b0" + "sha256:59b7658e26ca9c7339e00f8f4636cdfe59d34fa37b9b04f6f9e9926b3cece1a5", + "sha256:b26104d6835d1f5e49452a26eb2ff87fe7090b89dfcaee5ea2212697e1e1d7ae" ], - "version": "==2018.4.16" + "version": "==2019.3.9" }, "chardet": { "hashes": [ @@ -40,10 +40,10 @@ }, "click": { "hashes": [ - "sha256:29f99fc6125fbc931b758dc053b3114e55c77a6e4c6c3a2674a2dc986016381d", - "sha256:f15516df478d5a56180fbf80e68f206010e6d160fc39fa508b65e035fd75130b" + "sha256:2335065e6395b9e67ca716de5f7526736bfa6ceead690adf616d925bdc622b13", + "sha256:5b94b49521f6456670fdb30cd82a4eca9412788a93fa6dd6df72c94d5a8ff2d7" ], - "version": "==6.7" + "version": "==7.0" }, "concurrentloghandler": { "hashes": [ @@ -55,6 +55,13 @@ "index": "pypi", "version": "==0.9.1" }, + "contextlib2": { + "hashes": [ + "sha256:509f9419ee91cdd00ba34443217d5ca51f5a364a404e1dce9e8979cea969ca48", + "sha256:f5260a6e679d2ff42ec91ec5252f4eeffdcf21053db9113bd0a8e4d953769c00" + ], + "version": "==0.5.5" + }, "dj-database-url": { "hashes": [ "sha256:4aeaeb1f573c74835b0686a2b46b85990571159ffc21aa57ecd4d1e1cb334163", @@ -65,26 +72,33 @@ }, "django": { "hashes": [ - "sha256:18986bcffe69653a84eaf1faa1fa5a7eded32cee41cfecc77fdc65a3e046404d", - "sha256:46adfe8e0abe4d1f026c1086889970b611aec492784fbdfbdaabc2457360a4a5" + "sha256:0fd54e4f27bc3e0b7054a11e6b3a18fa53f2373f6b2df8a22e8eadfe018970a5", + "sha256:f3b28084101d516f56104856761bc247f85a2a5bbd9da39d9f6197ff461b3ee4" ], "index": "pypi", - "version": "==1.11.13" + "version": "==2.1.8" }, "django-anymail": { "hashes": [ - "sha256:a3c6d3793d5d2c2dbb5d8407c9881015d7733073aaa42865a0576ced27230a38", - "sha256:ea2302f0bb3b52c6abcb0a43a54ffcd7b5ef8e19d4c8f67dfeda2e23e26f4dc2" + "sha256:ab5cbfb280492c9cb2ef0497f8ebda4dcb3f99603dcf63c88ae623a66cad71f4", + "sha256:f872089943f30283d485d121924598f4156f5bfa76a0885fd66df5205102be0b" ], "index": "pypi", - "version": "==3.0" + "version": "==6.0" }, "django-appconf": { "hashes": [ - "sha256:6a4d9aea683b4c224d97ab8ee11ad2d29a37072c0c6c509896dd9857466fb261", - "sha256:ddab987d14b26731352c01ee69c090a4ebfc9141ed223bef039d79587f22acd9" + "sha256:35f13ca4d567f132b960e2cd4c832c2d03cb6543452d34e29b7ba10371ba80e3", + "sha256:c98a7af40062e996b921f5962a1c4f3f0c979fa7885f7be4710cceb90ebe13a6" ], - "version": "==1.0.2" + "version": "==1.0.3" + }, + "django-colorful": { + "hashes": [ + "sha256:49d3feefdabdf6a22931c12ce1ed0cbb4596e7754e66bd55c0f362c0a369e5cb", + "sha256:fd246f2fb297ed074dc4349966d33a1c82d0308b7fb0d6ef6e2e76b90cefffb7" + ], + "version": "==1.3" }, "django-compressor": { "hashes": [ @@ -108,24 +122,32 @@ }, "django-modelcluster": { "hashes": [ - "sha256:9edde7fb87b413c1114df47f928e95fbd6878de17f9f2caeea90e77766e272b5" + "sha256:59672386191d38c69d6f994c3f9aaab3ff93910ec71e78a0bb6aa9abd4d1b90a", + "sha256:eea507f2dd8bd283600c1cfa4de6776501a28f199089bb00613c1621505e80cc" ], - "version": "==3.1" + "version": "==4.4" }, "django-redis": { "hashes": [ - "sha256:15b47faef6aefaa3f47135a2aeb67372da300e4a4cf06809c66ab392686a2155", - "sha256:a90343c33a816073b735f0bed878eaeec4f83b75fcc0dce2432189b8ea130424" + "sha256:af0b393864e91228dd30d8c85b5c44d670b5524cb161b7f9e41acc98b6e5ace7", + "sha256:f46115577063d00a890867c6964ba096057f07cb756e78e0503b89cd18e4e083" ], "index": "pypi", - "version": "==4.9.0" + "version": "==4.10.0" + }, + "django-social-share": { + "hashes": [ + "sha256:27ce07b885e087ee7fa0fffc82d295b06a7b0bcf18d693ff8a619337bf7069e5", + "sha256:3627eb7fc8425dd45dabb7dfa17da5edec976e0d2c609c342aa763c7a24a69f0" + ], + "version": "==1.3.2" }, "django-taggit": { "hashes": [ - "sha256:58aa3e59e0643446e102523f22d137300298e2a537b1c5b0c310d99143f2c2b8", - "sha256:fd13e304ba37ff09e601c4797d893fb7d3e699a789b5afb0b09d686f94470441" + "sha256:a21cbe7e0879f1364eef1c88a2eda89d593bf000ebf51c3f00423c6927075dce", + "sha256:db4430ec99265341e05d0274edb0279163bd74357241f7b4d9274bdcb3338b17" ], - "version": "==0.22.2" + "version": "==0.23.0" }, "django-treebeard": { "hashes": [ @@ -135,18 +157,24 @@ }, "djangorestframework": { "hashes": [ - "sha256:0f9bfbac702f3376dfb2db4971ad8af4e066bfa35393b1b85e085f7e8b91189a", - "sha256:de8ac68b3cf6dd41b98e01dcc92dc0022a5958f096eafc181a17fa975d18ca42" + "sha256:376f4b50340a46c15ae15ddd0c853085f4e66058f97e4dbe7d43ed62f5e60651", + "sha256:c12869cfd83c33d579b17b3cb28a2ae7322a53c3ce85580c2a2ebe4e3f56c4fb" ], - "version": "==3.6.4" + "version": "==3.9.4" + }, + "draftjs-exporter": { + "hashes": [ + "sha256:8430b6c0f2a1c644ef9959b36f2f36f093f8209b94f81b4443216d3f386a3bce" + ], + "version": "==2.1.5" }, "elasticsearch": { "hashes": [ - "sha256:bb8f9a365ba6650d599428538c8aed42033264661d8f7d353da59d5892305f72", - "sha256:fead47ebfcaabd1c53dbfc21403eb99ac207eef76de8002fe11a1c8ec9589ce2" + "sha256:445c6ea9c55c493bae635718de6b276034f55378c836f9550ae49dd8cd04a02b", + "sha256:df6d348f6f4788669d4e345a4270101783d9f49ee53c34b01676808261122e27" ], "index": "pypi", - "version": "==2.4.1" + "version": "==7.0.1" }, "guess-language-spirit": { "hashes": [ @@ -157,18 +185,18 @@ }, "gunicorn": { "hashes": [ - "sha256:7ef2b828b335ed58e3b64ffa84caceb0a7dd7c5ca12f217241350dec36a1d5dc", - "sha256:bc59005979efb6d2dd7d5ba72d99f8a8422862ad17ff3a16e900684630dd2a10" + "sha256:aa8e0b40b4157b36a5df5e599f45c9c76d6af43845ba3b3b0efe2c70473c2471", + "sha256:fa2662097c66f920f53f70621c6c58ca4a3c4d3434205e608e121b5b3b71f4f3" ], "index": "pypi", - "version": "==19.8.1" + "version": "==19.9.0" }, "html5lib": { "hashes": [ - "sha256:b8934484cf22f1db684c0fae27569a0db404d0208d20163fbf51cc537245d008", - "sha256:ee747c0ffd3028d2722061936b5c65ee4fe13c8e4613519b4447123fc4546298" + "sha256:20b159aa3badc9d5ee8f5c647e5efd02ed2a66ab8d354930bd9ff139fc1dc0a3", + "sha256:66cb0dcfdbbc4f9c3ba1a63fdb511ffdbd4f513b2b6d81b80cd26ce6b3fb3736" ], - "version": "==0.999999999" + "version": "==1.0.1" }, "humanize": { "hashes": [ @@ -178,193 +206,167 @@ }, "idna": { "hashes": [ - "sha256:2c6a5de3089009e3da7c5dde64a141dbc8551d5b7f6cf4ed7c2568d0cc520a8f", - "sha256:8c7309c718f94b3a625cb648ace320157ad16ff131ae0af362c9f21b80ef6ec4" + "sha256:c357b3f628cf53ae2c4c05627ecc484553142ca23264e593d327bcde5e9c3407", + "sha256:ea8b7f6188e6fa117537c3df7da9fc686d485087abf6ac197f9c46432f7e4a3c" ], - "version": "==2.6" + "version": "==2.8" }, "libsass": { "hashes": [ - "sha256:0f2e421d3e5a53833243e0a5f2cf7ebe9812725a7f27a797c38f3c7190ce2a82", - "sha256:1b74aff85f1560d629a070552ec67f9f0ff9a47446ffafddafad9944f7589ae1", - "sha256:1cf80c04a77d36fd77f00b1ae0a269eee780d971fabd9d493b15d30de9857ae5", - "sha256:1d55dfe8e91a15a7d72d7f8aca16e74da36899e70d911af66d7184f1c82e2b39", - "sha256:23755425149fe0f576fd0ab7bcd151fe09400b2d980fe176c28f6c19e053c830", - "sha256:4a434d5b713b97c4141fb71c59341d4ebff8669114b14c626af51e145a48710e", - "sha256:4dcd5b546bed977276f97eb7a2a13cb7cbf0a38d672e7b5525b7587c8cabcf27", - "sha256:62771c8ead9227579891814dd714be645243741aa23e5cb232ac0c245cf29a37", - "sha256:727fb84326ffa930bc09fad8b706e77ada4d13b3adf35cce134962a434d7eccb", - "sha256:7b9e7179b5f4fc32bc716f86e9ccaeb48ab90e7eb6648b339440346733af8828", - "sha256:a0ffca466b35fb57f2afe1f1c5fd39b4c51a4107596d28ef8c0d3bb0962244b5", - "sha256:cbd5ee83d3603a2b2c2937d8f06acc07b30fd22642ea2460c966d4fd6217f1d0", - "sha256:de1eae502764b3dde294d6652a0046489cf31008de190c4dd8d05e7f4b5e0d71", - "sha256:e00b6c6d75a6e912990cbc23d48ddfdbfefc3e400c20be6593988839292248c5", - "sha256:ed8beef197efc6e6ab0ad03cea0885b31cc11f226290783649b4dafe1fb2ea27" + "sha256:2ae3b061a7d250fb47e5fdad1a8191600ca15dc604e76b109b6d3bf8e08fd2ed", + "sha256:2ee186aa682a035a53c557b7e61ce562a1114f1a1a992d0ba962cbc3e82c490c", + "sha256:366f4fd5a5eab4a519beb583e9fa78718cf2c0f40e92ed835d7ed23b82e5d954", + "sha256:5511b3c62e8d97daf929c63bd516b794f0a06acd09dd261445d864e48290551b", + "sha256:7462da168c8fb997b31cb4dc3ee5adb9af2d106f7b92c2d57a1c68a56ae5a3a0", + "sha256:84a16ec5cf7842ff5bc2caed2c032ed624d587699797bc2a4d4a8e41f579b6e7", + "sha256:8fc0360ee99224f7a3cb09987e641171d34180759f467ba3d15934102ade396f", + "sha256:a6c5535a21a07d769151453270bc6a8373b821d1d2fd9810d84fccfe315ab188", + "sha256:b375bfbf3c86ec0f4a27f266b44b2753a4b8cab7e73649eed7afcad84bc56257", + "sha256:b548af46c1a606aed93da2566901146005d6065f73fefc63d256ba62ba1f803d", + "sha256:bb30fc7125350c64925a98cb90da7979f76bb0ea1a0157e8aeb268f8da38e296", + "sha256:c2f386677514f9fc758631328bd318dd3e9d839ad7b6e248ec4535a191bfd271", + "sha256:d1f301637ad5768aecc81d17dcf40a68f2e11b7ca8b427dbb9f8972c150d303e", + "sha256:e0cf54dddf2cc6e373005bed6e46ccdce1f3a77bd169ab505c3a8ad9023eee5f", + "sha256:e8941881063691d50f9cc8b8d6d8fd7bec86a8c461b2a4fc87188a5fc44d6ba4", + "sha256:f4b29b0c70d753c754a58aaad7c31ad3309ca4a26f9aa64e695157251f6832ad" ], "index": "pypi", - "version": "==0.14.5" + "version": "==0.18.0" }, "pillow": { "hashes": [ - "sha256:00633bc2ec40313f4daf351855e506d296ec3c553f21b66720d0f1225ca84c6f", - "sha256:03514478db61b034fc5d38b9bf060f994e5916776e93f02e59732a8270069c61", - "sha256:040144ba422216aecf7577484865ade90e1a475f867301c48bf9fbd7579efd76", - "sha256:16246261ff22368e5e32ad74d5ef40403ab6895171a7fc6d34f6c17cfc0f1943", - "sha256:1cb38df69362af35c14d4a50123b63c7ff18ec9a6d4d5da629a6f19d05e16ba8", - "sha256:2400e122f7b21d9801798207e424cbe1f716cee7314cd0c8963fdb6fc564b5fb", - "sha256:2ee6364b270b56a49e8b8a51488e847ab130adc1220c171bed6818c0d4742455", - "sha256:3b4560c3891b05022c464b09121bd507c477505a4e19d703e1027a3a7c68d896", - "sha256:41374a6afb3f44794410dab54a0d7175e6209a5a02d407119c81083f1a4c1841", - "sha256:438a3faf5f702c8d0f80b9f9f9b8382cfa048ca6a0d64ef71b86b563b0ee0359", - "sha256:472a124c640bde4d5468f6991c9fa7e30b723d84ac4195a77c6ab6aea30f2b9c", - "sha256:4d32c8e3623a61d6e29ccd024066cd1ba556555abfb4cd714155020e00107e3f", - "sha256:4d8077fd649ac40a5c4165f2c22fa2a4ad18c668e271ecb2f9d849d1017a9313", - "sha256:62ec7ae98357fcd46002c110bb7cad15fce532776f0cbe7ca1d44c49b837d49d", - "sha256:6c7cab6a05351cf61e469937c49dbf3cdf5ffb3eeac71f8d22dc9be3507598d8", - "sha256:6eca36905444c4b91fe61f1b9933a47a30480738a1dd26501ff67d94fc2bc112", - "sha256:74e2ebfd19c16c28ad43b8a28ff73b904ed382ea4875188838541751986e8c9a", - "sha256:7673e7473a13107059377c96c563aa36f73184c29d2926882e0a0210b779a1e7", - "sha256:81762cf5fca9a82b53b7b2d0e6b420e0f3b06167b97678c81d00470daa622d58", - "sha256:8554bbeb4218d9cfb1917c69e6f2d2ad0be9b18a775d2162547edf992e1f5f1f", - "sha256:9b66e968da9c4393f5795285528bc862c7b97b91251f31a08004a3c626d18114", - "sha256:a00edb2dec0035e98ac3ec768086f0b06dfabb4ad308592ede364ef573692f55", - "sha256:b48401752496757e95304a46213c3155bc911ac884bed2e9b275ce1c1df3e293", - "sha256:b6cf18f9e653a8077522bb3aa753a776b117e3e0cc872c25811cfdf1459491c2", - "sha256:bb8adab1877e9213385cbb1adc297ed8337e01872c42a30cfaa66ff8c422779c", - "sha256:c8a4b39ba380b57a31a4b5449a9d257b1302d8bc4799767e645dcee25725efe1", - "sha256:cee9bc75bff455d317b6947081df0824a8f118de2786dc3d74a3503fd631f4ef", - "sha256:d0dc1313dff48af64517cbbd85e046d6b477fbe5e9d69712801f024dcb08c62b", - "sha256:d5bf527ed83617edd1855a5c923eeeaf68bcb9ac0ceb28e3f19b575b3a424984", - "sha256:df5863a21f91de5ecdf7d32a32f406dd9867ebb35d41033b8bd9607a21887599", - "sha256:e39142332541ed2884c257495504858b22c078a5d781059b07aba4c3a80d7551", - "sha256:e52e8f675ba0b2b417fa98579e7286a41a8e23871f17f4793772f5aa884fea79", - "sha256:e6dd55d5d94b9e36929325dd0c9ab85bfde84a5fc35947c334c32af1af668944", - "sha256:e87cc1acbebf263f308a8494272c2d42016aa33c32bf14d209c81e1f65e11868", - "sha256:ea0091cd4100519cedfeea2c659f52291f535ac6725e2368bcf59e874f270efa", - "sha256:eeb247f4f4d962942b3b555530b0c63b77473c7bfe475e51c6b75b7344b49ce3", - "sha256:f0d4433adce6075efd24fc0285135248b0b50f5a58129c7e552030e04fe45c7f", - "sha256:f1f3bd92f8e12dc22884935a73c9f94c4d9bd0d34410c456540713d6b7832b8c", - "sha256:f42a87cbf50e905f49f053c0b1fb86c911c730624022bf44c8857244fc4cdaca", - "sha256:f5f302db65e2e0ae96e26670818157640d3ca83a3054c290eff3631598dcf819", - "sha256:f7634d534662bbb08976db801ba27a112aee23e597eeaf09267b4575341e45bf", - "sha256:fdd374c02e8bb2d6468a85be50ea66e1c4ef9e809974c30d8576728473a6ed03", - "sha256:fe6931db24716a0845bd8c8915bd096b77c2a7043e6fc59ae9ca364fe816f08b" + "sha256:01a501be4ae05fd714d269cb9c9f145518e58e73faa3f140ddb67fae0c2607b1", + "sha256:051de330a06c99d6f84bcf582960487835bcae3fc99365185dc2d4f65a390c0e", + "sha256:07c35919f983c2c593498edcc126ad3a94154184899297cc9d27a6587672cbaa", + "sha256:0ae5289948c5e0a16574750021bd8be921c27d4e3527800dc9c2c1d2abc81bf7", + "sha256:0b1efce03619cdbf8bcc61cfae81fcda59249a469f31c6735ea59badd4a6f58a", + "sha256:0cf0208500df8d0c3cad6383cd98a2d038b0678fd4f777a8f7e442c5faeee81d", + "sha256:163136e09bd1d6c6c6026b0a662976e86c58b932b964f255ff384ecc8c3cefa3", + "sha256:18e912a6ccddf28defa196bd2021fe33600cbe5da1aa2f2e2c6df15f720b73d1", + "sha256:24ec3dea52339a610d34401d2d53d0fb3c7fd08e34b20c95d2ad3973193591f1", + "sha256:267f8e4c0a1d7e36e97c6a604f5b03ef58e2b81c1becb4fccecddcb37e063cc7", + "sha256:3273a28734175feebbe4d0a4cde04d4ed20f620b9b506d26f44379d3c72304e1", + "sha256:39fbd5d62167197318a0371b2a9c699ce261b6800bb493eadde2ba30d868fe8c", + "sha256:4132c78200372045bb348fcad8d52518c8f5cfc077b1089949381ee4a61f1c6d", + "sha256:4baab2d2da57b0d9d544a2ce0f461374dd90ccbcf723fe46689aff906d43a964", + "sha256:4c678e23006798fc8b6f4cef2eaad267d53ff4c1779bd1af8725cc11b72a63f3", + "sha256:4d4bc2e6bb6861103ea4655d6b6f67af8e5336e7216e20fff3e18ffa95d7a055", + "sha256:505738076350a337c1740a31646e1de09a164c62c07db3b996abdc0f9d2e50cf", + "sha256:5233664eadfa342c639b9b9977190d64ad7aca4edc51a966394d7e08e7f38a9f", + "sha256:52e2e56fc3706d8791761a157115dc8391319720ad60cc32992350fda74b6be2", + "sha256:5337ac3280312aa065ed0a8ec1e4b6142e9f15c31baed36b5cd964745853243f", + "sha256:5ccd97e0f01f42b7e35907272f0f8ad2c3660a482d799a0c564c7d50e83604d4", + "sha256:5d95cb9f6cced2628f3e4de7e795e98b2659dfcc7176ab4a01a8b48c2c2f488f", + "sha256:634209852cc06c0c1243cc74f8fdc8f7444d866221de51125f7b696d775ec5ca", + "sha256:75d1f20bd8072eff92c5f457c266a61619a02d03ece56544195c56d41a1a0522", + "sha256:7eda4c737637af74bac4b23aa82ea6fbb19002552be85f0b89bc27e3a762d239", + "sha256:801ddaa69659b36abf4694fed5aa9f61d1ecf2daaa6c92541bbbbb775d97b9fe", + "sha256:825aa6d222ce2c2b90d34a0ea31914e141a85edefc07e17342f1d2fdf121c07c", + "sha256:87fe838f9dac0597f05f2605c0700b1926f9390c95df6af45d83141e0c514bd9", + "sha256:9c215442ff8249d41ff58700e91ef61d74f47dfd431a50253e1a1ca9436b0697", + "sha256:a3d90022f2202bbb14da991f26ca7a30b7e4c62bf0f8bf9825603b22d7e87494", + "sha256:a631fd36a9823638fe700d9225f9698fb59d049c942d322d4c09544dc2115356", + "sha256:a6523a23a205be0fe664b6b8747a5c86d55da960d9586db039eec9f5c269c0e6", + "sha256:a756ecf9f4b9b3ed49a680a649af45a8767ad038de39e6c030919c2f443eb000", + "sha256:ac036b6a6bac7010c58e643d78c234c2f7dc8bb7e591bd8bc3555cf4b1527c28", + "sha256:b117287a5bdc81f1bac891187275ec7e829e961b8032c9e5ff38b70fd036c78f", + "sha256:ba04f57d1715ca5ff74bb7f8a818bf929a204b3b3c2c2826d1e1cc3b1c13398c", + "sha256:ba6ef2bd62671c7fb9cdb3277414e87a5cd38b86721039ada1464f7452ad30b2", + "sha256:c8939dba1a37960a502b1a030a4465c46dd2c2bca7adf05fa3af6bea594e720e", + "sha256:cd878195166723f30865e05d87cbaf9421614501a4bd48792c5ed28f90fd36ca", + "sha256:cee815cc62d136e96cf76771b9d3eb58e0777ec18ea50de5cfcede8a7c429aa8", + "sha256:d1722b7aa4b40cf93ac3c80d3edd48bf93b9208241d166a14ad8e7a20ee1d4f3", + "sha256:d7c1c06246b05529f9984435fc4fa5a545ea26606e7f450bdbe00c153f5aeaad", + "sha256:db418635ea20528f247203bf131b40636f77c8209a045b89fa3badb89e1fcea0", + "sha256:e1555d4fda1db8005de72acf2ded1af660febad09b4708430091159e8ae1963e", + "sha256:e9c8066249c040efdda84793a2a669076f92a301ceabe69202446abb4c5c5ef9", + "sha256:e9f13711780c981d6eadd6042af40e172548c54b06266a1aabda7de192db0838", + "sha256:f0e3288b92ca5dbb1649bd00e80ef652a72b657dc94989fa9c348253d179054b", + "sha256:f227d7e574d050ff3996049e086e1f18c7bd2d067ef24131e50a1d3fe5831fbc", + "sha256:f62b1aeb5c2ced8babd4fbba9c74cbef9de309f5ed106184b12d9778a3971f15", + "sha256:f71ff657e63a9b24cac254bb8c9bd3c89c7a1b5e00ee4b3997ca1c18100dac28", + "sha256:fc9a12aad714af36cf3ad0275a96a733526571e52710319855628f476dcb144e" ], "index": "pypi", - "version": "==5.1.0" + "version": "==5.4.1" }, "psutil": { "hashes": [ - "sha256:325c334596ad2d8a178d0e7b4eecc91748096a87489b3701ee16986173000aaa", - "sha256:33384065f0014351fa70187548e3e95952c4df4bc5c38648bd0e647d21eaaf01", - "sha256:51e12aa74509832443862373a2655052b20c83cad7322f49d217452500b9a405", - "sha256:52a91ba928a5e86e0249b4932d6e36972a72d1ad8dcc5b7f753a2ae14825a4ba", - "sha256:99029b6af386b22882f0b6d537ffed5a9c3d5ff31782974aeaa1d683262d8543", - "sha256:b10703a109cc9225cd588c207f7f93480a420ade35c13515ea8f20063b42a392", - "sha256:ddba952ed256151844d82fb13c8fb1019fe11ecaeacbd659d67ba5661ae73d0d", - "sha256:ebe293be36bb24b95cdefc5131635496e88b17fabbcf1e4bc9b5c01f5e489cfe", - "sha256:f24cd52bafa06917935fe1b68c5a45593abe1f3097dc35b2dfc4718236795890" + "sha256:206eb909aa8878101d0eca07f4b31889c748f34ed6820a12eb3168c7aa17478e", + "sha256:649f7ffc02114dced8fbd08afcd021af75f5f5b2311bc0e69e53e8f100fe296f", + "sha256:6ebf2b9c996bb8c7198b385bade468ac8068ad8b78c54a58ff288cd5f61992c7", + "sha256:753c5988edc07da00dafd6d3d279d41f98c62cd4d3a548c4d05741a023b0c2e7", + "sha256:76fb0956d6d50e68e3f22e7cc983acf4e243dc0fcc32fd693d398cb21c928802", + "sha256:828e1c3ca6756c54ac00f1427fdac8b12e21b8a068c3bb9b631a1734cada25ed", + "sha256:a4c62319ec6bf2b3570487dd72d471307ae5495ce3802c1be81b8a22e438b4bc", + "sha256:acba1df9da3983ec3c9c963adaaf530fcb4be0cd400a8294f1ecc2db56499ddd", + "sha256:ef342cb7d9b60e6100364f50c57fa3a77d02ff8665d5b956746ac01901247ac4" ], - "version": "==5.4.5" - }, - "psycopg2": { - "hashes": [ - "sha256:027ae518d0e3b8fff41990e598bc7774c3d08a3a20e9ecc0b59fb2aaaf152f7f", - "sha256:092a80da1b052a181b6e6c765849c9b32d46c5dac3b81bf8c9b83e697f3cdbe8", - "sha256:0b9851e798bae024ed1a2a6377a8dab4b8a128a56ed406f572f9f06194e4b275", - "sha256:179c52eb870110a8c1b460c86d4f696d58510ea025602cd3f81453746fccb94f", - "sha256:19983b77ec1fc2a210092aa0333ee48811fd9fb5f194c6cd5b927ed409aea5f8", - "sha256:1d90379d01d0dc50ae9b40c863933d87ff82d51dd7d52cea5d1cb7019afd72cd", - "sha256:27467fd5af1dcc0a82d72927113b8f92da8f44b2efbdb8906bd76face95b596d", - "sha256:32702e3bd8bfe12b36226ba9846ed9e22336fc4bd710039d594b36bd432ae255", - "sha256:33f9e1032095e1436fa9ec424abcbd4c170da934fb70e391c5d78275d0307c75", - "sha256:36030ca7f4b4519ee4f52a74edc4ec73c75abfb6ea1d80ac7480953d1c0aa3c3", - "sha256:363fbbf4189722fc46779be1fad2597e2c40b3f577dc618f353a46391cf5d235", - "sha256:6f302c486132f8dd11f143e919e236ea4467d53bf18c451cac577e6988ecbd05", - "sha256:733166464598c239323142c071fa4c9b91c14359176e5ae7e202db6bcc1d2eb5", - "sha256:7cbc3b21ce2f681ca9ad2d8c0901090b23a30c955e980ebf1006d41f37068a95", - "sha256:888bba7841116e529f407f15c6d28fe3ef0760df8c45257442ec2f14f161c871", - "sha256:8966829cb0d21a08a3c5ac971a2eb67c3927ae27c247300a8476554cc0ce2ae8", - "sha256:8bf51191d60f6987482ef0cfe8511bbf4877a5aa7f313d7b488b53189cf26209", - "sha256:8eb94c0625c529215b53c08fb4e461546e2f3fc96a49c13d5474b5ad7aeab6cf", - "sha256:8ebba5314c609a05c6955e5773c7e0e57b8dd817e4f751f30de729be58fa5e78", - "sha256:932a4c101af007cb3132b1f8a9ffef23386acc53dad46536dc5ba43a3235ae02", - "sha256:ad75fe10bea19ad2188c5cb5fc4cdf53ee808d9b44578c94a3cd1e9fc2beb656", - "sha256:aeaba399254ca79c299d9fe6aa811d3c3eac61458dee10270de7f4e71c624998", - "sha256:b178e0923c93393e16646155794521e063ec17b7cc9f943f15b7d4b39776ea2c", - "sha256:b68e89bb086a9476fa85298caab43f92d0a6af135a5f433d1f6b6d82cafa7b55", - "sha256:d74cf9234ba76426add5e123449be08993a9b13ff434c6efa3a07caa305a619f", - "sha256:f3d3a88128f0c219bdc5b2d9ccd496517199660cea021c560a3252116df91cbd", - "sha256:fe6a7f87356116f5ea840c65b032af17deef0e1a5c34013a2962dd6f99b860dd" - ], - "index": "pypi", - "version": "==2.7.4" + "version": "==5.6.2" }, "psycopg2-binary": { "hashes": [ - "sha256:02eb674e3d5810e19b4d5d00720b17130e182da1ba259dda608aaf33d787347d", - "sha256:3a14baeabcebd4662f12f4bff03e0574a2369a2e41baf829e6fb4a24c95cf88b", - "sha256:436a503eda41f6adb08f292f40a3784fce0a5f351b6ae7b19a911904db53af93", - "sha256:465ff1d427ed42c31e456dbbd9edab3552be18a0edaef7450c5b3e6fee745052", - "sha256:4a1a5ea2fa4b53191637b162873a82822d92a85a08beefe28296b8eb5cf2fea5", - "sha256:4a4f23a08fbccbe40ecdb5384d807bcb469ea71dd87e6be2e80b036b8e6d47df", - "sha256:77a2fc622a1f2d08a707673c9be5769d521f03d867d305f172bb417fa7882754", - "sha256:8014c06a9ed7b78ba81beff3ae71acd78c212390f8ed839e9ce22735880bd5b4", - "sha256:83af04029bcb4b56c852e5876fef71340dcb465fa44fc99f80bac72e10fb0b74", - "sha256:86c0d2587f56776f25d52cca8e275adf495c8e01933fbfc2ca23b124610ab761", - "sha256:9305d7cbc802aaefac5c75a3df725f2654797369f32b18d4d0adb382dfab6c09", - "sha256:9b5ddbed85ec73293695d7116589d956ef0dd3fcf7bf3b2a3bc1e8e54c1d543a", - "sha256:a3d2cc0cb0b988dbfd0d11f7fac34058b25a6ce533ed5b8e88d6cb315e77d54a", - "sha256:ab1db8f3e96570d9f7ebc45133ce2574804b2280499baade178e163d022107b5", - "sha256:b039f51bca1ddd70234cc3f84f94f42ad43861b931bdfb497f887c60c39a6565", - "sha256:b287ddf4cafcfb632974907d1e7862119e36bb758228bdb07dd247553e4cdfc0", - "sha256:b6b2b26590304d97ef2af28d153ee99ace6fe0806934f4618edfc87216c77f91", - "sha256:c4c6004d410c77bfa5389ae9485498ce32805447a67afbfe8db0d247a5c88fa1", - "sha256:c606bff0978ee4858d86d40f6b6ab0c4cac4474f627bd054683dc03a4fc1a366", - "sha256:c8220c521a408b41c4f14036004a621ed0d965941286b978cd2ea2623fabd755", - "sha256:cb07184a4bfad304831f0a88b1c13fbd8cf9fcdf1f11e71c477dd6d7b1b078a0", - "sha256:cf3911fba0c47fc1313b5783183cda301032b14637a0b7a336766ae46998c7ee", - "sha256:d0972f062c73956332e9681dfdb133168618f0abfecc96e89f0205ac89cd454b", - "sha256:d1dd3eb8edd354083f5d27b968c5a17854c41347ba5a480b520be85ec1a8495c", - "sha256:d51c7ed810fce1e50464088c37cc8da05534de8afb12a732500827ebcc480081", - "sha256:d8940b5104588d6313315e037f0f5ed68d2e5f62ccc1c429d3cff11d2ba6de3f", - "sha256:de4f88f823037a71ea5ef3c1041d96b8a68d73343133edda684fd42f575bd9d7" + "sha256:007ca0df127b1862fc010125bc4100b7a630efc6841047bd11afceadb4754611", + "sha256:03c49e02adf0b4d68f422fdbd98f7a7c547beb27e99a75ed02298f85cb48406a", + "sha256:0a1232cdd314e08848825edda06600455ad2a7adaa463ebfb12ece2d09f3370e", + "sha256:131c80d0958c89273d9720b9adf9df1d7600bb3120e16019a7389ab15b079af5", + "sha256:2de34cc3b775724623f86617d2601308083176a495f5b2efc2bbb0da154f483a", + "sha256:2eddc31500f73544a2a54123d4c4b249c3c711d31e64deddb0890982ea37397a", + "sha256:484f6c62bdc166ee0e5be3aa831120423bf399786d1f3b0304526c86180fbc0b", + "sha256:4c2d9369ed40b4a44a8ccd6bc3a7db6272b8314812d2d1091f95c4c836d92e06", + "sha256:70f570b5fa44413b9f30dbc053d17ef3ce6a4100147a10822f8662e58d473656", + "sha256:7a2b5b095f3bd733aab101c89c0e1a3f0dfb4ebdc26f6374805c086ffe29d5b2", + "sha256:804914a669186e2843c1f7fbe12b55aad1b36d40a28274abe6027deffad9433d", + "sha256:8520c03172da18345d012949a53617a963e0191ccb3c666f23276d5326af27b5", + "sha256:90da901fc33ea393fc644607e4a3916b509387e9339ec6ebc7bfded45b7a0ae9", + "sha256:a582416ad123291a82c300d1d872bdc4136d69ad0b41d57dc5ca3df7ef8e3088", + "sha256:ac8c5e20309f4989c296d62cac20ee456b69c41fd1bc03829e27de23b6fa9dd0", + "sha256:b2cf82f55a619879f8557fdaae5cec7a294fac815e0087c4f67026fdf5259844", + "sha256:b59d6f8cfca2983d8fdbe457bf95d2192f7b7efdb2b483bf5fa4e8981b04e8b2", + "sha256:be08168197021d669b9964bd87628fa88f910b1be31e7010901070f2540c05fd", + "sha256:be0f952f1c365061041bad16e27e224e29615d4eb1fb5b7e7760a1d3d12b90b6", + "sha256:c1c9a33e46d7c12b9c96cf2d4349d783e3127163fd96254dcd44663cf0a1d438", + "sha256:d18c89957ac57dd2a2724ecfe9a759912d776f96ecabba23acb9ecbf5c731035", + "sha256:d7e7b0ff21f39433c50397e60bf0995d078802c591ca3b8d99857ea18a7496ee", + "sha256:da0929b2bf0d1f365345e5eb940d8713c1d516312e010135b14402e2a3d2404d", + "sha256:de24a4962e361c512d3e528ded6c7480eab24c655b8ca1f0b761d3b3650d2f07", + "sha256:e45f93ff3f7dae2202248cf413a87aeb330821bf76998b3cf374eda2fc893dd7", + "sha256:f046aeae1f7a845041b8661bb7a52449202b6c5d3fb59eb4724e7ca088811904", + "sha256:f1dc2b7b2748084b890f5d05b65a47cd03188824890e9a60818721fd492249fb", + "sha256:fcbe7cf3a786572b73d2cd5f34ed452a5f5fac47c9c9d1e0642c457a148f9f88" ], "index": "pypi", - "version": "==2.7.4" + "version": "==2.8.2" }, "puput": { "hashes": [ - "sha256:281eb6987a7abe89fa87f1cc70c3f6dc92bb2867f573f8dc80767c0214b29ef6" + "sha256:1c5c3f6b5d1054f640c41e57b3aed080ee85f4f2a48914b5829409ce440b78eb" ], "index": "pypi", - "version": "==0.9.2" + "version": "==1.0.3" }, "pytz": { "hashes": [ - "sha256:65ae0c8101309c45772196b21b74c46b2e5d11b6275c45d251b150d5da334555", - "sha256:c06425302f2cf668f1bba7a0a03f3c1d34d4ebeef2c72003da308b3947c7f749" + "sha256:303879e36b721603cc54604edcac9d20401bdbe31e1e4fdee5b9f98d5d31dfda", + "sha256:d747dd3d23d77ef44c6a3526e274af6efeb0a6f1afd5a69ba4d5be4098c8e141" ], - "version": "==2018.4" + "version": "==2019.1" }, "pyyaml": { "hashes": [ - "sha256:0c507b7f74b3d2dd4d1322ec8a94794927305ab4cebbe89cc47fe5e81541e6e8", - "sha256:16b20e970597e051997d90dc2cddc713a2876c47e3d92d59ee198700c5427736", - "sha256:3262c96a1ca437e7e4763e2843746588a965426550f3797a79fca9c6199c431f", - "sha256:326420cbb492172dec84b0f65c80942de6cedb5233c413dd824483989c000608", - "sha256:4474f8ea030b5127225b8894d626bb66c01cda098d47a2b0d3429b6700af9fd8", - "sha256:592766c6303207a20efc445587778322d7f73b161bd994f227adaa341ba212ab", - "sha256:5ac82e411044fb129bae5cfbeb3ba626acb2af31a8d17d175004b70862a741a7", - "sha256:5f84523c076ad14ff5e6c037fe1c89a7f73a3e04cf0377cb4d017014976433f3", - "sha256:827dc04b8fa7d07c44de11fabbc888e627fa8293b695e0f99cb544fdfa1bf0d1", - "sha256:b4c423ab23291d3945ac61346feeb9a0dc4184999ede5e7c43e1ffb975130ae6", - "sha256:bc6bced57f826ca7cb5125a10b23fd0f2fff3b7c4701d64c439a300ce665fff8", - "sha256:c01b880ec30b5a6e6aa67b09a2fe3fb30473008c85cd6a67359a1b15ed6d83a4", - "sha256:ca233c64c6e40eaa6c66ef97058cdc80e8d0157a443655baa1b2966e812807ca", - "sha256:e863072cdf4c72eebf179342c94e6989c67185842d9997960b3e69290b2fa269" + "sha256:1adecc22f88d38052fb787d959f003811ca858b799590a5eaa70e63dca50308c", + "sha256:436bc774ecf7c103814098159fbb84c2715d25980175292c648f2da143909f95", + "sha256:460a5a4248763f6f37ea225d19d5c205677d8d525f6a83357ca622ed541830c2", + "sha256:5a22a9c84653debfbf198d02fe592c176ea548cccce47553f35f466e15cf2fd4", + "sha256:7a5d3f26b89d688db27822343dfa25c599627bc92093e788956372285c6298ad", + "sha256:9372b04a02080752d9e6f990179a4ab840227c6e2ce15b95e1278456664cf2ba", + "sha256:a5dcbebee834eaddf3fa7366316b880ff4062e4bcc9787b78c7fbb4a26ff2dd1", + "sha256:aee5bab92a176e7cd034e57f46e9df9a9862a71f8f37cad167c6fc74c65f5b4e", + "sha256:c51f642898c0bacd335fc119da60baae0824f2cde95b0330b56c0553439f0673", + "sha256:c68ea4d3ba1705da1e0d85da6684ac657912679a649e8868bd850d2c299cce13", + "sha256:e23d0cc5299223dcc37885dae624f382297717e459ea24053709675a976a3e19" ], - "version": "==3.12" + "version": "==5.1" }, "rcssmin": { "hashes": [ @@ -374,17 +376,17 @@ }, "redis": { "hashes": [ - "sha256:8a1900a9f2a0a44ecf6e8b5eb3e967a9909dfed219ad66df094f27f7d6f330fb", - "sha256:a22ca993cea2962dbb588f9f30d0015ac4afcc45bee27d3978c0dbe9e97c6c0f" + "sha256:6946b5dca72e86103edc8033019cc3814c031232d339d5f4533b02ea85685175", + "sha256:8ca418d2ddca1b1a850afa1680a7d2fd1f3322739271de4b704e0d4668449273" ], - "version": "==2.10.6" + "version": "==3.2.1" }, "requests": { "hashes": [ - "sha256:6a1b267aa90cac58ac3a765d067950e7dbbf75b1da07e895d1f594193a40a38b", - "sha256:9c443e7324ba5b85070c4a818ade28bfabedf16ea10206da1132edaa6dda237e" + "sha256:502a824f31acdacb3a35b6690b5fbf0bc41d63a24a45c4004352b0242707598e", + "sha256:7bf2a778576d825600030a110f3c0e3e8edc51dfaafe1c146e39a2027784957b" ], - "version": "==2.18.4" + "version": "==2.21.0" }, "rjsmin": { "hashes": [ @@ -394,29 +396,29 @@ }, "schema": { "hashes": [ - "sha256:410f44cb025384959d20deef00b4e1595397fa30959947a4f0d92e9c84616f35", - "sha256:a058daf5d926e4ece9f13c4c2366a836143ca7913ef053c5023c569e00175b2a" + "sha256:44add3ef9016c85ac4b0291b45286a657d0df309b31528ca8d0a9c6d0aa68186", + "sha256:5b0e0f47923164190513db2e91b9ab1941162b2dc400cc9b1803c2abab579e62" ], - "version": "==0.6.7" + "version": "==0.7.0" }, "six": { "hashes": [ - "sha256:70e8a77beed4562e7f14fe23a786b54f6296e34344c23bc42f07b15018ff98e9", - "sha256:832dc0e10feb1aa2c68dcc57dbb658f1c7e65b9b61af69048abc87a2db00a0eb" + "sha256:3350809f0555b11f552448330d0b52d5f24c91a322ea4a15ef22629740f3761c", + "sha256:d16a0141ec1a18405cd4ce8b4613101da75da0e9a7aec5bdd4fa804d0e0eba73" ], - "version": "==1.11.0" + "version": "==1.12.0" }, "sqlalchemy": { "hashes": [ - "sha256:2d5f08f714a886a1382c18be501e614bce50d362384dc089474019ce0768151c" + "sha256:91c54ca8345008fceaec987e10924bf07dcab36c442925357e5a467b36a38319" ], - "version": "==1.2.8" + "version": "==1.3.3" }, "sqlalchemy-utils": { "hashes": [ - "sha256:4119204ff302906015516992b7481e5aabeeaa61c7b04329f9113e42c097b855" + "sha256:3f1cb542cf0549a0de508d4919f3ad693a36230bf4cd13fdd6253549fec71182" ], - "version": "==0.33.3" + "version": "==0.33.11" }, "stellar": { "hashes": [ @@ -427,25 +429,25 @@ }, "unidecode": { "hashes": [ - "sha256:72f49d3729f3d8f5799f710b97c1451c5163102e76d64d20e170aedbbd923582", - "sha256:8c33dd588e0c9bc22a76eaa0c715a5434851f726131bd44a6c26471746efabf5" + "sha256:092cdf7ad9d1052c50313426a625b717dab52f7ac58f859e09ea020953b1ad8f", + "sha256:8b85354be8fd0c0e10adbf0675f6dc2310e56fda43fa8fe049123b6c475e52fb" ], - "version": "==1.0.22" + "version": "==1.0.23" }, "urllib3": { "hashes": [ - "sha256:06330f386d6e4b195fbfc736b297f58c5a892e4440e54d294d7004e3a9bbea1b", - "sha256:cc44da8e1145637334317feebd728bd869a35285b93cbb4cca2577da7e62db4f" + "sha256:2393a695cd12afedd0dcb26fe5d50d0cf248e5a66f75dbd89a3d4eb333a61af4", + "sha256:a637e5fae88995b256e3409dc4d52c2e2e0ba32c42a6365fee8bbd2238de3cfb" ], - "version": "==1.22" + "version": "==1.24.3" }, "wagtail": { "hashes": [ - "sha256:9c69b1fdc22e68315d86dfd7a7fc82d9efdeda4e37155dd042fc13d7ba2b6194", - "sha256:c741ef3f85f62f27621ae98c9e4a7116be06aae9595927c9865f1151cf51ecab" + "sha256:6aec70968f4792bf5200e1ac667e9dfd00ddc39367a072bf83752dfcaf13dd51", + "sha256:aa9daf174ed83dc9d805fc958b7d34f6cfe840d053e929af105d9f7d154938dc" ], "index": "pypi", - "version": "==1.13.1" + "version": "==2.3" }, "webencodings": { "hashes": [ @@ -456,18 +458,18 @@ }, "whitenoise": { "hashes": [ - "sha256:15f43b2e701821b95c9016cf469d29e2a546cb1c7dead584ba82c36f843995cf", - "sha256:9d81515f2b5b27051910996e1e860b1332e354d9e7bcf30c98f21dcb6713e0dd" + "sha256:118ab3e5f815d380171b100b05b76de2a07612f422368a201a9ffdeefb2251c1", + "sha256:42133ddd5229eeb6a0c9899496bdbe56c292394bf8666da77deeb27454c0456a" ], "index": "pypi", - "version": "==3.3.1" + "version": "==4.1.2" }, "willow": { "hashes": [ - "sha256:0a2e1665a24cded9d74b3d2254fb17e63bdde922d231610cdf0ced880a241845", - "sha256:dba768a03591973254b5a0242d11ebae00f1cb971e6f3a2ee592ff8e230b6090" + "sha256:76a8874304356b7d86923405f5ca1df125c3540fb55b32747e7a33ba59bc1744", + "sha256:818ee11803c90a0a6d49c94b0453d6266be1ef83ae00de72731c45fae4d3e78c" ], - "version": "==1.0" + "version": "==1.1" } }, "develop": {} diff --git a/feedler/__init__.py b/feedler/__init__.py index a522364..f332ff4 100644 --- a/feedler/__init__.py +++ b/feedler/__init__.py @@ -6,10 +6,10 @@ __version__ = '0.1' FEEDLER_APPS = ( # Wagtail apps - 'wagtail.wagtailcore', - 'wagtail.wagtailadmin', + 'wagtail.core', + 'wagtail.admin', 'wagtail.contrib.modeladmin', - 'wagtail.contrib.wagtailroutablepage', + 'wagtail.contrib.routable_page', 'wagtail.api.v2', # Third-party apps diff --git a/feedler/admin.py b/feedler/admin.py index 21cb5a2..37a2bea 100644 --- a/feedler/admin.py +++ b/feedler/admin.py @@ -12,7 +12,7 @@ from django.shortcuts import redirect from wagtail.contrib.modeladmin.helpers import AdminURLHelper, ButtonHelper from wagtail.contrib.modeladmin.options import ModelAdmin from wagtail.contrib.modeladmin.views import IndexView -from wagtail.wagtailadmin import messages +from wagtail.admin import messages from feedler.models import Entry from feedler.refresh import refresh_streams diff --git a/feedler/migrations/0002_feedpage.py b/feedler/migrations/0002_feedpage.py index 63263d4..9dabb91 100644 --- a/feedler/migrations/0002_feedpage.py +++ b/feedler/migrations/0002_feedpage.py @@ -4,7 +4,7 @@ from __future__ import unicode_literals from django.db import migrations, models import django.db.models.deletion -import wagtail.wagtailcore.fields +import wagtail.core.fields class Migration(migrations.Migration): @@ -18,7 +18,7 @@ class Migration(migrations.Migration): name='FeedPage', fields=[ ('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='wagtailcore.Page')), - ('intro', wagtail.wagtailcore.fields.RichTextField(blank=True, default='')), + ('intro', wagtail.core.fields.RichTextField(blank=True, default='')), ('stream', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='feedler.Stream', verbose_name='Filter to stream (optional)')), ], options={ diff --git a/feedler/models/models.py b/feedler/models/models.py index 84e3417..7eb7569 100644 --- a/feedler/models/models.py +++ b/feedler/models/models.py @@ -4,9 +4,9 @@ from django.db import models from django.utils import translation from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger -from wagtail.wagtailcore.models import Page, Orderable -from wagtail.wagtailadmin.edit_handlers import FieldPanel -from wagtail.wagtailcore.fields import RichTextField +from wagtail.core.models import Page, Orderable +from wagtail.admin.edit_handlers import FieldPanel +from wagtail.core.fields import RichTextField class Stream(models.Model): title = models.CharField(max_length=255) diff --git a/publichealth/home/migrations/0003_auto_20170223_0959.py b/publichealth/home/migrations/0003_auto_20170223_0959.py index 0dc65ed..486ad8c 100644 --- a/publichealth/home/migrations/0003_auto_20170223_0959.py +++ b/publichealth/home/migrations/0003_auto_20170223_0959.py @@ -5,9 +5,9 @@ from __future__ import unicode_literals from django.db import migrations, models import django.db.models.deletion import modelcluster.fields -import wagtail.wagtailcore.blocks -import wagtail.wagtailcore.fields -import wagtail.wagtailimages.blocks +import wagtail.core.blocks +import wagtail.core.fields +import wagtail.images.blocks class Migration(migrations.Migration): @@ -36,10 +36,10 @@ class Migration(migrations.Migration): ('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='wagtailcore.Page')), ('title_fr', models.CharField(default='', max_length=255)), ('date', models.DateField(verbose_name='Date')), - ('intro_de', wagtail.wagtailcore.fields.RichTextField(default='')), - ('intro_fr', wagtail.wagtailcore.fields.RichTextField(default='')), - ('body_de', wagtail.wagtailcore.fields.StreamField([('paragraph', wagtail.wagtailcore.blocks.RichTextBlock()), ('image', wagtail.wagtailimages.blocks.ImageChooserBlock()), ('section', wagtail.wagtailcore.blocks.CharBlock(classname='full title'))], blank=True, null=True)), - ('body_fr', wagtail.wagtailcore.fields.StreamField([('paragraph', wagtail.wagtailcore.blocks.RichTextBlock()), ('image', wagtail.wagtailimages.blocks.ImageChooserBlock()), ('section', wagtail.wagtailcore.blocks.CharBlock(classname='full title'))], blank=True, null=True)), + ('intro_de', wagtail.core.fields.RichTextField(default='')), + ('intro_fr', wagtail.core.fields.RichTextField(default='')), + ('body_de', wagtail.core.fields.StreamField([('paragraph', wagtail.core.blocks.RichTextBlock()), ('image', wagtail.images.blocks.ImageChooserBlock()), ('section', wagtail.core.blocks.CharBlock(classname='full title'))], blank=True, null=True)), + ('body_fr', wagtail.core.fields.StreamField([('paragraph', wagtail.core.blocks.RichTextBlock()), ('image', wagtail.images.blocks.ImageChooserBlock()), ('section', wagtail.core.blocks.CharBlock(classname='full title'))], blank=True, null=True)), ('feed_image', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailimages.Image')), ], options={ @@ -64,31 +64,31 @@ class Migration(migrations.Migration): migrations.AddField( model_name='homepage', name='body_de', - field=wagtail.wagtailcore.fields.RichTextField(default=''), + field=wagtail.core.fields.RichTextField(default=''), ), migrations.AddField( model_name='homepage', name='body_fr', - field=wagtail.wagtailcore.fields.RichTextField(default=''), + field=wagtail.core.fields.RichTextField(default=''), ), migrations.AddField( model_name='homepage', name='infos_de', - field=wagtail.wagtailcore.fields.StreamField([('info', wagtail.wagtailcore.blocks.StructBlock([(b'title', wagtail.wagtailcore.blocks.CharBlock(required=True)), (b'photo', wagtail.wagtailimages.blocks.ImageChooserBlock()), (b'summary', wagtail.wagtailcore.blocks.RichTextBlock(required=True)), (b'action', wagtail.wagtailcore.blocks.CharBlock()), (b'url', wagtail.wagtailcore.blocks.URLBlock())]))], blank=True, null=True), + field=wagtail.core.fields.StreamField([('info', wagtail.core.blocks.StructBlock([(b'title', wagtail.core.blocks.CharBlock(required=True)), (b'photo', wagtail.images.blocks.ImageChooserBlock()), (b'summary', wagtail.core.blocks.RichTextBlock(required=True)), (b'action', wagtail.core.blocks.CharBlock()), (b'url', wagtail.core.blocks.URLBlock())]))], blank=True, null=True), ), migrations.AddField( model_name='homepage', name='infos_fr', - field=wagtail.wagtailcore.fields.StreamField([('info', wagtail.wagtailcore.blocks.StructBlock([(b'title', wagtail.wagtailcore.blocks.CharBlock(required=True)), (b'photo', wagtail.wagtailimages.blocks.ImageChooserBlock()), (b'summary', wagtail.wagtailcore.blocks.RichTextBlock(required=True)), (b'action', wagtail.wagtailcore.blocks.CharBlock()), (b'url', wagtail.wagtailcore.blocks.URLBlock())]))], blank=True, null=True), + field=wagtail.core.fields.StreamField([('info', wagtail.core.blocks.StructBlock([(b'title', wagtail.core.blocks.CharBlock(required=True)), (b'photo', wagtail.images.blocks.ImageChooserBlock()), (b'summary', wagtail.core.blocks.RichTextBlock(required=True)), (b'action', wagtail.core.blocks.CharBlock()), (b'url', wagtail.core.blocks.URLBlock())]))], blank=True, null=True), ), migrations.AddField( model_name='homepage', name='intro_de', - field=wagtail.wagtailcore.fields.RichTextField(default=''), + field=wagtail.core.fields.RichTextField(default=''), ), migrations.AddField( model_name='homepage', name='intro_fr', - field=wagtail.wagtailcore.fields.RichTextField(default=''), + field=wagtail.core.fields.RichTextField(default=''), ), ] diff --git a/publichealth/home/migrations/0004_auto_20170308_2020.py b/publichealth/home/migrations/0004_auto_20170308_2020.py index e20463b..957b629 100644 --- a/publichealth/home/migrations/0004_auto_20170308_2020.py +++ b/publichealth/home/migrations/0004_auto_20170308_2020.py @@ -3,7 +3,7 @@ from __future__ import unicode_literals from django.db import migrations -import wagtail.wagtailcore.fields +import wagtail.core.fields class Migration(migrations.Migration): @@ -20,11 +20,11 @@ class Migration(migrations.Migration): migrations.AddField( model_name='articleindexpage', name='intro_de', - field=wagtail.wagtailcore.fields.RichTextField(default=''), + field=wagtail.core.fields.RichTextField(default=''), ), migrations.AddField( model_name='articleindexpage', name='intro_fr', - field=wagtail.wagtailcore.fields.RichTextField(default=''), + field=wagtail.core.fields.RichTextField(default=''), ), ] diff --git a/publichealth/home/migrations/0005_auto_20170308_2023.py b/publichealth/home/migrations/0005_auto_20170308_2023.py index 13b326c..a41acbb 100644 --- a/publichealth/home/migrations/0005_auto_20170308_2023.py +++ b/publichealth/home/migrations/0005_auto_20170308_2023.py @@ -3,7 +3,7 @@ from __future__ import unicode_literals from django.db import migrations -import wagtail.wagtailcore.fields +import wagtail.core.fields class Migration(migrations.Migration): @@ -16,21 +16,21 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='articleindexpage', name='intro_de', - field=wagtail.wagtailcore.fields.RichTextField(blank=True, default=''), + field=wagtail.core.fields.RichTextField(blank=True, default=''), ), migrations.AlterField( model_name='articleindexpage', name='intro_fr', - field=wagtail.wagtailcore.fields.RichTextField(blank=True, default=''), + field=wagtail.core.fields.RichTextField(blank=True, default=''), ), migrations.AlterField( model_name='articlepage', name='intro_de', - field=wagtail.wagtailcore.fields.RichTextField(blank=True, default=''), + field=wagtail.core.fields.RichTextField(blank=True, default=''), ), migrations.AlterField( model_name='articlepage', name='intro_fr', - field=wagtail.wagtailcore.fields.RichTextField(blank=True, default=''), + field=wagtail.core.fields.RichTextField(blank=True, default=''), ), ] diff --git a/publichealth/home/migrations/0006_auto_20170308_2025.py b/publichealth/home/migrations/0006_auto_20170308_2025.py index 40c356f..1c35ad0 100644 --- a/publichealth/home/migrations/0006_auto_20170308_2025.py +++ b/publichealth/home/migrations/0006_auto_20170308_2025.py @@ -3,7 +3,7 @@ from __future__ import unicode_literals from django.db import migrations -import wagtail.wagtailcore.fields +import wagtail.core.fields class Migration(migrations.Migration): @@ -16,11 +16,11 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='homepage', name='body_de', - field=wagtail.wagtailcore.fields.RichTextField(blank=True, default=''), + field=wagtail.core.fields.RichTextField(blank=True, default=''), ), migrations.AlterField( model_name='homepage', name='body_fr', - field=wagtail.wagtailcore.fields.RichTextField(blank=True, default=''), + field=wagtail.core.fields.RichTextField(blank=True, default=''), ), ] diff --git a/publichealth/home/migrations/0009_contact_contactform_contactformfield.py b/publichealth/home/migrations/0009_contact_contactform_contactformfield.py index a473133..774347c 100644 --- a/publichealth/home/migrations/0009_contact_contactform_contactformfield.py +++ b/publichealth/home/migrations/0009_contact_contactform_contactformfield.py @@ -5,7 +5,7 @@ from __future__ import unicode_literals from django.db import migrations, models import django.db.models.deletion import modelcluster.fields -import wagtail.wagtailcore.fields +import wagtail.core.fields class Migration(migrations.Migration): @@ -35,10 +35,10 @@ class Migration(migrations.Migration): ('from_address', models.CharField(blank=True, max_length=255, verbose_name='from address')), ('subject', models.CharField(blank=True, max_length=255, verbose_name='subject')), ('title_fr', models.CharField(default=b'', max_length=255)), - ('intro_de', wagtail.wagtailcore.fields.RichTextField(blank=True, default=b'')), - ('intro_fr', wagtail.wagtailcore.fields.RichTextField(blank=True, default=b'')), - ('thanks_de', wagtail.wagtailcore.fields.RichTextField(blank=True, default=b'')), - ('thanks_fr', wagtail.wagtailcore.fields.RichTextField(blank=True, default=b'')), + ('intro_de', wagtail.core.fields.RichTextField(blank=True, default=b'')), + ('intro_fr', wagtail.core.fields.RichTextField(blank=True, default=b'')), + ('thanks_de', wagtail.core.fields.RichTextField(blank=True, default=b'')), + ('thanks_fr', wagtail.core.fields.RichTextField(blank=True, default=b'')), ], options={ 'verbose_name': 'Formular', diff --git a/publichealth/home/migrations/0010_auto_20170410_2307.py b/publichealth/home/migrations/0010_auto_20170410_2307.py index f980985..1a8b8ce 100644 --- a/publichealth/home/migrations/0010_auto_20170410_2307.py +++ b/publichealth/home/migrations/0010_auto_20170410_2307.py @@ -3,9 +3,9 @@ from __future__ import unicode_literals from django.db import migrations, models -import wagtail.wagtailcore.blocks -import wagtail.wagtailcore.fields -import wagtail.wagtailimages.blocks +import wagtail.core.blocks +import wagtail.core.fields +import wagtail.images.blocks class Migration(migrations.Migration): @@ -23,22 +23,22 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='contactform', name='intro_de', - field=wagtail.wagtailcore.fields.RichTextField(blank=True, default=''), + field=wagtail.core.fields.RichTextField(blank=True, default=''), ), migrations.AlterField( model_name='contactform', name='intro_fr', - field=wagtail.wagtailcore.fields.RichTextField(blank=True, default=''), + field=wagtail.core.fields.RichTextField(blank=True, default=''), ), migrations.AlterField( model_name='contactform', name='thanks_de', - field=wagtail.wagtailcore.fields.RichTextField(blank=True, default=''), + field=wagtail.core.fields.RichTextField(blank=True, default=''), ), migrations.AlterField( model_name='contactform', name='thanks_fr', - field=wagtail.wagtailcore.fields.RichTextField(blank=True, default=''), + field=wagtail.core.fields.RichTextField(blank=True, default=''), ), migrations.AlterField( model_name='contactform', @@ -48,11 +48,11 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='homepage', name='infos_de', - field=wagtail.wagtailcore.fields.StreamField((('info', wagtail.wagtailcore.blocks.StructBlock((('title', wagtail.wagtailcore.blocks.CharBlock(required=True)), ('photo', wagtail.wagtailimages.blocks.ImageChooserBlock()), ('summary', wagtail.wagtailcore.blocks.RichTextBlock(required=True)), ('action', wagtail.wagtailcore.blocks.CharBlock()), ('url', wagtail.wagtailcore.blocks.URLBlock())))),), blank=True, null=True), + field=wagtail.core.fields.StreamField((('info', wagtail.core.blocks.StructBlock((('title', wagtail.core.blocks.CharBlock(required=True)), ('photo', wagtail.images.blocks.ImageChooserBlock()), ('summary', wagtail.core.blocks.RichTextBlock(required=True)), ('action', wagtail.core.blocks.CharBlock()), ('url', wagtail.core.blocks.URLBlock())))),), blank=True, null=True), ), migrations.AlterField( model_name='homepage', name='infos_fr', - field=wagtail.wagtailcore.fields.StreamField((('info', wagtail.wagtailcore.blocks.StructBlock((('title', wagtail.wagtailcore.blocks.CharBlock(required=True)), ('photo', wagtail.wagtailimages.blocks.ImageChooserBlock()), ('summary', wagtail.wagtailcore.blocks.RichTextBlock(required=True)), ('action', wagtail.wagtailcore.blocks.CharBlock()), ('url', wagtail.wagtailcore.blocks.URLBlock())))),), blank=True, null=True), + field=wagtail.core.fields.StreamField((('info', wagtail.core.blocks.StructBlock((('title', wagtail.core.blocks.CharBlock(required=True)), ('photo', wagtail.images.blocks.ImageChooserBlock()), ('summary', wagtail.core.blocks.RichTextBlock(required=True)), ('action', wagtail.core.blocks.CharBlock()), ('url', wagtail.core.blocks.URLBlock())))),), blank=True, null=True), ), ] diff --git a/publichealth/home/migrations/0012_auto_20170419_1749.py b/publichealth/home/migrations/0012_auto_20170419_1749.py index 5bf4d95..bc807f0 100644 --- a/publichealth/home/migrations/0012_auto_20170419_1749.py +++ b/publichealth/home/migrations/0012_auto_20170419_1749.py @@ -3,9 +3,9 @@ from __future__ import unicode_literals from django.db import migrations -import wagtail.wagtailcore.blocks -import wagtail.wagtailcore.fields -import wagtail.wagtailimages.blocks +import wagtail.core.blocks +import wagtail.core.fields +import wagtail.images.blocks class Migration(migrations.Migration): @@ -18,21 +18,21 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='articlepage', name='body_de', - field=wagtail.wagtailcore.fields.StreamField((('paragraph', wagtail.wagtailcore.blocks.RichTextBlock()), ('image', wagtail.wagtailimages.blocks.ImageChooserBlock()), ('section', wagtail.wagtailcore.blocks.CharBlock(classname='full title')), ('info', wagtail.wagtailcore.blocks.StructBlock((('title', wagtail.wagtailcore.blocks.CharBlock(required=True)), ('photo', wagtail.wagtailimages.blocks.ImageChooserBlock(required=True)), ('summary', wagtail.wagtailcore.blocks.RichTextBlock(required=True)), ('action', wagtail.wagtailcore.blocks.CharBlock(required=False)), ('url', wagtail.wagtailcore.blocks.URLBlock(required=False)))))), blank=True, null=True), + field=wagtail.core.fields.StreamField((('paragraph', wagtail.core.blocks.RichTextBlock()), ('image', wagtail.images.blocks.ImageChooserBlock()), ('section', wagtail.core.blocks.CharBlock(classname='full title')), ('info', wagtail.core.blocks.StructBlock((('title', wagtail.core.blocks.CharBlock(required=True)), ('photo', wagtail.images.blocks.ImageChooserBlock(required=True)), ('summary', wagtail.core.blocks.RichTextBlock(required=True)), ('action', wagtail.core.blocks.CharBlock(required=False)), ('url', wagtail.core.blocks.URLBlock(required=False)))))), blank=True, null=True), ), migrations.AlterField( model_name='articlepage', name='body_fr', - field=wagtail.wagtailcore.fields.StreamField((('paragraph', wagtail.wagtailcore.blocks.RichTextBlock()), ('image', wagtail.wagtailimages.blocks.ImageChooserBlock()), ('section', wagtail.wagtailcore.blocks.CharBlock(classname='full title')), ('info', wagtail.wagtailcore.blocks.StructBlock((('title', wagtail.wagtailcore.blocks.CharBlock(required=True)), ('photo', wagtail.wagtailimages.blocks.ImageChooserBlock(required=True)), ('summary', wagtail.wagtailcore.blocks.RichTextBlock(required=True)), ('action', wagtail.wagtailcore.blocks.CharBlock(required=False)), ('url', wagtail.wagtailcore.blocks.URLBlock(required=False)))))), blank=True, null=True), + field=wagtail.core.fields.StreamField((('paragraph', wagtail.core.blocks.RichTextBlock()), ('image', wagtail.images.blocks.ImageChooserBlock()), ('section', wagtail.core.blocks.CharBlock(classname='full title')), ('info', wagtail.core.blocks.StructBlock((('title', wagtail.core.blocks.CharBlock(required=True)), ('photo', wagtail.images.blocks.ImageChooserBlock(required=True)), ('summary', wagtail.core.blocks.RichTextBlock(required=True)), ('action', wagtail.core.blocks.CharBlock(required=False)), ('url', wagtail.core.blocks.URLBlock(required=False)))))), blank=True, null=True), ), migrations.AlterField( model_name='homepage', name='infos_de', - field=wagtail.wagtailcore.fields.StreamField((('info', wagtail.wagtailcore.blocks.StructBlock((('title', wagtail.wagtailcore.blocks.CharBlock(required=True)), ('photo', wagtail.wagtailimages.blocks.ImageChooserBlock(required=True)), ('summary', wagtail.wagtailcore.blocks.RichTextBlock(required=True)), ('action', wagtail.wagtailcore.blocks.CharBlock(required=False)), ('url', wagtail.wagtailcore.blocks.URLBlock(required=False))))),), blank=True, null=True), + field=wagtail.core.fields.StreamField((('info', wagtail.core.blocks.StructBlock((('title', wagtail.core.blocks.CharBlock(required=True)), ('photo', wagtail.images.blocks.ImageChooserBlock(required=True)), ('summary', wagtail.core.blocks.RichTextBlock(required=True)), ('action', wagtail.core.blocks.CharBlock(required=False)), ('url', wagtail.core.blocks.URLBlock(required=False))))),), blank=True, null=True), ), migrations.AlterField( model_name='homepage', name='infos_fr', - field=wagtail.wagtailcore.fields.StreamField((('info', wagtail.wagtailcore.blocks.StructBlock((('title', wagtail.wagtailcore.blocks.CharBlock(required=True)), ('photo', wagtail.wagtailimages.blocks.ImageChooserBlock(required=True)), ('summary', wagtail.wagtailcore.blocks.RichTextBlock(required=True)), ('action', wagtail.wagtailcore.blocks.CharBlock(required=False)), ('url', wagtail.wagtailcore.blocks.URLBlock(required=False))))),), blank=True, null=True), + field=wagtail.core.fields.StreamField((('info', wagtail.core.blocks.StructBlock((('title', wagtail.core.blocks.CharBlock(required=True)), ('photo', wagtail.images.blocks.ImageChooserBlock(required=True)), ('summary', wagtail.core.blocks.RichTextBlock(required=True)), ('action', wagtail.core.blocks.CharBlock(required=False)), ('url', wagtail.core.blocks.URLBlock(required=False))))),), blank=True, null=True), ), ] diff --git a/publichealth/home/migrations/0019_auto_20170908_1505.py b/publichealth/home/migrations/0019_auto_20170908_1505.py index 58ef971..d42430c 100644 --- a/publichealth/home/migrations/0019_auto_20170908_1505.py +++ b/publichealth/home/migrations/0019_auto_20170908_1505.py @@ -3,9 +3,9 @@ from __future__ import unicode_literals from django.db import migrations, models -import wagtail.wagtailcore.blocks -import wagtail.wagtailcore.fields -import wagtail.wagtailimages.blocks +import wagtail.core.blocks +import wagtail.core.fields +import wagtail.images.blocks class Migration(migrations.Migration): @@ -22,17 +22,17 @@ class Migration(migrations.Migration): migrations.AddField( model_name='articlepage', name='gallery', - field=wagtail.wagtailcore.fields.StreamField((('image', wagtail.wagtailcore.blocks.ListBlock(wagtail.wagtailcore.blocks.StructBlock((('image', wagtail.wagtailimages.blocks.ImageChooserBlock()), ('caption', wagtail.wagtailcore.blocks.TextBlock(required=False)))), icon='image')),), blank=True), + field=wagtail.core.fields.StreamField((('image', wagtail.core.blocks.ListBlock(wagtail.core.blocks.StructBlock((('image', wagtail.images.blocks.ImageChooserBlock()), ('caption', wagtail.core.blocks.TextBlock(required=False)))), icon='image')),), blank=True), ), migrations.AlterField( model_name='articlepage', name='body_de', - field=wagtail.wagtailcore.fields.StreamField((('paragraph', wagtail.wagtailcore.blocks.RichTextBlock()), ('section', wagtail.wagtailcore.blocks.CharBlock(classname='full title')), ('info', wagtail.wagtailcore.blocks.StructBlock((('title', wagtail.wagtailcore.blocks.CharBlock(required=True)), ('photo', wagtail.wagtailimages.blocks.ImageChooserBlock(required=True)), ('summary', wagtail.wagtailcore.blocks.RichTextBlock(required=True)), ('action', wagtail.wagtailcore.blocks.CharBlock(required=False)), ('url', wagtail.wagtailcore.blocks.URLBlock(required=False))))), ('placer', wagtail.wagtailcore.blocks.ChoiceBlock(choices=[('gallery', 'Image gallery')], icon='user'))), blank=True, null=True), + field=wagtail.core.fields.StreamField((('paragraph', wagtail.core.blocks.RichTextBlock()), ('section', wagtail.core.blocks.CharBlock(classname='full title')), ('info', wagtail.core.blocks.StructBlock((('title', wagtail.core.blocks.CharBlock(required=True)), ('photo', wagtail.images.blocks.ImageChooserBlock(required=True)), ('summary', wagtail.core.blocks.RichTextBlock(required=True)), ('action', wagtail.core.blocks.CharBlock(required=False)), ('url', wagtail.core.blocks.URLBlock(required=False))))), ('placer', wagtail.core.blocks.ChoiceBlock(choices=[('gallery', 'Image gallery')], icon='user'))), blank=True, null=True), ), migrations.AlterField( model_name='articlepage', name='body_fr', - field=wagtail.wagtailcore.fields.StreamField((('paragraph', wagtail.wagtailcore.blocks.RichTextBlock()), ('section', wagtail.wagtailcore.blocks.CharBlock(classname='full title')), ('info', wagtail.wagtailcore.blocks.StructBlock((('title', wagtail.wagtailcore.blocks.CharBlock(required=True)), ('photo', wagtail.wagtailimages.blocks.ImageChooserBlock(required=True)), ('summary', wagtail.wagtailcore.blocks.RichTextBlock(required=True)), ('action', wagtail.wagtailcore.blocks.CharBlock(required=False)), ('url', wagtail.wagtailcore.blocks.URLBlock(required=False))))), ('placer', wagtail.wagtailcore.blocks.ChoiceBlock(choices=[('gallery', 'Image gallery')], icon='user'))), blank=True, null=True), + field=wagtail.core.fields.StreamField((('paragraph', wagtail.core.blocks.RichTextBlock()), ('section', wagtail.core.blocks.CharBlock(classname='full title')), ('info', wagtail.core.blocks.StructBlock((('title', wagtail.core.blocks.CharBlock(required=True)), ('photo', wagtail.images.blocks.ImageChooserBlock(required=True)), ('summary', wagtail.core.blocks.RichTextBlock(required=True)), ('action', wagtail.core.blocks.CharBlock(required=False)), ('url', wagtail.core.blocks.URLBlock(required=False))))), ('placer', wagtail.core.blocks.ChoiceBlock(choices=[('gallery', 'Image gallery')], icon='user'))), blank=True, null=True), ), migrations.AlterField( model_name='contactformfield', diff --git a/publichealth/home/migrations/0020_auto_20170920_1204.py b/publichealth/home/migrations/0020_auto_20170920_1204.py index 86bf257..4c3c48a 100644 --- a/publichealth/home/migrations/0020_auto_20170920_1204.py +++ b/publichealth/home/migrations/0020_auto_20170920_1204.py @@ -3,9 +3,9 @@ from __future__ import unicode_literals from django.db import migrations -import wagtail.wagtailcore.blocks -import wagtail.wagtailcore.fields -import wagtail.wagtailimages.blocks +import wagtail.core.blocks +import wagtail.core.fields +import wagtail.images.blocks class Migration(migrations.Migration): @@ -18,11 +18,11 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='articlepage', name='body_de', - field=wagtail.wagtailcore.fields.StreamField((('paragraph', wagtail.wagtailcore.blocks.RichTextBlock()), ('section', wagtail.wagtailcore.blocks.CharBlock(classname='full title')), ('info', wagtail.wagtailcore.blocks.StructBlock((('title', wagtail.wagtailcore.blocks.CharBlock(required=True)), ('photo', wagtail.wagtailimages.blocks.ImageChooserBlock(required=True)), ('summary', wagtail.wagtailcore.blocks.RichTextBlock(required=True)), ('action', wagtail.wagtailcore.blocks.CharBlock(required=False)), ('url', wagtail.wagtailcore.blocks.URLBlock(required=False))), icon='help')), ('media', wagtail.wagtailcore.blocks.ChoiceBlock(choices=[('gallery', 'Image gallery')], icon='media'))), blank=True, null=True), + field=wagtail.core.fields.StreamField((('paragraph', wagtail.core.blocks.RichTextBlock()), ('section', wagtail.core.blocks.CharBlock(classname='full title')), ('info', wagtail.core.blocks.StructBlock((('title', wagtail.core.blocks.CharBlock(required=True)), ('photo', wagtail.images.blocks.ImageChooserBlock(required=True)), ('summary', wagtail.core.blocks.RichTextBlock(required=True)), ('action', wagtail.core.blocks.CharBlock(required=False)), ('url', wagtail.core.blocks.URLBlock(required=False))), icon='help')), ('media', wagtail.core.blocks.ChoiceBlock(choices=[('gallery', 'Image gallery')], icon='media'))), blank=True, null=True), ), migrations.AlterField( model_name='articlepage', name='body_fr', - field=wagtail.wagtailcore.fields.StreamField((('paragraph', wagtail.wagtailcore.blocks.RichTextBlock()), ('section', wagtail.wagtailcore.blocks.CharBlock(classname='full title')), ('info', wagtail.wagtailcore.blocks.StructBlock((('title', wagtail.wagtailcore.blocks.CharBlock(required=True)), ('photo', wagtail.wagtailimages.blocks.ImageChooserBlock(required=True)), ('summary', wagtail.wagtailcore.blocks.RichTextBlock(required=True)), ('action', wagtail.wagtailcore.blocks.CharBlock(required=False)), ('url', wagtail.wagtailcore.blocks.URLBlock(required=False))), icon='help')), ('media', wagtail.wagtailcore.blocks.ChoiceBlock(choices=[('gallery', 'Image gallery')], icon='media'))), blank=True, null=True), + field=wagtail.core.fields.StreamField((('paragraph', wagtail.core.blocks.RichTextBlock()), ('section', wagtail.core.blocks.CharBlock(classname='full title')), ('info', wagtail.core.blocks.StructBlock((('title', wagtail.core.blocks.CharBlock(required=True)), ('photo', wagtail.images.blocks.ImageChooserBlock(required=True)), ('summary', wagtail.core.blocks.RichTextBlock(required=True)), ('action', wagtail.core.blocks.CharBlock(required=False)), ('url', wagtail.core.blocks.URLBlock(required=False))), icon='help')), ('media', wagtail.core.blocks.ChoiceBlock(choices=[('gallery', 'Image gallery')], icon='media'))), blank=True, null=True), ), ] diff --git a/publichealth/home/migrations/0022_auto_20180525_1520.py b/publichealth/home/migrations/0022_auto_20180525_1520.py index 9e8cf65..e913ecb 100644 --- a/publichealth/home/migrations/0022_auto_20180525_1520.py +++ b/publichealth/home/migrations/0022_auto_20180525_1520.py @@ -3,9 +3,9 @@ from __future__ import unicode_literals from django.db import migrations, models -import wagtail.wagtailcore.blocks -import wagtail.wagtailcore.fields -import wagtail.wagtailimages.blocks +import wagtail.core.blocks +import wagtail.core.fields +import wagtail.images.blocks class Migration(migrations.Migration): @@ -18,7 +18,7 @@ class Migration(migrations.Migration): migrations.AddField( model_name='articleindexpage', name='intro_en', - field=wagtail.wagtailcore.fields.RichTextField(blank=True, default=''), + field=wagtail.core.fields.RichTextField(blank=True, default=''), ), migrations.AddField( model_name='articleindexpage', @@ -28,12 +28,12 @@ class Migration(migrations.Migration): migrations.AddField( model_name='articlepage', name='body_en', - field=wagtail.wagtailcore.fields.StreamField((('paragraph', wagtail.wagtailcore.blocks.RichTextBlock()), ('section', wagtail.wagtailcore.blocks.CharBlock(classname='full title')), ('info', wagtail.wagtailcore.blocks.StructBlock((('title', wagtail.wagtailcore.blocks.CharBlock(required=True)), ('photo', wagtail.wagtailimages.blocks.ImageChooserBlock(required=True)), ('summary', wagtail.wagtailcore.blocks.RichTextBlock(required=True)), ('action', wagtail.wagtailcore.blocks.CharBlock(required=False)), ('url', wagtail.wagtailcore.blocks.URLBlock(required=False))), icon='help')), ('media', wagtail.wagtailcore.blocks.ChoiceBlock(choices=[('gallery', 'Image gallery')], icon='media'))), blank=True, null=True), + field=wagtail.core.fields.StreamField((('paragraph', wagtail.core.blocks.RichTextBlock()), ('section', wagtail.core.blocks.CharBlock(classname='full title')), ('info', wagtail.core.blocks.StructBlock((('title', wagtail.core.blocks.CharBlock(required=True)), ('photo', wagtail.images.blocks.ImageChooserBlock(required=True)), ('summary', wagtail.core.blocks.RichTextBlock(required=True)), ('action', wagtail.core.blocks.CharBlock(required=False)), ('url', wagtail.core.blocks.URLBlock(required=False))), icon='help')), ('media', wagtail.core.blocks.ChoiceBlock(choices=[('gallery', 'Image gallery')], icon='media'))), blank=True, null=True), ), migrations.AddField( model_name='articlepage', name='intro_en', - field=wagtail.wagtailcore.fields.RichTextField(blank=True, default=''), + field=wagtail.core.fields.RichTextField(blank=True, default=''), ), migrations.AddField( model_name='articlepage', @@ -48,16 +48,16 @@ class Migration(migrations.Migration): migrations.AddField( model_name='homepage', name='body_en', - field=wagtail.wagtailcore.fields.RichTextField(blank=True, default=''), + field=wagtail.core.fields.RichTextField(blank=True, default=''), ), migrations.AddField( model_name='homepage', name='infos_en', - field=wagtail.wagtailcore.fields.StreamField((('info', wagtail.wagtailcore.blocks.StructBlock((('title', wagtail.wagtailcore.blocks.CharBlock(required=True)), ('photo', wagtail.wagtailimages.blocks.ImageChooserBlock(required=True)), ('summary', wagtail.wagtailcore.blocks.RichTextBlock(required=True)), ('action', wagtail.wagtailcore.blocks.CharBlock(required=False)), ('url', wagtail.wagtailcore.blocks.URLBlock(required=False))))),), blank=True, null=True), + field=wagtail.core.fields.StreamField((('info', wagtail.core.blocks.StructBlock((('title', wagtail.core.blocks.CharBlock(required=True)), ('photo', wagtail.images.blocks.ImageChooserBlock(required=True)), ('summary', wagtail.core.blocks.RichTextBlock(required=True)), ('action', wagtail.core.blocks.CharBlock(required=False)), ('url', wagtail.core.blocks.URLBlock(required=False))))),), blank=True, null=True), ), migrations.AddField( model_name='homepage', name='intro_en', - field=wagtail.wagtailcore.fields.RichTextField(blank=True, default=''), + field=wagtail.core.fields.RichTextField(blank=True, default=''), ), ] diff --git a/publichealth/home/models/forms.py b/publichealth/home/models/forms.py index 41e2f2c..adc00aa 100644 --- a/publichealth/home/models/forms.py +++ b/publichealth/home/models/forms.py @@ -4,11 +4,11 @@ from modelcluster.fields import ParentalKey from django.db.models import CharField -from wagtail.wagtailcore.fields import RichTextField -from wagtail.wagtailforms.models import ( +from wagtail.core.fields import RichTextField +from wagtail.contrib.forms.models import ( AbstractEmailForm, AbstractFormField ) -from wagtail.wagtailadmin.edit_handlers import ( +from wagtail.admin.edit_handlers import ( FieldPanel, FieldRowPanel, InlinePanel, MultiFieldPanel ) diff --git a/publichealth/home/models/models.py b/publichealth/home/models/models.py index d97c9d8..c9134b1 100644 --- a/publichealth/home/models/models.py +++ b/publichealth/home/models/models.py @@ -8,13 +8,13 @@ from django.conf import settings from modelcluster.fields import ParentalKey -from wagtail.wagtailcore.blocks import StructBlock, CharBlock, URLBlock, RichTextBlock, ListBlock, TextBlock, ChoiceBlock -from wagtail.wagtailcore.models import Page, Orderable -from wagtail.wagtailcore.fields import StreamField, RichTextField -from wagtail.wagtailadmin.edit_handlers import FieldPanel, StreamFieldPanel, InlinePanel, MultiFieldPanel -from wagtail.wagtailimages.blocks import ImageChooserBlock -from wagtail.wagtailimages.edit_handlers import ImageChooserPanel -from wagtail.wagtailsearch import index +from wagtail.core.blocks import StructBlock, CharBlock, URLBlock, RichTextBlock, ListBlock, TextBlock, ChoiceBlock +from wagtail.core.models import Page, Orderable +from wagtail.core.fields import StreamField, RichTextField +from wagtail.admin.edit_handlers import FieldPanel, StreamFieldPanel, InlinePanel, MultiFieldPanel +from wagtail.images.blocks import ImageChooserBlock +from wagtail.images.edit_handlers import ImageChooserPanel +from wagtail.search import index from puput.models import EntryPage, BlogPage from feedler.models import Entry, Stream diff --git a/publichealth/home/models/snippets.py b/publichealth/home/models/snippets.py index 62013b1..de3ec55 100644 --- a/publichealth/home/models/snippets.py +++ b/publichealth/home/models/snippets.py @@ -4,10 +4,10 @@ from __future__ import unicode_literals from django.db import models -from wagtail.wagtailsnippets.models import register_snippet +from wagtail.snippets.models import register_snippet -from wagtail.wagtailcore.models import Page -from wagtail.wagtailadmin.edit_handlers import FieldPanel, PageChooserPanel +from wagtail.core.models import Page +from wagtail.admin.edit_handlers import FieldPanel, PageChooserPanel from .forms import ContactForm from ..util import TranslatedField diff --git a/publichealth/home/routes.py b/publichealth/home/routes.py index 3e7ce4a..046884f 100644 --- a/publichealth/home/routes.py +++ b/publichealth/home/routes.py @@ -6,9 +6,9 @@ from django.utils.dateformat import DateFormat from django.utils.formats import date_format from django.utils.translation import ugettext_lazy as _ -from wagtail.wagtailcore.models import Page -from wagtail.wagtailsearch.models import Query -from wagtail.contrib.wagtailroutablepage.models import RoutablePageMixin, route +from wagtail.core.models import Page +from wagtail.search.models import Query +from wagtail.contrib.routable_page.models import RoutablePageMixin, route class HomePage(RoutablePageMixin, Page): diff --git a/publichealth/search/views.py b/publichealth/search/views.py index c69b228..2ec12e5 100644 --- a/publichealth/search/views.py +++ b/publichealth/search/views.py @@ -1,8 +1,8 @@ from django.shortcuts import render from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger -from wagtail.wagtailcore.models import Page -from wagtail.wagtailsearch.models import Query +from wagtail.core.models import Page +from wagtail.search.models import Query def search(request): diff --git a/publichealth/settings/base.py b/publichealth/settings/base.py index f58587a..9d23340 100644 --- a/publichealth/settings/base.py +++ b/publichealth/settings/base.py @@ -36,21 +36,21 @@ INSTALLED_APPS = [ 'publichealth.home.templatetags', 'publichealth.search', - 'wagtail.contrib.wagtailroutablepage', - 'wagtail.contrib.wagtailsitemaps', + 'wagtail.contrib.routable_page', + 'wagtail.contrib.sitemaps', 'wagtail.contrib.modeladmin', 'wagtail.contrib.settings', - 'wagtail.wagtailforms', - 'wagtail.wagtailredirects', - 'wagtail.wagtailembeds', - 'wagtail.wagtailsites', - 'wagtail.wagtailusers', - 'wagtail.wagtailsnippets', - 'wagtail.wagtaildocs', - 'wagtail.wagtailimages', - 'wagtail.wagtailsearch', - 'wagtail.wagtailadmin', - 'wagtail.wagtailcore', + 'wagtail.contrib.forms', + 'wagtail.contrib.redirects', + 'wagtail.embeds', + 'wagtail.sites', + 'wagtail.users', + 'wagtail.snippets', + 'wagtail.documents', + 'wagtail.images', + 'wagtail.search', + 'wagtail.admin', + 'wagtail.core', 'wagtail.api.v2', 'rest_framework', @@ -81,8 +81,8 @@ MIDDLEWARE_CLASSES = [ 'django.middleware.locale.LocaleMiddleware', - 'wagtail.wagtailcore.middleware.SiteMiddleware', - 'wagtail.wagtailredirects.middleware.RedirectMiddleware', + 'wagtail.core.middleware.SiteMiddleware', + 'wagtail.contrib.redirects.middleware.RedirectMiddleware', ] ROOT_URLCONF = 'publichealth.urls' diff --git a/publichealth/settings/dev.py b/publichealth/settings/dev.py index 2a8d532..1597d81 100644 --- a/publichealth/settings/dev.py +++ b/publichealth/settings/dev.py @@ -25,7 +25,7 @@ DATABASES = { } INSTALLED_APPS = INSTALLED_APPS + [ - 'wagtail.contrib.wagtailstyleguide', + 'wagtail.contrib.styleguide', ] try: diff --git a/publichealth/settings/production.py b/publichealth/settings/production.py index 7b753de..c2f6f0a 100644 --- a/publichealth/settings/production.py +++ b/publichealth/settings/production.py @@ -48,10 +48,10 @@ if 'SERVER_EMAIL' in env: SERVER_EMAIL = env['SERVER_EMAIL'] if 'CACHE_PURGE_URL' in env: - INSTALLED_APPS += ( 'wagtail.contrib.wagtailfrontendcache', ) + INSTALLED_APPS += ( 'wagtail.contrib.frontend_cache', ) WAGTAILFRONTENDCACHE = { 'default': { - 'BACKEND': 'wagtail.contrib.wagtailfrontendcache.backends.HTTPBackend', + 'BACKEND': 'wagtail.contrib.frontend_cache.backends.HTTPBackend', 'LOCATION': env['CACHE_PURGE_URL'], }, } @@ -131,7 +131,7 @@ if REDIS_LOCATION is not None: if 'ELASTICSEARCH_URL' in env: WAGTAILSEARCH_BACKENDS = { 'default': { - 'BACKEND': 'wagtail.wagtailsearch.backends.elasticsearch2', + 'BACKEND': 'wagtail.search.backends.elasticsearch2', 'URLS': [env['ELASTICSEARCH_URL']], 'INDEX': APP_NAME, 'ATOMIC_REBUILD': True, diff --git a/publichealth/urls.py b/publichealth/urls.py index b7d6cbb..6ac5fda 100644 --- a/publichealth/urls.py +++ b/publichealth/urls.py @@ -3,9 +3,9 @@ from django.conf import settings from django.contrib import admin from django.conf.urls.i18n import i18n_patterns -from wagtail.wagtailadmin import urls as wagtailadmin_urls -from wagtail.wagtaildocs import urls as wagtaildocs_urls -from wagtail.wagtailcore import urls as wagtail_urls +from wagtail.admin import urls as wagtailadmin_urls +from wagtail.documents import urls as wagtaildocs_urls +from wagtail.core import urls as wagtail_urls from puput import urls as puput_urls from feedler import urls as feedler_urls diff --git a/tests/testapp/settings.py b/tests/testapp/settings.py index 603a7f6..56e5bce 100644 --- a/tests/testapp/settings.py +++ b/tests/testapp/settings.py @@ -28,8 +28,8 @@ MIDDLEWARE_CLASSES = ( 'django.contrib.messages.middleware.MessageMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware', 'django.middleware.security.SecurityMiddleware', - 'wagtail.wagtailcore.middleware.SiteMiddleware', - 'wagtail.wagtailredirects.middleware.RedirectMiddleware', + 'wagtail.core.middleware.SiteMiddleware', + 'wagtail.contrib.redirects.middleware.RedirectMiddleware', ) ROOT_URLCONF = 'tests.testapp.urls' From 6540e4cd8e9fd875b9d6da2b045bd2680af3df0a Mon Sep 17 00:00:00 2001 From: Oleg Lavrovsky Date: Fri, 14 Jun 2019 22:02:15 +0200 Subject: [PATCH 4/6] Wagtail 2 support --- Pipfile | 17 +- Pipfile.lock | 444 +++++++++++++------ feedler/admin.py | 2 +- feedler/endpoints.py | 8 +- manage.py | 3 + publichealth/home/migrations/0001_initial.py | 2 +- publichealth/home/models/models.py | 6 +- publichealth/home/models/snippets.py | 12 +- publichealth/home/templatetags/navigation.py | 2 +- publichealth/settings/base.py | 2 +- publichealth/settings/dev.py | 2 +- publichealth/urls.py | 5 +- requirements-test.txt | 10 +- requirements.txt | 28 +- tests/testapp/settings.py | 2 +- 15 files changed, 368 insertions(+), 177 deletions(-) diff --git a/Pipfile b/Pipfile index bc88aed..d4a39ee 100644 --- a/Pipfile +++ b/Pipfile @@ -4,10 +4,14 @@ verify_ssl = true name = "pypi" [dev-packages] +pytest = "*" +pytest-splinter = "*" +tox = "*" +django-debug-toolbar = "*" [packages] ConcurrentLogHandler = "*" -Django = ">=2.0,<2.2" +Django = "*" django-anymail = "*" django-libsass = "*" django-redis = "*" @@ -16,12 +20,11 @@ elasticsearch = "*" guess_language-spirit = "*" gunicorn = "*" libsass = "*" -Pillow = ">=4.0.0,<6.0" +Pillow = ">=4.0.0" "psycopg2-binary" = "*" -puput = ">=1.0.0,<1.5" +puput = ">=1.0.0" stellar = "*" -wagtail = ">=2.0,<2.4" +wagtail = ">=2.0" whitenoise = "*" - -[requires] -python_version = "3.6.8" +django-crispy-forms = "*" +python-dotenv = "*" diff --git a/Pipfile.lock b/Pipfile.lock index 1c2e712..6ddbaf2 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,12 +1,10 @@ { "_meta": { "hash": { - "sha256": "cbfc07950cfbe622b61ff50609b67c60aae2de3cf56d3c20789c5a6388a57180" + "sha256": "cb250c2bc86f70cd1b7d1d65782839144d78c244f2103c9af5c984a16bc95706" }, "pipfile-spec": 6, - "requires": { - "python_version": "3.6.8" - }, + "requires": {}, "sources": [ { "name": "pypi", @@ -47,10 +45,7 @@ }, "concurrentloghandler": { "hashes": [ - "sha256:4ccae08b7f9b3257de35f847e2de8629c00c2075f8ce66db8ed06d7657e2eeae", - "sha256:5d199eecc23751ab1f705826660f733c1090f62789f3e3c44296e706fc75b547", - "sha256:8225a590fd4194c413fa26675bde5f6b80ad79e4182d5876ba3e264f77755918", - "sha256:aa608aa0ce32d86d2061dec91cd58a2a367f97110851529d2aa6ebf96d9dcd4d" + "sha256:8225a590fd4194c413fa26675bde5f6b80ad79e4182d5876ba3e264f77755918" ], "index": "pypi", "version": "==0.9.1" @@ -72,19 +67,19 @@ }, "django": { "hashes": [ - "sha256:0fd54e4f27bc3e0b7054a11e6b3a18fa53f2373f6b2df8a22e8eadfe018970a5", - "sha256:f3b28084101d516f56104856761bc247f85a2a5bbd9da39d9f6197ff461b3ee4" + "sha256:753d30d3eb078064d2ddadfea65083c9848074a7f93d7b4dc7fa6b1380d278f5", + "sha256:7cb67e8b934fab23b6daed7144da52e8a25a47eba7f360ca43d2b448506b01ad" ], "index": "pypi", - "version": "==2.1.8" + "version": "==2.2.2" }, "django-anymail": { "hashes": [ - "sha256:ab5cbfb280492c9cb2ef0497f8ebda4dcb3f99603dcf63c88ae623a66cad71f4", - "sha256:f872089943f30283d485d121924598f4156f5bfa76a0885fd66df5205102be0b" + "sha256:cb70bc28c188a4424b212bc91593cbc4247f2f21440fef2d209400c6dce7a18e", + "sha256:fdd87c6818b78f6d503e7dafeef679b6849613e0fe19129a30425914822630a3" ], "index": "pypi", - "version": "==6.0" + "version": "==6.0.1" }, "django-appconf": { "hashes": [ @@ -102,10 +97,10 @@ }, "django-compressor": { "hashes": [ - "sha256:7732676cfb9d58498dfb522b036f75f3f253f72ea1345ac036434fdc418c2e57", - "sha256:9616570e5b08e92fa9eadc7a1b1b49639cce07ef392fc27c74230ab08075b30f" + "sha256:47c86347f75c64954a06afbbfc820a750619e10c23a49272b865020a407b7edd", + "sha256:da9ee5ce4fc8b9211dcecd2229520514a4ba9ac3bcdc59b48092ec4d7f6b96b0" ], - "version": "==2.2" + "version": "==2.3" }, "django-crispy-forms": { "hashes": [ @@ -152,10 +147,10 @@ }, "django-taggit": { "hashes": [ - "sha256:a21cbe7e0879f1364eef1c88a2eda89d593bf000ebf51c3f00423c6927075dce", - "sha256:db4430ec99265341e05d0274edb0279163bd74357241f7b4d9274bdcb3338b17" + "sha256:710b4d15ec1996550cc68a0abbc41903ca7d832540e52b1336e6858737e410d8", + "sha256:bb8f27684814cd1414b2af75b857b5e26a40912631904038a7ecacd2bfafc3ac" ], - "version": "==0.23.0" + "version": "==0.24.0" }, "django-treebeard": { "hashes": [ @@ -172,17 +167,17 @@ }, "draftjs-exporter": { "hashes": [ - "sha256:8430b6c0f2a1c644ef9959b36f2f36f093f8209b94f81b4443216d3f386a3bce" + "sha256:503f222c81de9a0619158d8f88b638f9069af8de233dc020faa782c7a3b22100" ], - "version": "==2.1.5" + "version": "==2.1.6" }, "elasticsearch": { "hashes": [ - "sha256:445c6ea9c55c493bae635718de6b276034f55378c836f9550ae49dd8cd04a02b", - "sha256:df6d348f6f4788669d4e345a4270101783d9f49ee53c34b01676808261122e27" + "sha256:cbc73831c63fa2824538df76fcb2c4be007b43dbd9e7788ae70ea6d24109925b", + "sha256:d1b176b87a7fb75dca82978c82a4023e8b21cbc98f4018cb51190fb0b8b43764" ], "index": "pypi", - "version": "==7.0.1" + "version": "==7.0.2" }, "guess-language-spirit": { "hashes": [ @@ -221,78 +216,56 @@ }, "libsass": { "hashes": [ - "sha256:2ae3b061a7d250fb47e5fdad1a8191600ca15dc604e76b109b6d3bf8e08fd2ed", - "sha256:2ee186aa682a035a53c557b7e61ce562a1114f1a1a992d0ba962cbc3e82c490c", - "sha256:366f4fd5a5eab4a519beb583e9fa78718cf2c0f40e92ed835d7ed23b82e5d954", - "sha256:5511b3c62e8d97daf929c63bd516b794f0a06acd09dd261445d864e48290551b", - "sha256:7462da168c8fb997b31cb4dc3ee5adb9af2d106f7b92c2d57a1c68a56ae5a3a0", - "sha256:84a16ec5cf7842ff5bc2caed2c032ed624d587699797bc2a4d4a8e41f579b6e7", - "sha256:8fc0360ee99224f7a3cb09987e641171d34180759f467ba3d15934102ade396f", - "sha256:a6c5535a21a07d769151453270bc6a8373b821d1d2fd9810d84fccfe315ab188", - "sha256:b375bfbf3c86ec0f4a27f266b44b2753a4b8cab7e73649eed7afcad84bc56257", - "sha256:b548af46c1a606aed93da2566901146005d6065f73fefc63d256ba62ba1f803d", - "sha256:bb30fc7125350c64925a98cb90da7979f76bb0ea1a0157e8aeb268f8da38e296", - "sha256:c2f386677514f9fc758631328bd318dd3e9d839ad7b6e248ec4535a191bfd271", - "sha256:d1f301637ad5768aecc81d17dcf40a68f2e11b7ca8b427dbb9f8972c150d303e", - "sha256:e0cf54dddf2cc6e373005bed6e46ccdce1f3a77bd169ab505c3a8ad9023eee5f", - "sha256:e8941881063691d50f9cc8b8d6d8fd7bec86a8c461b2a4fc87188a5fc44d6ba4", - "sha256:f4b29b0c70d753c754a58aaad7c31ad3309ca4a26f9aa64e695157251f6832ad" + "sha256:000de439948e001934f697c51c025a6842e43c212974b6a2d5218f057114f5be", + "sha256:049097611c246364dcad1e44986a3bb565e39ddffe64fb3956570161a995020e", + "sha256:1813dadccbe22afe56da7ce495db19117b59c50c13688fbcc1b92070b94d33ed", + "sha256:25b88650f3f13fcd5d5e5d3b4c12c6e77136acd36cf0c26ef4b1bd4eac71bd70", + "sha256:2d2630bc6fa94106cd69a72c46c10e3f7378922aed988a058ca8fc672765fac7", + "sha256:53570a2505794c191de1484a9c407359cd12f797a3ef50e474a95f66915a51c4", + "sha256:69c86e98fb11ab74356dc054be61ae1ce6882b0dece5be409bb5ba7b1b696885", + "sha256:703bf25e5065bc8f45154fe828eee24ab7e14660088c2784e09741aecab118f9", + "sha256:7179a3862fb8e2cc5d1f7e97fed0a2afed49141df1949f43fbf7c9516c48d064", + "sha256:8ac0910a43758097c816bdf9f7af85e564aff49c64ef9571be036cb599fe510a", + "sha256:ac1188c967b7c4aff23be32974c688cd55b8d9771ee6c988b39e557508c3b3f2", + "sha256:b1890110043c11d11640d97334946975d7f43494dc46076c50fb5c7701878cab", + "sha256:b7215262984cc3f692e705564ab5405841a51cfca1408062ae9776ef4b4dabff", + "sha256:becb4c41f7edda34312d27787bcff4c9363a4f877bf87476dd863a0d7cf7bbef", + "sha256:dc75c1ed7f7863f9c23009002713fcc75331f50eb7e32e7aa1e21cc5d17071f1" ], "index": "pypi", - "version": "==0.18.0" + "version": "==0.19.1" }, "pillow": { "hashes": [ - "sha256:01a501be4ae05fd714d269cb9c9f145518e58e73faa3f140ddb67fae0c2607b1", "sha256:051de330a06c99d6f84bcf582960487835bcae3fc99365185dc2d4f65a390c0e", - "sha256:07c35919f983c2c593498edcc126ad3a94154184899297cc9d27a6587672cbaa", "sha256:0ae5289948c5e0a16574750021bd8be921c27d4e3527800dc9c2c1d2abc81bf7", "sha256:0b1efce03619cdbf8bcc61cfae81fcda59249a469f31c6735ea59badd4a6f58a", - "sha256:0cf0208500df8d0c3cad6383cd98a2d038b0678fd4f777a8f7e442c5faeee81d", "sha256:163136e09bd1d6c6c6026b0a662976e86c58b932b964f255ff384ecc8c3cefa3", "sha256:18e912a6ccddf28defa196bd2021fe33600cbe5da1aa2f2e2c6df15f720b73d1", "sha256:24ec3dea52339a610d34401d2d53d0fb3c7fd08e34b20c95d2ad3973193591f1", "sha256:267f8e4c0a1d7e36e97c6a604f5b03ef58e2b81c1becb4fccecddcb37e063cc7", "sha256:3273a28734175feebbe4d0a4cde04d4ed20f620b9b506d26f44379d3c72304e1", - "sha256:39fbd5d62167197318a0371b2a9c699ce261b6800bb493eadde2ba30d868fe8c", - "sha256:4132c78200372045bb348fcad8d52518c8f5cfc077b1089949381ee4a61f1c6d", - "sha256:4baab2d2da57b0d9d544a2ce0f461374dd90ccbcf723fe46689aff906d43a964", "sha256:4c678e23006798fc8b6f4cef2eaad267d53ff4c1779bd1af8725cc11b72a63f3", "sha256:4d4bc2e6bb6861103ea4655d6b6f67af8e5336e7216e20fff3e18ffa95d7a055", "sha256:505738076350a337c1740a31646e1de09a164c62c07db3b996abdc0f9d2e50cf", "sha256:5233664eadfa342c639b9b9977190d64ad7aca4edc51a966394d7e08e7f38a9f", - "sha256:52e2e56fc3706d8791761a157115dc8391319720ad60cc32992350fda74b6be2", - "sha256:5337ac3280312aa065ed0a8ec1e4b6142e9f15c31baed36b5cd964745853243f", - "sha256:5ccd97e0f01f42b7e35907272f0f8ad2c3660a482d799a0c564c7d50e83604d4", "sha256:5d95cb9f6cced2628f3e4de7e795e98b2659dfcc7176ab4a01a8b48c2c2f488f", - "sha256:634209852cc06c0c1243cc74f8fdc8f7444d866221de51125f7b696d775ec5ca", - "sha256:75d1f20bd8072eff92c5f457c266a61619a02d03ece56544195c56d41a1a0522", "sha256:7eda4c737637af74bac4b23aa82ea6fbb19002552be85f0b89bc27e3a762d239", "sha256:801ddaa69659b36abf4694fed5aa9f61d1ecf2daaa6c92541bbbbb775d97b9fe", "sha256:825aa6d222ce2c2b90d34a0ea31914e141a85edefc07e17342f1d2fdf121c07c", - "sha256:87fe838f9dac0597f05f2605c0700b1926f9390c95df6af45d83141e0c514bd9", "sha256:9c215442ff8249d41ff58700e91ef61d74f47dfd431a50253e1a1ca9436b0697", "sha256:a3d90022f2202bbb14da991f26ca7a30b7e4c62bf0f8bf9825603b22d7e87494", "sha256:a631fd36a9823638fe700d9225f9698fb59d049c942d322d4c09544dc2115356", "sha256:a6523a23a205be0fe664b6b8747a5c86d55da960d9586db039eec9f5c269c0e6", "sha256:a756ecf9f4b9b3ed49a680a649af45a8767ad038de39e6c030919c2f443eb000", - "sha256:ac036b6a6bac7010c58e643d78c234c2f7dc8bb7e591bd8bc3555cf4b1527c28", "sha256:b117287a5bdc81f1bac891187275ec7e829e961b8032c9e5ff38b70fd036c78f", "sha256:ba04f57d1715ca5ff74bb7f8a818bf929a204b3b3c2c2826d1e1cc3b1c13398c", - "sha256:ba6ef2bd62671c7fb9cdb3277414e87a5cd38b86721039ada1464f7452ad30b2", - "sha256:c8939dba1a37960a502b1a030a4465c46dd2c2bca7adf05fa3af6bea594e720e", "sha256:cd878195166723f30865e05d87cbaf9421614501a4bd48792c5ed28f90fd36ca", "sha256:cee815cc62d136e96cf76771b9d3eb58e0777ec18ea50de5cfcede8a7c429aa8", "sha256:d1722b7aa4b40cf93ac3c80d3edd48bf93b9208241d166a14ad8e7a20ee1d4f3", "sha256:d7c1c06246b05529f9984435fc4fa5a545ea26606e7f450bdbe00c153f5aeaad", - "sha256:db418635ea20528f247203bf131b40636f77c8209a045b89fa3badb89e1fcea0", - "sha256:e1555d4fda1db8005de72acf2ded1af660febad09b4708430091159e8ae1963e", "sha256:e9c8066249c040efdda84793a2a669076f92a301ceabe69202446abb4c5c5ef9", - "sha256:e9f13711780c981d6eadd6042af40e172548c54b06266a1aabda7de192db0838", - "sha256:f0e3288b92ca5dbb1649bd00e80ef652a72b657dc94989fa9c348253d179054b", "sha256:f227d7e574d050ff3996049e086e1f18c7bd2d067ef24131e50a1d3fe5831fbc", - "sha256:f62b1aeb5c2ced8babd4fbba9c74cbef9de309f5ed106184b12d9778a3971f15", - "sha256:f71ff657e63a9b24cac254bb8c9bd3c89c7a1b5e00ee4b3997ca1c18100dac28", "sha256:fc9a12aad714af36cf3ad0275a96a733526571e52710319855628f476dcb144e" ], "index": "pypi", @@ -300,58 +273,67 @@ }, "psutil": { "hashes": [ - "sha256:206eb909aa8878101d0eca07f4b31889c748f34ed6820a12eb3168c7aa17478e", - "sha256:649f7ffc02114dced8fbd08afcd021af75f5f5b2311bc0e69e53e8f100fe296f", - "sha256:6ebf2b9c996bb8c7198b385bade468ac8068ad8b78c54a58ff288cd5f61992c7", - "sha256:753c5988edc07da00dafd6d3d279d41f98c62cd4d3a548c4d05741a023b0c2e7", - "sha256:76fb0956d6d50e68e3f22e7cc983acf4e243dc0fcc32fd693d398cb21c928802", - "sha256:828e1c3ca6756c54ac00f1427fdac8b12e21b8a068c3bb9b631a1734cada25ed", - "sha256:a4c62319ec6bf2b3570487dd72d471307ae5495ce3802c1be81b8a22e438b4bc", - "sha256:acba1df9da3983ec3c9c963adaaf530fcb4be0cd400a8294f1ecc2db56499ddd", - "sha256:ef342cb7d9b60e6100364f50c57fa3a77d02ff8665d5b956746ac01901247ac4" + "sha256:028a1ec3c6197eadd11e7b46e8cc2f0720dc18ac6d7aabdb8e8c0d6c9704f000", + "sha256:503e4b20fa9d3342bcf58191bbc20a4a5ef79ca7df8972e6197cc14c5513e73d", + "sha256:863a85c1c0a5103a12c05a35e59d336e1d665747e531256e061213e2e90f63f3", + "sha256:954f782608bfef9ae9f78e660e065bd8ffcfaea780f9f2c8a133bb7cb9e826d7", + "sha256:b6e08f965a305cd84c2d07409bc16fbef4417d67b70c53b299116c5b895e3f45", + "sha256:bc96d437dfbb8865fc8828cf363450001cb04056bbdcdd6fc152c436c8a74c61", + "sha256:cf49178021075d47c61c03c0229ac0c60d5e2830f8cab19e2d88e579b18cdb76", + "sha256:d5350cb66690915d60f8b233180f1e49938756fb2d501c93c44f8fb5b970cc63", + "sha256:eba238cf1989dfff7d483c029acb0ac4fcbfc15de295d682901f0e2497e6781a" ], - "version": "==5.6.2" + "version": "==5.6.3" }, "psycopg2-binary": { "hashes": [ - "sha256:007ca0df127b1862fc010125bc4100b7a630efc6841047bd11afceadb4754611", - "sha256:03c49e02adf0b4d68f422fdbd98f7a7c547beb27e99a75ed02298f85cb48406a", - "sha256:0a1232cdd314e08848825edda06600455ad2a7adaa463ebfb12ece2d09f3370e", - "sha256:131c80d0958c89273d9720b9adf9df1d7600bb3120e16019a7389ab15b079af5", - "sha256:2de34cc3b775724623f86617d2601308083176a495f5b2efc2bbb0da154f483a", - "sha256:2eddc31500f73544a2a54123d4c4b249c3c711d31e64deddb0890982ea37397a", - "sha256:484f6c62bdc166ee0e5be3aa831120423bf399786d1f3b0304526c86180fbc0b", - "sha256:4c2d9369ed40b4a44a8ccd6bc3a7db6272b8314812d2d1091f95c4c836d92e06", - "sha256:70f570b5fa44413b9f30dbc053d17ef3ce6a4100147a10822f8662e58d473656", - "sha256:7a2b5b095f3bd733aab101c89c0e1a3f0dfb4ebdc26f6374805c086ffe29d5b2", - "sha256:804914a669186e2843c1f7fbe12b55aad1b36d40a28274abe6027deffad9433d", - "sha256:8520c03172da18345d012949a53617a963e0191ccb3c666f23276d5326af27b5", - "sha256:90da901fc33ea393fc644607e4a3916b509387e9339ec6ebc7bfded45b7a0ae9", - "sha256:a582416ad123291a82c300d1d872bdc4136d69ad0b41d57dc5ca3df7ef8e3088", - "sha256:ac8c5e20309f4989c296d62cac20ee456b69c41fd1bc03829e27de23b6fa9dd0", - "sha256:b2cf82f55a619879f8557fdaae5cec7a294fac815e0087c4f67026fdf5259844", - "sha256:b59d6f8cfca2983d8fdbe457bf95d2192f7b7efdb2b483bf5fa4e8981b04e8b2", - "sha256:be08168197021d669b9964bd87628fa88f910b1be31e7010901070f2540c05fd", - "sha256:be0f952f1c365061041bad16e27e224e29615d4eb1fb5b7e7760a1d3d12b90b6", - "sha256:c1c9a33e46d7c12b9c96cf2d4349d783e3127163fd96254dcd44663cf0a1d438", - "sha256:d18c89957ac57dd2a2724ecfe9a759912d776f96ecabba23acb9ecbf5c731035", - "sha256:d7e7b0ff21f39433c50397e60bf0995d078802c591ca3b8d99857ea18a7496ee", - "sha256:da0929b2bf0d1f365345e5eb940d8713c1d516312e010135b14402e2a3d2404d", - "sha256:de24a4962e361c512d3e528ded6c7480eab24c655b8ca1f0b761d3b3650d2f07", - "sha256:e45f93ff3f7dae2202248cf413a87aeb330821bf76998b3cf374eda2fc893dd7", - "sha256:f046aeae1f7a845041b8661bb7a52449202b6c5d3fb59eb4724e7ca088811904", - "sha256:f1dc2b7b2748084b890f5d05b65a47cd03188824890e9a60818721fd492249fb", - "sha256:fcbe7cf3a786572b73d2cd5f34ed452a5f5fac47c9c9d1e0642c457a148f9f88" + "sha256:080c72714784989474f97be9ab0ddf7b2ad2984527e77f2909fcd04d4df53809", + "sha256:110457be80b63ff4915febb06faa7be002b93a76e5ba19bf3f27636a2ef58598", + "sha256:171352a03b22fc099f15103959b52ee77d9a27e028895d7e5fde127aa8e3bac5", + "sha256:19d013e7b0817087517a4b3cab39c084d78898369e5c46258aab7be4f233d6a1", + "sha256:249b6b21ae4eb0f7b8423b330aa80fab5f821b9ffc3f7561a5e2fd6bb142cf5d", + "sha256:2ac0731d2d84b05c7bb39e85b7e123c3a0acd4cda631d8d542802c88deb9e87e", + "sha256:2b6d561193f0dc3f50acfb22dd52ea8c8dfbc64bcafe3938b5f209cc17cb6f00", + "sha256:2bd23e242e954214944481124755cbefe7c2cf563b1a54cd8d196d502f2578bf", + "sha256:3e1239242ca60b3725e65ab2f13765fc199b03af9eaf1b5572f0e97bdcee5b43", + "sha256:3eb70bb697abbe86b1d2b1316370c02ba320bfd1e9e35cf3b9566a855ea8e4e5", + "sha256:51a2fc7e94b98bd1bb5d4570936f24fc2b0541b63eccadf8fdea266db8ad2f70", + "sha256:52f1bdafdc764b7447e393ed39bb263eccb12bfda25a4ac06d82e3a9056251f6", + "sha256:5b3581319a3951f1e866f4f6c5e42023db0fae0284273b82e97dfd32c51985cd", + "sha256:63c1b66e3b2a3a336288e4bcec499e0dc310cd1dceaed1c46fa7419764c68877", + "sha256:8123a99f24ecee469e5c1339427bcdb2a33920a18bb5c0d58b7c13f3b0298ba3", + "sha256:85e699fcabe7f817c0f0a412d4e7c6627e00c412b418da7666ff353f38e30f67", + "sha256:8dbff4557bbef963697583366400822387cccf794ccb001f1f2307ed21854c68", + "sha256:908d21d08d6b81f1b7e056bbf40b2f77f8c499ab29e64ec5113052819ef1c89b", + "sha256:af39d0237b17d0a5a5f638e9dffb34013ce2b1d41441fd30283e42b22d16858a", + "sha256:af51bb9f055a3f4af0187149a8f60c9d516cf7d5565b3dac53358796a8fb2a5b", + "sha256:b2ecac57eb49e461e86c092761e6b8e1fd9654dbaaddf71a076dcc869f7014e2", + "sha256:cd37cc170678a4609becb26b53a2bc1edea65177be70c48dd7b39a1149cabd6e", + "sha256:d17e3054b17e1a6cb8c1140f76310f6ede811e75b7a9d461922d2c72973f583e", + "sha256:d305313c5a9695f40c46294d4315ed3a07c7d2b55e48a9010dad7db7a66c8b7f", + "sha256:dd0ef0eb1f7dd18a3f4187226e226a7284bda6af5671937a221766e6ef1ee88f", + "sha256:e1adff53b56db9905db48a972fb89370ad5736e0450b96f91bcf99cadd96cfd7", + "sha256:f0d43828003c82dbc9269de87aa449e9896077a71954fbbb10a614c017e65737", + "sha256:f78e8b487de4d92640105c1389e5b90be3496b1d75c90a666edd8737cc2dbab7" ], "index": "pypi", - "version": "==2.8.2" + "version": "==2.8.3" }, "puput": { "hashes": [ - "sha256:1c5c3f6b5d1054f640c41e57b3aed080ee85f4f2a48914b5829409ce440b78eb" + "sha256:1128a61886183a86c0978050cf97a006a7d09f97d19ff9ee20fc163cba22d8ae", + "sha256:2dbe4999769ea812b14fb7db8cd5783a4b3d0e2d7e1a0a6a1711f86a7ecda3fc" ], "index": "pypi", - "version": "==1.0.3" + "version": "==1.0.4" + }, + "python-dotenv": { + "hashes": [ + "sha256:debd928b49dbc2bf68040566f55cdb3252458036464806f4094487244e2a4093", + "sha256:f157d71d5fec9d4bd5f51c82746b6344dffa680ee85217c123f4a0c8117c4544" + ], + "index": "pypi", + "version": "==0.10.3" }, "pytz": { "hashes": [ @@ -362,19 +344,19 @@ }, "pyyaml": { "hashes": [ - "sha256:1adecc22f88d38052fb787d959f003811ca858b799590a5eaa70e63dca50308c", - "sha256:436bc774ecf7c103814098159fbb84c2715d25980175292c648f2da143909f95", - "sha256:460a5a4248763f6f37ea225d19d5c205677d8d525f6a83357ca622ed541830c2", - "sha256:5a22a9c84653debfbf198d02fe592c176ea548cccce47553f35f466e15cf2fd4", - "sha256:7a5d3f26b89d688db27822343dfa25c599627bc92093e788956372285c6298ad", - "sha256:9372b04a02080752d9e6f990179a4ab840227c6e2ce15b95e1278456664cf2ba", - "sha256:a5dcbebee834eaddf3fa7366316b880ff4062e4bcc9787b78c7fbb4a26ff2dd1", - "sha256:aee5bab92a176e7cd034e57f46e9df9a9862a71f8f37cad167c6fc74c65f5b4e", - "sha256:c51f642898c0bacd335fc119da60baae0824f2cde95b0330b56c0553439f0673", - "sha256:c68ea4d3ba1705da1e0d85da6684ac657912679a649e8868bd850d2c299cce13", - "sha256:e23d0cc5299223dcc37885dae624f382297717e459ea24053709675a976a3e19" + "sha256:57acc1d8533cbe51f6662a55434f0dbecfa2b9eaf115bede8f6fd00115a0c0d3", + "sha256:588c94b3d16b76cfed8e0be54932e5729cc185caffaa5a451e7ad2f7ed8b4043", + "sha256:68c8dd247f29f9a0d09375c9c6b8fdc64b60810ebf07ba4cdd64ceee3a58c7b7", + "sha256:70d9818f1c9cd5c48bb87804f2efc8692f1023dac7f1a1a5c61d454043c1d265", + "sha256:86a93cccd50f8c125286e637328ff4eef108400dd7089b46a7be3445eecfa391", + "sha256:a0f329125a926876f647c9fa0ef32801587a12328b4a3c741270464e3e4fa778", + "sha256:a3c252ab0fa1bb0d5a3f6449a4826732f3eb6c0270925548cac342bc9b22c225", + "sha256:b4bb4d3f5e232425e25dda21c070ce05168a786ac9eda43768ab7f3ac2770955", + "sha256:cd0618c5ba5bda5f4039b9398bb7fb6a317bb8298218c3de25c47c4740e4b95e", + "sha256:ceacb9e5f8474dcf45b940578591c7f3d960e82f926c707788a570b51ba59190", + "sha256:fe6a88094b64132c4bb3b631412e90032e8cfe9745a58370462240b8cb7553cd" ], - "version": "==5.1" + "version": "==5.1.1" }, "rcssmin": { "hashes": [ @@ -391,16 +373,28 @@ }, "requests": { "hashes": [ - "sha256:502a824f31acdacb3a35b6690b5fbf0bc41d63a24a45c4004352b0242707598e", - "sha256:7bf2a778576d825600030a110f3c0e3e8edc51dfaafe1c146e39a2027784957b" + "sha256:11e007a8a2aa0323f5a921e9e6a2d7e4e67d9877e85773fba9ba6419025cbeb4", + "sha256:9cf5292fcd0f598c671cfc1e0d7d1a7f13bb8085e9a590f48c010551dc6c4b31" ], - "version": "==2.21.0" + "version": "==2.22.0" }, "rjsmin": { "hashes": [ - "sha256:dd9591aa73500b08b7db24367f8d32c6470021f39d5ab4e50c7c02e4401386f1" + "sha256:0ab825839125eaca57cc59581d72e596e58a7a56fbc0839996b7528f0343a0a8", + "sha256:211c2fe8298951663bbc02acdffbf714f6793df54bfc50e1c6c9e71b3f2559a3", + "sha256:466fe70cc5647c7c51b3260c7e2e323a98b2b173564247f9c89e977720a0645f", + "sha256:585e75a84d9199b68056fd4a083d9a61e2a92dfd10ff6d4ce5bdb04bc3bdbfaf", + "sha256:6044ca86e917cd5bb2f95e6679a4192cef812122f28ee08c677513de019629b3", + "sha256:714329db774a90947e0e2086cdddb80d5e8c4ac1c70c9f92436378dedb8ae345", + "sha256:799890bd07a048892d8d3deb9042dbc20b7f5d0eb7da91e9483c561033b23ce2", + "sha256:975b69754d6a76be47c0bead12367a1ca9220d08e5393f80bab0230d4625d1f4", + "sha256:b15dc75c71f65d9493a8c7fa233fdcec823e3f1b88ad84a843ffef49b338ac32", + "sha256:dd0f4819df4243ffe4c964995794c79ca43943b5b756de84be92b445a652fb86", + "sha256:e3908b21ebb584ce74a6ac233bdb5f29485752c9d3be5e50c5484ed74169232c", + "sha256:e487a7783ac4339e79ec610b98228eb9ac72178973e3dee16eba0e3feef25924", + "sha256:ecd29f1b3e66a4c0753105baec262b331bcbceefc22fbe6f7e8bcd2067bcb4d7" ], - "version": "==1.0.12" + "version": "==1.1.0" }, "schema": { "hashes": [ @@ -418,15 +412,22 @@ }, "sqlalchemy": { "hashes": [ - "sha256:91c54ca8345008fceaec987e10924bf07dcab36c442925357e5a467b36a38319" + "sha256:c7fef198b43ef31dfd783d094fd5ee435ce8717592e6784c45ba337254998017" ], - "version": "==1.3.3" + "version": "==1.3.4" }, "sqlalchemy-utils": { "hashes": [ - "sha256:3f1cb542cf0549a0de508d4919f3ad693a36230bf4cd13fdd6253549fec71182" + "sha256:0ebd4d176a5786233db9f2e92040476fcff8b1b426fdbbb7ee4f478280ee9166" ], - "version": "==0.33.11" + "version": "==0.34.0" + }, + "sqlparse": { + "hashes": [ + "sha256:40afe6b8d4b1117e7dff5504d7a8ce07d9a1b15aeeade8a2d10f130a834f8177", + "sha256:7c3dca29c022744e95b547e867cee89f4fce4373f3549ccd8797d8eb52cdb873" + ], + "version": "==0.3.0" }, "stellar": { "hashes": [ @@ -437,25 +438,24 @@ }, "unidecode": { "hashes": [ - "sha256:092cdf7ad9d1052c50313426a625b717dab52f7ac58f859e09ea020953b1ad8f", - "sha256:8b85354be8fd0c0e10adbf0675f6dc2310e56fda43fa8fe049123b6c475e52fb" + "sha256:8c698f567aa098aeacfbad2d4a416f9803236bdc5ece09653b6e6dfe3f03f102" ], - "version": "==1.0.23" + "version": "==1.1.0" }, "urllib3": { "hashes": [ - "sha256:2393a695cd12afedd0dcb26fe5d50d0cf248e5a66f75dbd89a3d4eb333a61af4", - "sha256:a637e5fae88995b256e3409dc4d52c2e2e0ba32c42a6365fee8bbd2238de3cfb" + "sha256:b246607a25ac80bedac05c6f282e3cdaf3afb65420fd024ac94435cabe6e18d1", + "sha256:dbe59173209418ae49d485b87d1681aefa36252ee85884c31346debd19463232" ], - "version": "==1.24.3" + "version": "==1.25.3" }, "wagtail": { "hashes": [ - "sha256:6aec70968f4792bf5200e1ac667e9dfd00ddc39367a072bf83752dfcaf13dd51", - "sha256:aa9daf174ed83dc9d805fc958b7d34f6cfe840d053e929af105d9f7d154938dc" + "sha256:6213d91d0624d62723fdd2c8c88c5b2b96a6e5a301b742b305c40a674286172c", + "sha256:aa4371d3e6feba01bbb1c48a6ed2569c4aa6b3f715971827c6ca1a68afda0f60" ], "index": "pypi", - "version": "==2.3" + "version": "==2.5.1" }, "webencodings": { "hashes": [ @@ -480,5 +480,179 @@ "version": "==1.1" } }, - "develop": {} + "develop": { + "atomicwrites": { + "hashes": [ + "sha256:03472c30eb2c5d1ba9227e4c2ca66ab8287fbfbbda3888aa93dc2e28fc6811b4", + "sha256:75a9445bac02d8d058d5e1fe689654ba5a6556a1dfd8ce6ec55a0ed79866cfa6" + ], + "version": "==1.3.0" + }, + "attrs": { + "hashes": [ + "sha256:69c0dbf2ed392de1cb5ec704444b08a5ef81680a61cb899dc08127123af36a79", + "sha256:f0b870f674851ecbfbbbd364d6b5cbdff9dcedbc7f3f5e18a6891057f21fe399" + ], + "version": "==19.1.0" + }, + "django": { + "hashes": [ + "sha256:753d30d3eb078064d2ddadfea65083c9848074a7f93d7b4dc7fa6b1380d278f5", + "sha256:7cb67e8b934fab23b6daed7144da52e8a25a47eba7f360ca43d2b448506b01ad" + ], + "index": "pypi", + "version": "==2.2.2" + }, + "django-debug-toolbar": { + "hashes": [ + "sha256:89d75b60c65db363fb24688d977e5fbf0e73386c67acf562d278402a10fc3736", + "sha256:c2b0134119a624f4ac9398b44f8e28a01c7686ac350a12a74793f3dd57a9eea0" + ], + "index": "pypi", + "version": "==1.11" + }, + "filelock": { + "hashes": [ + "sha256:18d82244ee114f543149c66a6e0c14e9c4f8a1044b5cdaadd0f82159d6a6ff59", + "sha256:929b7d63ec5b7d6b71b0fa5ac14e030b3f70b75747cef1b10da9b879fef15836" + ], + "version": "==3.0.12" + }, + "importlib-metadata": { + "hashes": [ + "sha256:6dfd58dfe281e8d240937776065dd3624ad5469c835248219bd16cf2e12dbeb7", + "sha256:cb6ee23b46173539939964df59d3d72c3e0c1b5d54b84f1d8a7e912fe43612db" + ], + "version": "==0.18" + }, + "more-itertools": { + "hashes": [ + "sha256:2112d2ca570bb7c3e53ea1a35cd5df42bb0fd10c45f0fb97178679c3c03d64c7", + "sha256:c3e4748ba1aad8dba30a4886b0b1a2004f9a863837b8654e7059eebf727afa5a" + ], + "markers": "python_version > '2.7'", + "version": "==7.0.0" + }, + "packaging": { + "hashes": [ + "sha256:0c98a5d0be38ed775798ece1b9727178c4469d9c3b4ada66e8e6b7849f8732af", + "sha256:9e1cbf8c12b1f1ce0bb5344b8d7ecf66a6f8a6e91bcb0c84593ed6d3ab5c4ab3" + ], + "version": "==19.0" + }, + "pluggy": { + "hashes": [ + "sha256:0825a152ac059776623854c1543d65a4ad408eb3d33ee114dff91e57ec6ae6fc", + "sha256:b9817417e95936bf75d85d3f8767f7df6cdde751fc40aed3bb3074cbcb77757c" + ], + "version": "==0.12.0" + }, + "py": { + "hashes": [ + "sha256:64f65755aee5b381cea27766a3a147c3f15b9b6b9ac88676de66ba2ae36793fa", + "sha256:dc639b046a6e2cff5bbe40194ad65936d6ba360b52b3c3fe1d08a82dd50b5e53" + ], + "version": "==1.8.0" + }, + "pyparsing": { + "hashes": [ + "sha256:1873c03321fc118f4e9746baf201ff990ceb915f433f23b395f5580d1840cb2a", + "sha256:9b6323ef4ab914af344ba97510e966d64ba91055d6b9afa6b30799340e89cc03" + ], + "version": "==2.4.0" + }, + "pytest": { + "hashes": [ + "sha256:4a784f1d4f2ef198fe9b7aef793e9fa1a3b2f84e822d9b3a64a181293a572d45", + "sha256:926855726d8ae8371803f7b2e6ec0a69953d9c6311fa7c3b6c1b929ff92d27da" + ], + "index": "pypi", + "version": "==4.6.3" + }, + "pytest-splinter": { + "hashes": [ + "sha256:8725c2305334aa2eaefcbf158b57abe7d49e7e1f21e45df96900f30c02afd55a" + ], + "index": "pypi", + "version": "==2.0.1" + }, + "pytz": { + "hashes": [ + "sha256:303879e36b721603cc54604edcac9d20401bdbe31e1e4fdee5b9f98d5d31dfda", + "sha256:d747dd3d23d77ef44c6a3526e274af6efeb0a6f1afd5a69ba4d5be4098c8e141" + ], + "version": "==2019.1" + }, + "selenium": { + "hashes": [ + "sha256:2d7131d7bc5a5b99a2d9b04aaf2612c411b03b8ca1b1ee8d3de5845a9be2cb3c", + "sha256:deaf32b60ad91a4611b98d8002757f29e6f2c2d5fcaf202e1c9ad06d6772300d" + ], + "version": "==3.141.0" + }, + "six": { + "hashes": [ + "sha256:3350809f0555b11f552448330d0b52d5f24c91a322ea4a15ef22629740f3761c", + "sha256:d16a0141ec1a18405cd4ce8b4613101da75da0e9a7aec5bdd4fa804d0e0eba73" + ], + "version": "==1.12.0" + }, + "splinter": { + "hashes": [ + "sha256:2d9f370536e6c1607824f5538e0bff9808bc02f086b07622b3790424dd3daff4", + "sha256:5d9913bddb6030979c18d6801578813b02bbf8a03b43fb057f093228ed876d62" + ], + "version": "==0.10.0" + }, + "sqlparse": { + "hashes": [ + "sha256:40afe6b8d4b1117e7dff5504d7a8ce07d9a1b15aeeade8a2d10f130a834f8177", + "sha256:7c3dca29c022744e95b547e867cee89f4fce4373f3549ccd8797d8eb52cdb873" + ], + "version": "==0.3.0" + }, + "toml": { + "hashes": [ + "sha256:229f81c57791a41d65e399fc06bf0848bab550a9dfd5ed66df18ce5f05e73d5c", + "sha256:235682dd292d5899d361a811df37e04a8828a5b1da3115886b73cf81ebc9100e" + ], + "version": "==0.10.0" + }, + "tox": { + "hashes": [ + "sha256:f5c8e446b51edd2ea97df31d4ded8c8b72e7d6c619519da6bb6084b9dd5770f9", + "sha256:f87fd33892a2df0950e5e034def9468988b8d008c7e9416be665fcc0dd45b14f" + ], + "index": "pypi", + "version": "==3.12.1" + }, + "urllib3": { + "hashes": [ + "sha256:b246607a25ac80bedac05c6f282e3cdaf3afb65420fd024ac94435cabe6e18d1", + "sha256:dbe59173209418ae49d485b87d1681aefa36252ee85884c31346debd19463232" + ], + "version": "==1.25.3" + }, + "virtualenv": { + "hashes": [ + "sha256:99acaf1e35c7ccf9763db9ba2accbca2f4254d61d1912c5ee364f9cc4a8942a0", + "sha256:fe51cdbf04e5d8152af06c075404745a7419de27495a83f0d72518ad50be3ce8" + ], + "version": "==16.6.0" + }, + "wcwidth": { + "hashes": [ + "sha256:3df37372226d6e63e1b1e1eda15c594bca98a22d33a23832a90998faa96bc65e", + "sha256:f4ebe71925af7b40a864553f761ed559b43544f8f71746c2d756c7fe788ade7c" + ], + "version": "==0.1.7" + }, + "zipp": { + "hashes": [ + "sha256:8c1019c6aad13642199fbe458275ad6a84907634cc9f0989877ccc4a2840139d", + "sha256:ca943a7e809cc12257001ccfb99e3563da9af99d52f261725e96dfe0f9275bc3" + ], + "version": "==0.5.1" + } + } } diff --git a/feedler/admin.py b/feedler/admin.py index 37a2bea..8c705ef 100644 --- a/feedler/admin.py +++ b/feedler/admin.py @@ -4,7 +4,7 @@ from django.db import models from django.contrib.auth.decorators import login_required from django.utils.decorators import method_decorator from django.conf.urls import url -from django.core.urlresolvers import reverse +from django.urls import reverse from django.utils.functional import cached_property from django.utils.translation import ugettext as _ from django.shortcuts import redirect diff --git a/feedler/endpoints.py b/feedler/endpoints.py index 3bafe75..7c48447 100644 --- a/feedler/endpoints.py +++ b/feedler/endpoints.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -from wagtail.contrib.wagtailapi.endpoints import BaseAPIEndpoint -from wagtail.contrib.wagtailapi.serializers import BaseSerializer -from wagtail.contrib.wagtailapi.filters import FieldsFilter, OrderingFilter, SearchFilter -from wagtail.contrib.wagtailapi.pagination import WagtailPagination +from wagtail.api.v2.endpoints import BaseAPIEndpoint +from wagtail.api.v2.serializers import BaseSerializer +from wagtail.api.v2.filters import FieldsFilter, OrderingFilter, SearchFilter +from wagtail.api.v2.pagination import WagtailPagination from .models import Entry diff --git a/manage.py b/manage.py index e05b9b1..6029de8 100755 --- a/manage.py +++ b/manage.py @@ -1,8 +1,11 @@ #!/usr/bin/env python import os import sys +from dotenv import load_dotenv if __name__ == "__main__": + load_dotenv() + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "publichealth.settings") from django.core.management import execute_from_command_line diff --git a/publichealth/home/migrations/0001_initial.py b/publichealth/home/migrations/0001_initial.py index 77e0625..54ef509 100644 --- a/publichealth/home/migrations/0001_initial.py +++ b/publichealth/home/migrations/0001_initial.py @@ -14,7 +14,7 @@ class Migration(migrations.Migration): migrations.CreateModel( name='HomePage', fields=[ - ('page_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='wagtailcore.Page')), + ('page_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, on_delete=models.deletion.CASCADE, serialize=False, to='wagtailcore.Page')), ], options={ 'abstract': False, diff --git a/publichealth/home/models/models.py b/publichealth/home/models/models.py index c9134b1..0a8c168 100644 --- a/publichealth/home/models/models.py +++ b/publichealth/home/models/models.py @@ -309,11 +309,11 @@ class HomePage(Page): # TODO: English news? news = events = jobs = [] Stream1 = Stream.objects.filter(title='News') - if Stream1: news = entries.filter(stream=Stream1) + if Stream1: news = entries.filter(stream=Stream1.first()) Stream2 = Stream.objects.filter(title='Events') - if Stream2: events = entries.filter(stream=Stream2) + if Stream2: events = entries.filter(stream=Stream2.first()) Stream3 = Stream.objects.filter(title='Jobs') - if Stream3: jobs = entries.filter(stream=Stream3) + if Stream3: jobs = entries.filter(stream=Stream3.first()) i = settings.NEWS_ENTRIES_HOME_PAGE return list(chain(news[:i], events[:i], jobs[:i])) diff --git a/publichealth/home/models/snippets.py b/publichealth/home/models/snippets.py index de3ec55..1cb0037 100644 --- a/publichealth/home/models/snippets.py +++ b/publichealth/home/models/snippets.py @@ -27,7 +27,10 @@ class SocialContact(models.Model): choices=SOCIAL_NETWORK_SUPPORTED) profile = models.CharField(max_length=255, default="", help_text="Name of the account, e.g. @myaccount, or full URL") - home_site = models.ForeignKey('wagtailcore.Site', null=True, blank=True, related_name='+') + home_site = models.ForeignKey( + 'wagtailcore.Site', null=True, blank=True, + on_delete=models.SET_NULL, + related_name='+') panels = [ FieldPanel('network'), FieldPanel('profile'), @@ -77,7 +80,12 @@ class Contact(models.Model): related_name='+', ) - home_site = models.ForeignKey('wagtailcore.Site', null=True, blank=True, related_name='+') + home_site = models.ForeignKey( + 'wagtailcore.Site', + null=True, blank=True, + on_delete=models.SET_NULL, + related_name='+', + ) panels = Page.content_panels + [ FieldPanel('title_fr'), diff --git a/publichealth/home/templatetags/navigation.py b/publichealth/home/templatetags/navigation.py index 2201486..f129647 100644 --- a/publichealth/home/templatetags/navigation.py +++ b/publichealth/home/templatetags/navigation.py @@ -35,7 +35,7 @@ def language_switcher(context): 'request': context['request'], } -@register.assignment_tag(takes_context=True) +@register.simple_tag(takes_context=True) def get_site_root(context): # NB this returns a core.Page, not the implementation-specific model used # so object-comparison to self will return false as objects would differ diff --git a/publichealth/settings/base.py b/publichealth/settings/base.py index 1c29d12..bf0b559 100644 --- a/publichealth/settings/base.py +++ b/publichealth/settings/base.py @@ -71,7 +71,7 @@ INSTALLED_APPS = [ 'django.contrib.staticfiles', ] -MIDDLEWARE_CLASSES = [ +MIDDLEWARE = [ 'django.middleware.security.SecurityMiddleware', 'whitenoise.middleware.WhiteNoiseMiddleware', diff --git a/publichealth/settings/dev.py b/publichealth/settings/dev.py index 1e2f52d..afa6a7d 100644 --- a/publichealth/settings/dev.py +++ b/publichealth/settings/dev.py @@ -27,7 +27,7 @@ DATABASES = { INSTALLED_APPS = [ 'whitenoise.runserver_nostatic', ] + INSTALLED_APPS + [ - 'wagtail.contrib.wagtailstyleguide', + 'wagtail.contrib.styleguide', ] try: diff --git a/publichealth/urls.py b/publichealth/urls.py index 6ac5fda..eb79f47 100644 --- a/publichealth/urls.py +++ b/publichealth/urls.py @@ -6,6 +6,7 @@ from django.conf.urls.i18n import i18n_patterns from wagtail.admin import urls as wagtailadmin_urls from wagtail.documents import urls as wagtaildocs_urls from wagtail.core import urls as wagtail_urls +from wagtail.contrib.sitemaps.views import sitemap from puput import urls as puput_urls from feedler import urls as feedler_urls @@ -16,12 +17,14 @@ urlpatterns = [ url(r'', include(puput_urls)), url(r'', include(feedler_urls)), - url(r'^django-admin/', include(admin.site.urls)), + url(r'^django-admin/', admin.site.urls), url(r'^admin/', include(wagtailadmin_urls)), url(r'^documents/', include(wagtaildocs_urls)), url(r'^search/$', search_views.search, name='search'), + + url('^sitemap\.xml$', sitemap), ] diff --git a/requirements-test.txt b/requirements-test.txt index 96bd4eb..67324f0 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -1,6 +1,6 @@ -# Updated: 23.10.2017 +# Updated: 14.6.2019 -pytest==3.0.3 -pytest-splinter==1.8.5 -tox==2.9.1 -django-debug-toolbar==1.8 +pytest +pytest-splinter +tox +django-debug-toolbar diff --git a/requirements.txt b/requirements.txt index 58f4854..96b4c68 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,33 +1,33 @@ -# Updated: 11.11.2018 +# Updated: 14.6.2019 # Core -wagtail>=1.13.1,<2.2.0 -Django>=1.11.7,<2.1.0 -elasticsearch>=2.0.0,<3.0.0 +wagtail==2.5.1 +Django==2.2.2 +elasticsearch==7.0.2 # Database -psycopg2==2.7.6.1 -psycopg2-binary==2.7.6.1 +psycopg2-binary==2.8.3 dj-database-url==0.5.0 # Content -puput>=0.9.2 -guess-language-spirit>=0.5.3 +puput==1.0.4 +guess-language-spirit==0.5.3 # Caching -django-redis>=4.9.0 +django-redis==4.10.0 # Frontend django-libsass==0.7 -libsass==0.15.1 -Pillow==5.3.0 +libsass==0.19.1 +Pillow==5.4.1 # Development tools -stellar>=0.4.5 +stellar==0.4.5 # Production dependencies gunicorn==19.9.0 -whitenoise==4.1 +whitenoise==4.1.2 ConcurrentLogHandler==0.9.1 -django-anymail==5.0 +django-anymail==6.0.1 django-crispy-forms==1.7.2 +python-dotenv==0.10.3 diff --git a/tests/testapp/settings.py b/tests/testapp/settings.py index 56e5bce..a0e8f43 100644 --- a/tests/testapp/settings.py +++ b/tests/testapp/settings.py @@ -19,7 +19,7 @@ INSTALLED_APPS = ( INSTALLED_APPS += PUPUT_APPS INSTALLED_APPS += FEEDLER_APPS -MIDDLEWARE_CLASSES = ( +MIDDLEWARE = ( 'django.contrib.sessions.middleware.SessionMiddleware', 'django.middleware.common.CommonMiddleware', 'django.middleware.csrf.CsrfViewMiddleware', From 5e29168565d8de1e50eb7fb0fac9523d878320a3 Mon Sep 17 00:00:00 2001 From: Oleg Lavrovsky Date: Tue, 25 Jun 2019 15:12:18 +0200 Subject: [PATCH 5/6] Django 2.1 (SQLite 3.8.2) --- Pipfile | 2 +- Pipfile.lock | 67 ++++++++++++++++++++++++++-------------------------- 2 files changed, 35 insertions(+), 34 deletions(-) diff --git a/Pipfile b/Pipfile index d4a39ee..6640687 100644 --- a/Pipfile +++ b/Pipfile @@ -11,7 +11,7 @@ django-debug-toolbar = "*" [packages] ConcurrentLogHandler = "*" -Django = "*" +Django = "~=2.1" django-anymail = "*" django-libsass = "*" django-redis = "*" diff --git a/Pipfile.lock b/Pipfile.lock index 6ddbaf2..206bf86 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "cb250c2bc86f70cd1b7d1d65782839144d78c244f2103c9af5c984a16bc95706" + "sha256": "2945aa526ae27d57aaa7e13ad272c9ce05fa6416af29d5ad54276d2596095b92" }, "pipfile-spec": 6, "requires": {}, @@ -24,10 +24,10 @@ }, "certifi": { "hashes": [ - "sha256:59b7658e26ca9c7339e00f8f4636cdfe59d34fa37b9b04f6f9e9926b3cece1a5", - "sha256:b26104d6835d1f5e49452a26eb2ff87fe7090b89dfcaee5ea2212697e1e1d7ae" + "sha256:046832c04d4e752f37383b628bc601a7ea7211496b4638f6514d0e5b9acc4939", + "sha256:945e3ba63a0b9f577b1395204e13c3a231f9bc0223888be653286534e5873695" ], - "version": "==2019.3.9" + "version": "==2019.6.16" }, "chardet": { "hashes": [ @@ -216,24 +216,24 @@ }, "libsass": { "hashes": [ - "sha256:000de439948e001934f697c51c025a6842e43c212974b6a2d5218f057114f5be", - "sha256:049097611c246364dcad1e44986a3bb565e39ddffe64fb3956570161a995020e", - "sha256:1813dadccbe22afe56da7ce495db19117b59c50c13688fbcc1b92070b94d33ed", - "sha256:25b88650f3f13fcd5d5e5d3b4c12c6e77136acd36cf0c26ef4b1bd4eac71bd70", - "sha256:2d2630bc6fa94106cd69a72c46c10e3f7378922aed988a058ca8fc672765fac7", - "sha256:53570a2505794c191de1484a9c407359cd12f797a3ef50e474a95f66915a51c4", - "sha256:69c86e98fb11ab74356dc054be61ae1ce6882b0dece5be409bb5ba7b1b696885", - "sha256:703bf25e5065bc8f45154fe828eee24ab7e14660088c2784e09741aecab118f9", - "sha256:7179a3862fb8e2cc5d1f7e97fed0a2afed49141df1949f43fbf7c9516c48d064", - "sha256:8ac0910a43758097c816bdf9f7af85e564aff49c64ef9571be036cb599fe510a", - "sha256:ac1188c967b7c4aff23be32974c688cd55b8d9771ee6c988b39e557508c3b3f2", - "sha256:b1890110043c11d11640d97334946975d7f43494dc46076c50fb5c7701878cab", - "sha256:b7215262984cc3f692e705564ab5405841a51cfca1408062ae9776ef4b4dabff", - "sha256:becb4c41f7edda34312d27787bcff4c9363a4f877bf87476dd863a0d7cf7bbef", - "sha256:dc75c1ed7f7863f9c23009002713fcc75331f50eb7e32e7aa1e21cc5d17071f1" + "sha256:2457723fe04f4e690105f758aa125e809afc840812965095fa3f4edccd6275ef", + "sha256:2974772e7984b27a51a6d91ebc140183ddd574a9663bd02154ddfb75f13a3eed", + "sha256:2d067ce4f393fee2ce52bb810a364deac5454dfdb7945d31d1f4265f21f03ab8", + "sha256:57d0b99c4e3512233a44141f1bf852570d359724a606dfc4550eccd0f570460d", + "sha256:5b604e4f5befdecc76240c2ba243fd7e23c642ffc2dd86cbfd094a44ead6b08d", + "sha256:5dd647ffa1319a2a18572f41fee3bb561d7f77d8d4784074a00b2eb22c61a859", + "sha256:78f3f14e47612be4fa4b161278f2a3e880a19b6a3367f749e9ae240434b7e7f5", + "sha256:8d423e4b4c0e219488104b4ec4267688dbd816f3ae806beb4201918eff059b2d", + "sha256:a20473b0427d82e37fa68f0b3a8d219f0bb5ca6d3f7d93b0f5342219285e7064", + "sha256:c1f76c2a0993914f3c3088e9b6c7031f22e879c5d27a060cdc8c5aa1318eb9b6", + "sha256:c99fbc950f1955e8b6370aafdb9d84d324e4984a2e00a2b47f04dbcc3706a9d1", + "sha256:cb50f385117535f7671ac7ff3144c1ef0b8e088778c58d269ce6f31b87bfad72", + "sha256:f0f033a8154be60e1a2e1f79ee849ea69a1d62e5d476a78f69e4c7d8fd7c20e1", + "sha256:f2572b73b2e13e74b28388ae86c4fabb853ddbfc12279b4444243bd614710ce8", + "sha256:f8790db67e00c5bc7be1bdd81ed477563a4b191e839193ecc0c2c5ec679ec481" ], "index": "pypi", - "version": "==0.19.1" + "version": "==0.19.2" }, "pillow": { "hashes": [ @@ -412,9 +412,9 @@ }, "sqlalchemy": { "hashes": [ - "sha256:c7fef198b43ef31dfd783d094fd5ee435ce8717592e6784c45ba337254998017" + "sha256:c30925d60af95443458ebd7525daf791f55762b106049ae71e18f8dd58084c2f" ], - "version": "==1.3.4" + "version": "==1.3.5" }, "sqlalchemy-utils": { "hashes": [ @@ -438,9 +438,10 @@ }, "unidecode": { "hashes": [ - "sha256:8c698f567aa098aeacfbad2d4a416f9803236bdc5ece09653b6e6dfe3f03f102" + "sha256:1d7a042116536098d05d599ef2b8616759f02985c85b4fef50c78a5aaf10822a", + "sha256:2b6aab710c2a1647e928e36d69c21e76b453cd455f4e2621000e54b2a9b8cce8" ], - "version": "==1.1.0" + "version": "==1.1.1" }, "urllib3": { "hashes": [ @@ -505,11 +506,11 @@ }, "django-debug-toolbar": { "hashes": [ - "sha256:89d75b60c65db363fb24688d977e5fbf0e73386c67acf562d278402a10fc3736", - "sha256:c2b0134119a624f4ac9398b44f8e28a01c7686ac350a12a74793f3dd57a9eea0" + "sha256:17c53cd6bf4e7d69902aedf9a1d26c5d3b7369b54c5718744704f27b5a72f35d", + "sha256:9a23ada2e43cd989195db3c18710b5d7451134a0d48127ab64c1d2ad81700342" ], "index": "pypi", - "version": "==1.11" + "version": "==2.0" }, "filelock": { "hashes": [ @@ -620,11 +621,11 @@ }, "tox": { "hashes": [ - "sha256:f5c8e446b51edd2ea97df31d4ded8c8b72e7d6c619519da6bb6084b9dd5770f9", - "sha256:f87fd33892a2df0950e5e034def9468988b8d008c7e9416be665fcc0dd45b14f" + "sha256:2316d3f56339173c6d45e600dabcfac6fbed7fff82a7d35f4107152e9191a766", + "sha256:66d9ccf81b383ab1edc1619410223eec0e046178304728797a850302092ed975" ], "index": "pypi", - "version": "==3.12.1" + "version": "==3.13.0" }, "urllib3": { "hashes": [ @@ -635,10 +636,10 @@ }, "virtualenv": { "hashes": [ - "sha256:99acaf1e35c7ccf9763db9ba2accbca2f4254d61d1912c5ee364f9cc4a8942a0", - "sha256:fe51cdbf04e5d8152af06c075404745a7419de27495a83f0d72518ad50be3ce8" + "sha256:b7335cddd9260a3dd214b73a2521ffc09647bde3e9457fcca31dc3be3999d04a", + "sha256:d28ca64c0f3f125f59cabf13e0a150e1c68e5eea60983cc4395d88c584495783" ], - "version": "==16.6.0" + "version": "==16.6.1" }, "wcwidth": { "hashes": [ From b79f651c4eccaf8c293396b9c34de42666e765bc Mon Sep 17 00:00:00 2001 From: Oleg Lavrovsky Date: Tue, 25 Jun 2019 15:22:49 +0200 Subject: [PATCH 6/6] Django 2.1.9 and migrations --- Pipfile | 2 +- Pipfile.lock | 21 +++++--------- .../migrations/0026_auto_20190625_1521.py | 29 +++++++++++++++++++ 3 files changed, 37 insertions(+), 15 deletions(-) create mode 100644 publichealth/home/migrations/0026_auto_20190625_1521.py diff --git a/Pipfile b/Pipfile index 6640687..ae41fb4 100644 --- a/Pipfile +++ b/Pipfile @@ -11,7 +11,6 @@ django-debug-toolbar = "*" [packages] ConcurrentLogHandler = "*" -Django = "~=2.1" django-anymail = "*" django-libsass = "*" django-redis = "*" @@ -28,3 +27,4 @@ wagtail = ">=2.0" whitenoise = "*" django-crispy-forms = "*" python-dotenv = "*" +django = "==2.1.9" diff --git a/Pipfile.lock b/Pipfile.lock index 206bf86..a10338d 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "2945aa526ae27d57aaa7e13ad272c9ce05fa6416af29d5ad54276d2596095b92" + "sha256": "d398b7eb5fc9c5e555744d820c9b60a4da2812cb784c13fad44aa394d3fe9592" }, "pipfile-spec": 6, "requires": {}, @@ -67,11 +67,11 @@ }, "django": { "hashes": [ - "sha256:753d30d3eb078064d2ddadfea65083c9848074a7f93d7b4dc7fa6b1380d278f5", - "sha256:7cb67e8b934fab23b6daed7144da52e8a25a47eba7f360ca43d2b448506b01ad" + "sha256:5052def4ff0a84bdf669827fdbd7b7cc1ac058f10232be6b21f37c6824f578da", + "sha256:bb72b5f8b53f8156280eaea520b548ac128a53f80cebc856c5e0fb555d44d529" ], "index": "pypi", - "version": "==2.2.2" + "version": "==2.1.9" }, "django-anymail": { "hashes": [ @@ -422,13 +422,6 @@ ], "version": "==0.34.0" }, - "sqlparse": { - "hashes": [ - "sha256:40afe6b8d4b1117e7dff5504d7a8ce07d9a1b15aeeade8a2d10f130a834f8177", - "sha256:7c3dca29c022744e95b547e867cee89f4fce4373f3549ccd8797d8eb52cdb873" - ], - "version": "==0.3.0" - }, "stellar": { "hashes": [ "sha256:8edd4d19900d47d7e17f1f51dedf7a3cf1e1283d2e52c084b3f69b761f3ae5ce" @@ -498,11 +491,11 @@ }, "django": { "hashes": [ - "sha256:753d30d3eb078064d2ddadfea65083c9848074a7f93d7b4dc7fa6b1380d278f5", - "sha256:7cb67e8b934fab23b6daed7144da52e8a25a47eba7f360ca43d2b448506b01ad" + "sha256:5052def4ff0a84bdf669827fdbd7b7cc1ac058f10232be6b21f37c6824f578da", + "sha256:bb72b5f8b53f8156280eaea520b548ac128a53f80cebc856c5e0fb555d44d529" ], "index": "pypi", - "version": "==2.2.2" + "version": "==2.1.9" }, "django-debug-toolbar": { "hashes": [ diff --git a/publichealth/home/migrations/0026_auto_20190625_1521.py b/publichealth/home/migrations/0026_auto_20190625_1521.py new file mode 100644 index 0000000..4e69421 --- /dev/null +++ b/publichealth/home/migrations/0026_auto_20190625_1521.py @@ -0,0 +1,29 @@ +# Generated by Django 2.1.9 on 2019-06-25 13:21 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('home', '0025_auto_20180628_1611'), + ] + + operations = [ + migrations.AlterField( + model_name='contact', + name='home_site', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailcore.Site'), + ), + migrations.AlterField( + model_name='contactformfield', + name='field_type', + field=models.CharField(choices=[('singleline', 'Single line text'), ('multiline', 'Multi-line text'), ('email', 'Email'), ('number', 'Number'), ('url', 'URL'), ('checkbox', 'Checkbox'), ('checkboxes', 'Checkboxes'), ('dropdown', 'Drop down'), ('multiselect', 'Multiple select'), ('radio', 'Radio buttons'), ('date', 'Date'), ('datetime', 'Date/time'), ('hidden', 'Hidden field')], max_length=16, verbose_name='field type'), + ), + migrations.AlterField( + model_name='socialcontact', + name='home_site', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='wagtailcore.Site'), + ), + ]