From 6bdda66e54bbeb2ba7730a063d38c610779de44c Mon Sep 17 00:00:00 2001 From: Wojciech Bederski Date: Sat, 16 Mar 2019 18:41:01 +0100 Subject: [PATCH 1/4] update django dependency --- requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/base.txt b/requirements/base.txt index 922a62e..63c0297 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -1,4 +1,4 @@ -Django==1.8.18 +django>=1.11.18 Pillow==2.9.0 factory_boy==2.5.2 djet==0.0.10 From ff2dfddd629594e20a9deadf92d6129a89828c8c Mon Sep 17 00:00:00 2001 From: Wojciech Bederski Date: Sat, 16 Mar 2019 18:57:57 +0100 Subject: [PATCH 2/4] simplify requirements.txt and runtime also add Pipfile --- Pipfile | 21 ++++ Pipfile.lock | 187 ++++++++++++++++++++++++++++++++++++ requirements.txt | 19 +++- requirements/base.txt | 8 -- requirements/production.txt | 3 - requirements/staging.txt | 3 - runtime.txt | 2 +- 7 files changed, 226 insertions(+), 17 deletions(-) create mode 100644 Pipfile create mode 100644 Pipfile.lock delete mode 100644 requirements/base.txt delete mode 100644 requirements/production.txt delete mode 100644 requirements/staging.txt diff --git a/Pipfile b/Pipfile new file mode 100644 index 0000000..16c6373 --- /dev/null +++ b/Pipfile @@ -0,0 +1,21 @@ +[[source]] +url = "https://pypi.org/simple" +verify_ssl = true +name = "pypi" + +[packages] +djet = "==0.0.10" +django-embed-video = "==1.1.2" +dj-database-url = "==0.4.2" +whitenoise = "==3.3.0" +django-db-storage = "==1.0.2" +"psycopg2" = "==2.7.4" +gunicorn = "==19.7.1" +Django = "==1.11.18" +Pillow = "==2.9.0" +factory_boy = "==2.5.2" + +[dev-packages] + +[requires] +python_version = "3.6" diff --git a/Pipfile.lock b/Pipfile.lock new file mode 100644 index 0000000..d69d51e --- /dev/null +++ b/Pipfile.lock @@ -0,0 +1,187 @@ +{ + "_meta": { + "hash": { + "sha256": "424d4ebfefa4e37fdb05f3ecb5a1cd56378246ce51954d3ac52eb423a3eaf05b" + }, + "pipfile-spec": 6, + "requires": { + "python_version": "3.6" + }, + "sources": [ + { + "name": "pypi", + "url": "https://pypi.org/simple", + "verify_ssl": true + } + ] + }, + "default": { + "certifi": { + "hashes": [ + "sha256:59b7658e26ca9c7339e00f8f4636cdfe59d34fa37b9b04f6f9e9926b3cece1a5", + "sha256:b26104d6835d1f5e49452a26eb2ff87fe7090b89dfcaee5ea2212697e1e1d7ae" + ], + "version": "==2019.3.9" + }, + "chardet": { + "hashes": [ + "sha256:84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae", + "sha256:fc323ffcaeaed0e0a02bf4d117757b98aed530d9ed4531e3e15460124c106691" + ], + "version": "==3.0.4" + }, + "dj-database-url": { + "hashes": [ + "sha256:a6832d8445ee9d788c5baa48aef8130bf61fdc442f7d9a548424d25cd85c9f08", + "sha256:e16d94c382ea0564c48038fa7fe8d9c890ef1ab1a8ec4cb48e732c124b9482fd" + ], + "index": "pypi", + "version": "==0.4.2" + }, + "django": { + "hashes": [ + "sha256:73cca1dac154e749b39cc91a54dc876109eb0512a5c6804986495305047066a5", + "sha256:7ee7d93d407f082e3849c8d10da50ff5b488af37ed1b0066a22dee5f2709ed16" + ], + "index": "pypi", + "version": "==1.11.18" + }, + "django-db-storage": { + "hashes": [ + "sha256:21cf8f1e98e6c0bbd3016c4d8a41dcfd1a02ba6de828b6735469a1a593bf83a2", + "sha256:f49af3fb11e34f8c52de170e6b8ed1b4203fe2ab9e2996789371617df9ed98e5" + ], + "index": "pypi", + "version": "==1.0.2" + }, + "django-embed-video": { + "hashes": [ + "sha256:caa7b4c3d277bc20ce0ceab371aab33a4374b1ac6b406106d47f97953b033c51" + ], + "index": "pypi", + "version": "==1.1.2" + }, + "djet": { + "hashes": [ + "sha256:61563cef69b3a432e2b77cb098af431b036b8cc5b7d2e0b1db8796f34361e921" + ], + "index": "pypi", + "version": "==0.0.10" + }, + "factory-boy": { + "hashes": [ + "sha256:102c8141511443df01d354610d3b268924100654316709b43ac04648b50bf703", + "sha256:cd8306e64c3a115deca136685e945db88ffe171382012ec938ed241a20dd7eba" + ], + "index": "pypi", + "version": "==2.5.2" + }, + "gunicorn": { + "hashes": [ + "sha256:75af03c99389535f218cc596c7de74df4763803f7b63eb09d77e92b3956b36c6", + "sha256:eee1169f0ca667be05db3351a0960765620dad53f53434262ff8901b68a1b622" + ], + "index": "pypi", + "version": "==19.7.1" + }, + "idna": { + "hashes": [ + "sha256:c357b3f628cf53ae2c4c05627ecc484553142ca23264e593d327bcde5e9c3407", + "sha256:ea8b7f6188e6fa117537c3df7da9fc686d485087abf6ac197f9c46432f7e4a3c" + ], + "version": "==2.8" + }, + "pillow": { + "hashes": [ + "sha256:0f179d7e75e7c83b6341b9595ca1f394de7081484a9e352ad66d553a1c3daa29", + "sha256:43c400b3b539e4cdec0fc277e2a2f37efef31041295cfbd28c7187506823305c", + "sha256:57716fe770005a98792de80b0e47efc70a889e6c828dd8d120839c270fe10f4b", + "sha256:6ccdb949c59174d5f7f0309f83adc437df7a744e55adbd71990c338e57f8447c", + "sha256:6e23df2ec9dcc26b2d23d73806cff13f9586a56c4319262634a5208d390b2fe1", + "sha256:7285180ee2fc1b2cbe751d767a83bd19a3ceaf2262f1f547085e31f22369ef35", + "sha256:766c01fc8e49c1d5e1419b130c54d4d959da62e32fa381f62a02a9fdb5108481", + "sha256:8475d8697d76b7925caf430d34cb874dbff737ff3d52cdca8d11513505fee866", + "sha256:99b03b44d808a1f0be6f807b301c124bf5d9cce090f18ed32c2c88e30bd9c714", + "sha256:9d0fc0b2a86fadba3abd0776c4fae37617e0aeaf481cb2f23f0e66ef015e6285", + "sha256:aefb41723eac1b74581b858d9cfc2587858233ee6c95e0178a1c691f046f7aa6", + "sha256:ca61822a9be2734d7c59ddc977b542887e7fafc75da716ae9347c6a9fb075a38", + "sha256:d1db8dfed77547076037d589b598e04f2cbc1a7835d3d3f137bf20c8994854d5", + "sha256:f79b9c5197378071357213834dcb967053898fcb52842713b0ece6fdb4858680", + "sha256:f9f047405e83eef06ad16f78da81e45d5ea97da8d46877acdc4428619aff5f99", + "sha256:ff9c71f98cb9dfdc8c8878685f25cd8094fae3a286802510de7f47f89336e1e2" + ], + "index": "pypi", + "version": "==2.9.0" + }, + "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" + }, + "pytz": { + "hashes": [ + "sha256:32b0891edff07e28efe91284ed9c31e123d84bea3fd98e1f72be2508f43ef8d9", + "sha256:d5f05e487007e29e03409f9398d074e158d920d36eb82eaf66fb1136b0c5374c" + ], + "version": "==2018.9" + }, + "requests": { + "hashes": [ + "sha256:502a824f31acdacb3a35b6690b5fbf0bc41d63a24a45c4004352b0242707598e", + "sha256:7bf2a778576d825600030a110f3c0e3e8edc51dfaafe1c146e39a2027784957b" + ], + "version": "==2.21.0" + }, + "six": { + "hashes": [ + "sha256:3350809f0555b11f552448330d0b52d5f24c91a322ea4a15ef22629740f3761c", + "sha256:d16a0141ec1a18405cd4ce8b4613101da75da0e9a7aec5bdd4fa804d0e0eba73" + ], + "version": "==1.12.0" + }, + "urllib3": { + "hashes": [ + "sha256:61bf29cada3fc2fbefad4fdf059ea4bd1b4a86d2b6d15e1c7c0b582b9752fe39", + "sha256:de9529817c93f27c8ccbfead6985011db27bd0ddfcdb2d86f3f663385c6a9c22" + ], + "version": "==1.24.1" + }, + "whitenoise": { + "hashes": [ + "sha256:1d62a003a0ab747de96da45c831cbb512dcb7f69c1ef0bd20b1cd4ae45d8a0c4", + "sha256:d098327276de6fd189398a7bcb95789d1bb2d41b3e011eeae4562f6b1a107dd4" + ], + "index": "pypi", + "version": "==3.3.0" + } + }, + "develop": {} +} diff --git a/requirements.txt b/requirements.txt index a750020..98aa4f0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,17 @@ --r requirements/base.txt --r requirements/production.txt \ No newline at end of file +certifi==2019.3.9 +chardet==3.0.4 +dj-database-url==0.4.2 +Django==1.11.18 +django-db-storage==1.0.2 +django-embed-video==1.1.2 +djet==0.0.10 +factory-boy==2.5.2 +gunicorn==19.7.1 +idna==2.8 +Pillow==2.9.0 +psycopg2==2.7.4 +pytz==2018.9 +requests==2.21.0 +six==1.12.0 +urllib3==1.24.1 +whitenoise==3.3.0 diff --git a/requirements/base.txt b/requirements/base.txt deleted file mode 100644 index 63c0297..0000000 --- a/requirements/base.txt +++ /dev/null @@ -1,8 +0,0 @@ -django>=1.11.18 -Pillow==2.9.0 -factory_boy==2.5.2 -djet==0.0.10 -django-embed-video==1.1.2 -dj-database-url==0.4.2 -whitenoise==3.3.0 -django-db-storage==1.0.2 diff --git a/requirements/production.txt b/requirements/production.txt deleted file mode 100644 index 29ca857..0000000 --- a/requirements/production.txt +++ /dev/null @@ -1,3 +0,0 @@ --r base.txt -psycopg2==2.7.4 -gunicorn==19.7.1 diff --git a/requirements/staging.txt b/requirements/staging.txt deleted file mode 100644 index a8c2a8f..0000000 --- a/requirements/staging.txt +++ /dev/null @@ -1,3 +0,0 @@ --r base.txt -psycopg2==2.6.1 -gunicorn==19.7.1 diff --git a/runtime.txt b/runtime.txt index 5c45380..8234723 100644 --- a/runtime.txt +++ b/runtime.txt @@ -1 +1 @@ -python-3.6.4 +python-3.6.8 \ No newline at end of file From d8d68819bdddf6395e7dda62b5f0d08fb38fffaf Mon Sep 17 00:00:00 2001 From: Wojciech Bederski Date: Sat, 16 Mar 2019 19:00:43 +0100 Subject: [PATCH 3/4] remove requirements txt, heroku understands Pipfile --- requirements.txt | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 requirements.txt diff --git a/requirements.txt b/requirements.txt deleted file mode 100644 index 98aa4f0..0000000 --- a/requirements.txt +++ /dev/null @@ -1,17 +0,0 @@ -certifi==2019.3.9 -chardet==3.0.4 -dj-database-url==0.4.2 -Django==1.11.18 -django-db-storage==1.0.2 -django-embed-video==1.1.2 -djet==0.0.10 -factory-boy==2.5.2 -gunicorn==19.7.1 -idna==2.8 -Pillow==2.9.0 -psycopg2==2.7.4 -pytz==2018.9 -requests==2.21.0 -six==1.12.0 -urllib3==1.24.1 -whitenoise==3.3.0 From 247a891f771cf11cca6412972b0937767e3f78f6 Mon Sep 17 00:00:00 2001 From: Wojciech Bederski Date: Sat, 16 Mar 2019 19:00:54 +0100 Subject: [PATCH 4/4] remove TEMPLATE_CONTEXT_PROCESSORS --- pylight/pylight/settings/base.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pylight/pylight/settings/base.py b/pylight/pylight/settings/base.py index f6a2c32..241c7dc 100644 --- a/pylight/pylight/settings/base.py +++ b/pylight/pylight/settings/base.py @@ -160,13 +160,6 @@ def get_env_var(name, **kwargs): } } -TEMPLATE_CONTEXT_PROCESSORS = global_settings.TEMPLATE_CONTEXT_PROCESSORS + ( - 'django.core.context_processors.request', - 'misc.context_processors.system_info', - 'misc.context_processors.current_site', - 'meetups.context_processors.stats', -) - MEETUP_NAME = 'PyLight' TALK_PROPOSAL_RECIPIENTS = ['hello@pylight.org']