diff --git a/.travis.yml b/.travis.yml index e180aeef..fed23a15 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,6 @@ cache: directories: - node_modules python: - - 3.4 - 3.5 - 3.6 env: diff --git a/Pipfile b/Pipfile index f7b06cee..0bf2d3f0 100644 --- a/Pipfile +++ b/Pipfile @@ -11,7 +11,7 @@ djangorestframework = "*" django-filter = "*" django-widget-tweaks = "*" plotly = "*" -pandas = "<0.22.0" +pandas = "*" faker = "*" dj-database-url = "*" gunicorn = "*" diff --git a/Pipfile.lock b/Pipfile.lock index e4e24ff3..d8ae527e 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "c77afa84e0b11ac097b5e4a98267b2553f1c8c94c2f4fb3b832ec6acd485fe31" + "sha256": "21a6001d830ce191858fed3bd90d35af9317737dddfcb41a3dd1e714f8e8fd54" }, "pipfile-spec": 6, "requires": {}, @@ -15,17 +15,17 @@ "default": { "boto3": { "hashes": [ - "sha256:a2d5c0a007ff50b4a08f402925495e18e41e336d22767a2b4fa21913fa875b2f", - "sha256:f303b0feaabbe98b36ab12be1c641799104c935c9e0c9315b6fe53a39d668d79" + "sha256:7911f4b593a268a9b218839af972dbeeca886037e1090fa06aaef94276545a4d", + "sha256:c5942bb27d364625be6b0521e88ccfcd60a2d2b58b9b126748fb22d613693260" ], - "version": "==1.7.14" + "version": "==1.7.24" }, "botocore": { "hashes": [ - "sha256:2d83993e60ba56ca3ddb48a0d4da86c1cfa1f687993abe760eeb0059d10e52f6", - "sha256:5e61efeb68688149fb8220f0bca6c8a89bc998dffb99673d0bf24cfe2f2e47a9" + "sha256:710307a7ad4b150099e82845054c340ad5aae7c0c80c773f39ab9b402720e435", + "sha256:b7a23361bcd6ce2d9cf56a3e5bc7c6b2e3233f3d902d41cb2dfb37472ea41986" ], - "version": "==1.10.14" + "version": "==1.10.24" }, "certifi": { "hashes": [ @@ -116,10 +116,10 @@ }, "faker": { "hashes": [ - "sha256:226d8fa67a8cf8b4007aab721f67639f130e9cfdc53a7095a2290ebb07a65c71", - "sha256:48fed4b4a191e2b42ad20c14115f1c6d36d338b80192075d7573f0f42d7fb321" + "sha256:782a58cec0e083df8e3536b0a890fce9bdc1633782c140b64183dcc626fea53e", + "sha256:a77a1a2223a8e0d32618878350bbd2171040f32b526ba2cddfab8864704bb370" ], - "version": "==0.8.13" + "version": "==0.8.15" }, "gunicorn": { "hashes": [ @@ -200,23 +200,23 @@ }, "pandas": { "hashes": [ - "sha256:009010ac81b24a4a95a7c5cf4e977cdc8e0650d1cba4e45753e13b0fa9bd705f", - "sha256:134d11afe9408968a5cfeb1e2b114230c0b65e31cdf0f7aee0f12cab76732182", - "sha256:245a399013ef67c3bed30c320bde3c15f306f04e36529ef2d290982d85faf86e", - "sha256:255c4f1b6e03fc50c8c90c26593ef1ac383e226a59626575ff303c833c9bb464", - "sha256:32dd9e2bd0ac6590db16fc7c85f07d679a20169943b5cbe382a565f73d20c488", - "sha256:3acd0ed9fb6e63ca6242cf64ca7835914b0c582558ae797f341fa13a8676b929", - "sha256:6229b5937d68c7020577bc8cb73dc724f8cdb685b278518fbecb3523034f6e0d", - "sha256:83637686b4218d2a81f209de00c58cc1f8e6f0d979592dc6bc5255b1a3b33f7a", - "sha256:916dc824236c16162b39161eb2ce2b1085d70dee34f3b7582270145382d74fd5", - "sha256:ab3e6c8c1b8cce2620e66b35bb93d79f8f4b887e5e18e2a911d9fef1eaee00d9", - "sha256:b1157f2986d23ab93df178defca4a079a8897f97b5704b028983bd325536fdf6", - "sha256:c5f5cba88bf0659554c41c909e1f78139f6fce8fa9315a29a23692b38ff9788a", - "sha256:cf75f806d0ccaa0daa26c5a59ad48c2462a28d38e4dc99140b2809315cb1a7c0", - "sha256:eaabe40119d5bd1c1b5662858d882a91f1726158402b531f1a9a256a35c889a7", - "sha256:fbf77fa2651c6dfb5444b3054f0802b37c930c1a55abdd417f88fc32adb5d8fd" + "sha256:295cf212054b28f1d111f3ffff932a012601558424ec892f2450d6197f6eeb92", + "sha256:29960ea1783c59fe86b323799b130592149e0f7bb739149e7fc512b0272d9fc3", + "sha256:29dde0874d1efb8a346f8d919b0530a9ae788ad1003752376133e38df09e6fcb", + "sha256:2d6b7b152a6ba44627c60df291f773c4438df01653abcbec7fc556d6039f1705", + "sha256:5de7275fc7222211dcac603ea81f1e143c45f8ec41d2e21df71aad0c95c1097c", + "sha256:7261b3567804a70714cc2591e2f7f1e372379db9e140f9d7ffb4b8884eaa48f7", + "sha256:758b8f6c68bc99b2eb64e57092d3aa07bd68a774e92e7686e473e0d9c86a2309", + "sha256:835c5a2aeaa3cb5ef2a1d771c75ee3a73d6ad1b82cfc54677c8f863c75fa51bd", + "sha256:8398d7a47ae667a639ac4ee6724d7ef98602b5ff2b10b5b4d5e6ab45a8d596d2", + "sha256:84ab1d50590cb2d9554211f164dc1b1a216bc94da2ba922aed2690c83f248fd9", + "sha256:98054c04318ba46bb81433230c2e5fab6a68df916ccb5355d428907bfb16b257", + "sha256:9e5ee41d1550ec36093c95e30644e313df4b57c1cdead545754d9c113aecbbb5", + "sha256:d4495aba61060d87c634fc777ac15aecd1d176987e5ed0585a3ed7e2f4e6c1f7", + "sha256:d5f72c8239e46cfcc363c7e532a474b7ea3d8892b7b6e5ec0da6b3ebae2a07d3", + "sha256:d88f484a25ac212fd720b5f9b9686e83f86df2b091b51f4b7b1d9089bd842f79" ], - "version": "==0.21.1" + "version": "==0.23.0" }, "pillow": { "hashes": [ @@ -268,9 +268,9 @@ }, "plotly": { "hashes": [ - "sha256:9dd816c36271cf81d82c854fba866c743cbd8cc71f1c95384195307def859a69" + "sha256:66c0adb1928deda4c1e6a19d1afa3296b57918018500cab83e1ec74941b6fe35" ], - "version": "==2.5.1" + "version": "==2.6.0" }, "psycopg2-binary": { "hashes": [ @@ -306,10 +306,10 @@ }, "python-dateutil": { "hashes": [ - "sha256:3220490fb9741e2342e1cf29a503394fdac874bc39568288717ee67047ff29df", - "sha256:9d8074be4c993fbe4947878ce593052f71dac82932a677d49194d8ce9778002e" + "sha256:1adb80e7a782c12e52ef9a8182bebeb73f1d7e24e374397af06fb4956c8dc5c0", + "sha256:e27001de32f627c22380a688bcc43ce83504a7bc5da472209b4c70f02829f0b8" ], - "version": "==2.7.2" + "version": "==2.7.3" }, "python-dotenv": { "hashes": [ diff --git a/README.md b/README.md index c6ce41d0..f147582b 100644 --- a/README.md +++ b/README.md @@ -165,7 +165,7 @@ and then uploaded to a server. #### Requirements -- Python 3.4+, pip, pipenv +- Python 3.5+, pip, pipenv - Web server ([nginx](http://nginx.org/), [Apache](http://httpd.apache.org/), etc.) - Application server ([uwsgi](http://projects.unbit.it/uwsgi), [gunicorn](http://gunicorn.org/), etc.) - Database ([sqlite](https://sqlite.org/), [Postgres](https://www.postgresql.org/), [MySQL](https://www.mysql.com/), etc.) @@ -175,10 +175,10 @@ and then uploaded to a server. #### Example deployment *This example assumes a 512MB VPS instance with Ubuntu 16.04 **x32**.* It uses -Python 3.x, nginx, uwsgi and sqlite and should be sufficient for a few users +Python 3.5+, nginx, uwsgi and sqlite and should be sufficient for a few users (e.g. two parents and 1+ child). -1. Install Python 3.x, pip, nginx and uwsgi +1. Install Python 3.5+, pip, nginx and uwsgi sudo apt-get install python3 python3-pip nginx uwsgi uwsgi-plugin-python3 git libopenjp2-7-dev @@ -537,7 +537,7 @@ multiple fields). ### Requirements -- Python 3.4+, pip, pipenv +- Python 3.5+, pip, pipenv - NodeJS 8.x and NPM 5.x - Gulp