From 51b10b29b68b93b45a0fa941cc3a0ab1b3614e7a Mon Sep 17 00:00:00 2001 From: NyanKiyoshi Date: Mon, 17 Sep 2018 19:56:35 +0200 Subject: [PATCH] Fix python 3.4 compatibility issues --- .appveyor.yml | 2 +- .travis.yml | 2 - Makefile | 19 +-- Pipfile | 27 ---- Pipfile.lock | 362 ------------------------------------------- Piplock | 29 ---- requirements-dev.txt | 43 +---- requirements.txt | 30 +--- setup.py | 6 +- 9 files changed, 17 insertions(+), 503 deletions(-) delete mode 100644 Pipfile delete mode 100644 Pipfile.lock delete mode 100644 Piplock diff --git a/.appveyor.yml b/.appveyor.yml index 7c903fe..64425f1 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -10,8 +10,8 @@ init: - SET PATH=%PYTHON%;%PATH% install: - - python -m pip install -r requirements.txt - python -m pip install -r requirements-dev.txt + - python setup.py develop build: false diff --git a/.travis.yml b/.travis.yml index 6d59ca1..8e6e9c3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,9 +13,7 @@ python: - "pypy3" install: - pip install codecov pytest-cov uwsgi - - pip install -r requirements.txt - pip install -r requirements-dev.txt - - rm requirements.txt - nvm install 8 - npm i - npm run build-assets --production diff --git a/Makefile b/Makefile index c824013..e907f41 100644 --- a/Makefile +++ b/Makefile @@ -59,26 +59,21 @@ test-verbose: test-coverage: pipenv run py.test -v --cov $(MODULE) --cov-report term-missing -dists: requirements sdist bdist wheels +dists: sdist bdist wheels -requirements: - pipenv run pipenv_to_requirements -f - -release: requirements - -sdist: requirements +sdist: pipenv run python setup.py sdist -bdist: requirements +bdist: pipenv run python setup.py bdist -wheels: requirements +wheels: pipenv run python setup.py bdist_wheel -pypi-publish: build release +pypi-publish: build pipenv run twine upload --repository pypi dist/*.whl -pypi-test-publish: build release +pypi-test-publish: build pipenv run twine upload --repository testpypi dist/*.whl update: @@ -92,8 +87,6 @@ push: githook clean: pipenv --rm -prepare-release: requirements - # aliases to gracefully handle typos on poor dev's terminal check: checks devel: dev diff --git a/Pipfile b/Pipfile deleted file mode 100644 index 408fffe..0000000 --- a/Pipfile +++ /dev/null @@ -1,27 +0,0 @@ -[[source]] -url = "https://pypi.org/simple" -verify_ssl = true -name = "pypi" - -[packages] -flask = "*" -flask-wtf = "*" -flask-babel = "*" -keyboard = "*" -six = "*" -"flask-bootstrap-4-alpha" = "*" - -[dev-packages] -pytest = "*" -pipenv-to-requirements = "*" -coverage = "*" -blinker = "*" -flask-debugtoolbar = "*" -mock = "*" -requests = "*" - -[requires] -python_version = "3" - -[pipenv] -allow_prereleases = true diff --git a/Pipfile.lock b/Pipfile.lock deleted file mode 100644 index 782c81f..0000000 --- a/Pipfile.lock +++ /dev/null @@ -1,362 +0,0 @@ -{ - "_meta": { - "hash": { - "sha256": "61e849445da8704ec053a9f279dca3673b93fd841127db303ca4c2ae87e38870" - }, - "pipfile-spec": 6, - "requires": { - "python_version": "3" - }, - "sources": [ - { - "name": "pypi", - "url": "https://pypi.org/simple", - "verify_ssl": true - } - ] - }, - "default": { - "babel": { - "hashes": [ - "sha256:6778d85147d5d85345c14a26aada5e478ab04e39b078b0745ee6870c2b5cf669", - "sha256:8cba50f48c529ca3fa18cf81fa9403be176d374ac4d60738b839122dfaaa3d23" - ], - "version": "==2.6.0" - }, - "click": { - "hashes": [ - "sha256:29f99fc6125fbc931b758dc053b3114e55c77a6e4c6c3a2674a2dc986016381d", - "sha256:f15516df478d5a56180fbf80e68f206010e6d160fc39fa508b65e035fd75130b" - ], - "version": "==6.7" - }, - "dominate": { - "hashes": [ - "sha256:4b8ce6f33633c9dd9175b228d21c00c801b6bd0327747cd5e17fc2da934c3a69" - ], - "version": "==2.3.1" - }, - "flask": { - "hashes": [ - "sha256:2271c0070dbcb5275fad4a82e29f23ab92682dc45f9dfbc22c02ba9b9322ce48", - "sha256:a080b744b7e345ccfcbc77954861cb05b3c63786e93f2b3875e0913d44b43f05" - ], - "index": "pypi", - "version": "==1.0.2" - }, - "flask-babel": { - "hashes": [ - "sha256:462a3c599b0ccf426ca1757cc612f1db383844efd346d14170da04c8c76dd521", - "sha256:c0d75710bd4b0fe866f9f2347de6e19208712f9cec006436b4c1c15d4cb0c939" - ], - "index": "pypi", - "version": "==0.11.2" - }, - "flask-bootstrap-4-alpha": { - "hashes": [ - "sha256:33204c191b4323fd2d4ecb1232dd3573759e24572685679c3aef9d600f7031bd" - ], - "index": "pypi", - "version": "==4.0.0b3.dev2" - }, - "flask-wtf": { - "hashes": [ - "sha256:5d14d55cfd35f613d99ee7cba0fc3fbbe63ba02f544d349158c14ca15561cc36", - "sha256:d9a9e366b32dcbb98ef17228e76be15702cd2600675668bca23f63a7947fd5ac" - ], - "index": "pypi", - "version": "==0.14.2" - }, - "itsdangerous": { - "hashes": [ - "sha256:cbb3fcf8d3e33df861709ecaf89d9e6629cff0a217bc2848f1b41cd30d360519" - ], - "version": "==0.24" - }, - "jinja2": { - "hashes": [ - "sha256:74c935a1b8bb9a3947c50a54766a969d4846290e1e788ea44c1392163723c3bd", - "sha256:f84be1bb0040caca4cea721fcbbbbd61f9be9464ca236387158b0feea01914a4" - ], - "version": "==2.10" - }, - "keyboard": { - "hashes": [ - "sha256:58912e4be21529fc5b57f89af7f90b0b5f5af4db08c74a8233821700eaabf189", - "sha256:d4375e4be666a91b71e782fdffa017cbf1a6de98f8c9fe8b66e9386944380c45" - ], - "index": "pypi", - "version": "==0.13.2" - }, - "markupsafe": { - "hashes": [ - "sha256:a6be69091dac236ea9c6bc7d012beab42010fa914c459791d627dad4910eb665" - ], - "version": "==1.0" - }, - "pytz": { - "hashes": [ - "sha256:a061aa0a9e06881eb8b3b2b43f05b9439d6583c206d0a6c340ff72a7b6669053", - "sha256:ffb9ef1de172603304d9d2819af6f5ece76f2e85ec10692a524dd876e72bf277" - ], - "version": "==2018.5" - }, - "six": { - "hashes": [ - "sha256:70e8a77beed4562e7f14fe23a786b54f6296e34344c23bc42f07b15018ff98e9", - "sha256:832dc0e10feb1aa2c68dcc57dbb658f1c7e65b9b61af69048abc87a2db00a0eb" - ], - "index": "pypi", - "version": "==1.11.0" - }, - "visitor": { - "hashes": [ - "sha256:2c737903b2b6864ebc6167eef7cf3b997126f1aa94bdf590f90f1436d23e480a" - ], - "version": "==0.1.3" - }, - "werkzeug": { - "hashes": [ - "sha256:c3fd7a7d41976d9f44db327260e263132466836cef6f91512889ed60ad26557c", - "sha256:d5da73735293558eb1651ee2fddc4d0dedcfa06538b8813a2e20011583c9e49b" - ], - "version": "==0.14.1" - }, - "wtforms": { - "hashes": [ - "sha256:0cdbac3e7f6878086c334aa25dc5a33869a3954e9d1e015130d65a69309b3b61", - "sha256:e3ee092c827582c50877cdbd49e9ce6d2c5c1f6561f849b3b068c1b8029626f1" - ], - "version": "==2.2.1" - } - }, - "develop": { - "atomicwrites": { - "hashes": [ - "sha256:0312ad34fcad8fac3704d441f7b317e50af620823353ec657a53e981f92920c0", - "sha256:ec9ae8adaae229e4f8446952d204a3e4b5fdd2d099f9be3aaf556120135fb3ee" - ], - "markers": "python_version >= '2.7' and python_version != '3.3.*' and python_version != '3.1.*' and python_version != '3.0.*' and python_version != '3.2.*'", - "version": "==1.2.1" - }, - "attrs": { - "hashes": [ - "sha256:10cbf6e27dbce8c30807caf056c8eb50917e0eaafe86347671b57254006c3e69", - "sha256:ca4be454458f9dec299268d472aaa5a11f67a4ff70093396e1ceae9c76cf4bbb" - ], - "version": "==18.2.0" - }, - "blinker": { - "hashes": [ - "sha256:471aee25f3992bd325afa3772f1063dbdbbca947a041b8b89466dc00d606f8b6" - ], - "index": "pypi", - "version": "==1.4" - }, - "certifi": { - "hashes": [ - "sha256:376690d6f16d32f9d1fe8932551d80b23e9d393a8578c5633a2ed39a64861638", - "sha256:456048c7e371c089d0a77a5212fb37a2c2dce1e24146e3b7e0261736aaeaa22a" - ], - "version": "==2018.8.24" - }, - "chardet": { - "hashes": [ - "sha256:84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae", - "sha256:fc323ffcaeaed0e0a02bf4d117757b98aed530d9ed4531e3e15460124c106691" - ], - "version": "==3.0.4" - }, - "click": { - "hashes": [ - "sha256:29f99fc6125fbc931b758dc053b3114e55c77a6e4c6c3a2674a2dc986016381d", - "sha256:f15516df478d5a56180fbf80e68f206010e6d160fc39fa508b65e035fd75130b" - ], - "version": "==6.7" - }, - "coverage": { - "hashes": [ - "sha256:0dcf381f51f589f1f797449602a7fe4e63be8a7963c259c13742af3f30be902e", - "sha256:11a4bb30306def2fa012e3429de44a93ef2ae3b6ad3f6b800f6c578658a5c402", - "sha256:166c957a38b034050a14201f64eec11fc95e17bf2ba31fc07d887db82bae1a47", - "sha256:184e6680f85fcc1b371f67ab732290ecf96a225448198e14ec170986db47b0aa", - "sha256:1904deb72c561a8e445feb190db07ca4b165ee85567894b4b85fdb9bf21a27c0", - "sha256:1f2003b83426cfaadebff8b9bb1fb3650134a15fda3a81434cc8415896d7a7bc", - "sha256:1f462997b1804f8b5d1ee2b262626fc76b746e66023eb64f529af35991167c7c", - "sha256:213697f49eba45b5fb05e77f63bdb7c0d13eed12dcd08e6af43224615b28b524", - "sha256:2557da232b0daeb55afe2f7e55f7b80c56bfa2981864c6638b32b5691da9f4c3", - "sha256:395a8525f1456439a5d6c248bc1397040491047e3e0e0c4ceb2059155419cd3b", - "sha256:43d6334b35e50e74d034ec075ffd9082c559bca624924af6c7e9d2b8aef0f362", - "sha256:4566c74bde36aaaef0372fb11678edf43dcc73f4eb8dbb6987250658c4a3b95a", - "sha256:6d39cc527c9c7a30f20bed14b5cf9a7e87ef1f3528c1847d1c81caf75a31ebb6", - "sha256:8bd69d3cba21d885df6fe8728cee779a722da08cf84072558956c148b5ab61e5", - "sha256:a1d0fcbbe0735eb66c6622266b12e60ea8d37ada405cb8f73b154c5eec467187", - "sha256:ab706bfbb365f232be01a536a9199ee6bfc80c9b63fb7825fdd5f4ae5cc2a12c", - "sha256:afbf4cee68d2f2968b06951cf16c0b18513eb59bb3af0685084de6cacb04e217", - "sha256:bbc8913cd5889df7eab597a4b4074a2c6c5ee6ca9aad58a9ba0f3f847b1a99df", - "sha256:bd5428ab378a7432e43afa52b6bb9c5d48f5029f395a97dc9ebf87fc0f2a9d8b", - "sha256:c3efe0185583443e04f8519818f4772d92fbbdf5f9fa23165f2f2482b20efc37", - "sha256:d40277e918da575d008e2955a0ca6600f870bdb3570b07ee3a754ea9301862e7", - "sha256:d4b6ec6951e20ea3f5d1fefe35b4bcbf692d4306f1b932c28dd2ee4cb167152c", - "sha256:d5837e813ad62c856bc80f988c4e24e0d2b7b22a8a1dad8c1cfcb8ff4d4750a8", - "sha256:d9583ae0e152c5fb0142cb55c3a11e1b13006c00d0c3e8b35ccc2d4ebfc6645e", - "sha256:e27380cbe4088a1df514e75aa4fe6dc9e98bbd7902cf28ab16e8b2de0f8cb344", - "sha256:e624daef32f8808296312e72190c7e576852cb75c27935b31c1bbbde14ab353c", - "sha256:ef4278e5ac1e47c731ec5e3e48351721e01d2eb4fefa9b97fcdba7495a82cfad" - ], - "index": "pypi", - "version": "==5.0a2" - }, - "flask": { - "hashes": [ - "sha256:2271c0070dbcb5275fad4a82e29f23ab92682dc45f9dfbc22c02ba9b9322ce48", - "sha256:a080b744b7e345ccfcbc77954861cb05b3c63786e93f2b3875e0913d44b43f05" - ], - "index": "pypi", - "version": "==1.0.2" - }, - "flask-debugtoolbar": { - "hashes": [ - "sha256:3d9657bc0c3633ace429e3ff451742bb59d1b7a7b95c9eb23a65ac9be2812959", - "sha256:ec810083123aae0632eb32ba11e1cb4cdace81e7ce6c5009dd06c5204afbce52" - ], - "index": "pypi", - "version": "==0.10.1" - }, - "idna": { - "hashes": [ - "sha256:156a6814fb5ac1fc6850fb002e0852d56c0c8d2531923a51032d1b70760e186e", - "sha256:684a38a6f903c1d71d6d5fac066b58d7768af4de2b832e426ec79c30daa94a16" - ], - "version": "==2.7" - }, - "itsdangerous": { - "hashes": [ - "sha256:cbb3fcf8d3e33df861709ecaf89d9e6629cff0a217bc2848f1b41cd30d360519" - ], - "version": "==0.24" - }, - "jinja2": { - "hashes": [ - "sha256:74c935a1b8bb9a3947c50a54766a969d4846290e1e788ea44c1392163723c3bd", - "sha256:f84be1bb0040caca4cea721fcbbbbd61f9be9464ca236387158b0feea01914a4" - ], - "version": "==2.10" - }, - "markupsafe": { - "hashes": [ - "sha256:a6be69091dac236ea9c6bc7d012beab42010fa914c459791d627dad4910eb665" - ], - "version": "==1.0" - }, - "mock": { - "hashes": [ - "sha256:5ce3c71c5545b472da17b72268978914d0252980348636840bd34a00b5cc96c1", - "sha256:b158b6df76edd239b8208d481dc46b6afd45a846b7812ff0ce58971cf5bc8bba" - ], - "index": "pypi", - "version": "==2.0.0" - }, - "more-itertools": { - "hashes": [ - "sha256:c187a73da93e7a8acc0001572aebc7e3c69daf7bf6881a2cea10650bd4420092", - "sha256:c476b5d3a34e12d40130bc2f935028b5f636df8f372dc2c1c01dc19681b2039e", - "sha256:fcbfeaea0be121980e15bc97b3817b5202ca73d0eae185b4550cbfce2a3ebb3d" - ], - "version": "==4.3.0" - }, - "pbr": { - "hashes": [ - "sha256:1b8be50d938c9bb75d0eaf7eda111eec1bf6dc88a62a6412e33bf077457e0f45", - "sha256:b486975c0cafb6beeb50ca0e17ba047647f229087bd74e37f4a7e2cac17d2caa" - ], - "version": "==4.2.0" - }, - "pipenv": { - "hashes": [ - "sha256:6ecf60c66187c6ca25a2dcd095036aba07539354a5011d94805fbfc5932582b0", - "sha256:bb6bd074f853d9bab675942226a785a64d4fc42b5847538755e9573f5b77f63a", - "sha256:d4b1aea904ae1488b7060137059642246baae709232f4536ad723ce216e4b540" - ], - "markers": "python_version != '3.3.*' and python_version != '3.1.*' and python_version != '3.2.*' and python_version >= '2.7' and python_version != '3.0.*'", - "version": "==2018.7.1" - }, - "pipenv-to-requirements": { - "hashes": [ - "sha256:1ddb3ef76062cc6f360d29771881ebb4911d1581591ec61a6334953834622d23" - ], - "index": "pypi", - "version": "==0.5.1" - }, - "pluggy": { - "hashes": [ - "sha256:6e3836e39f4d36ae72840833db137f7b7d35105079aee6ec4a62d9f80d594dd1", - "sha256:95eb8364a4708392bae89035f45341871286a333f749c3141c20573d2b3876e1" - ], - "markers": "python_version != '3.1.*' and python_version != '3.0.*' and python_version >= '2.7' and python_version != '3.2.*' and python_version != '3.3.*'", - "version": "==0.7.1" - }, - "py": { - "hashes": [ - "sha256:06a30435d058473046be836d3fc4f27167fd84c45b99704f2fb5509ef61f9af1", - "sha256:50402e9d1c9005d759426988a492e0edaadb7f4e68bcddfea586bc7432d009c6" - ], - "markers": "python_version >= '2.7' and python_version != '3.3.*' and python_version != '3.1.*' and python_version != '3.0.*' and python_version != '3.2.*'", - "version": "==1.6.0" - }, - "pytest": { - "hashes": [ - "sha256:453cbbbe5ce6db38717d282b758b917de84802af4288910c12442984bde7b823", - "sha256:a8a07f84e680482eb51e244370aaf2caa6301ef265f37c2bdefb3dd3b663f99d" - ], - "index": "pypi", - "version": "==3.8.0" - }, - "requests": { - "hashes": [ - "sha256:63b52e3c866428a224f97cab011de738c36aec0185aa91cfacd418b5d58911d1", - "sha256:ec22d826a36ed72a7358ff3fe56cbd4ba69dd7a6718ffd450ff0e9df7a47ce6a" - ], - "index": "pypi", - "version": "==2.19.1" - }, - "six": { - "hashes": [ - "sha256:70e8a77beed4562e7f14fe23a786b54f6296e34344c23bc42f07b15018ff98e9", - "sha256:832dc0e10feb1aa2c68dcc57dbb658f1c7e65b9b61af69048abc87a2db00a0eb" - ], - "index": "pypi", - "version": "==1.11.0" - }, - "urllib3": { - "hashes": [ - "sha256:a68ac5e15e76e7e5dd2b8f94007233e01effe3e50e8daddf69acfd81cb686baf", - "sha256:b5725a0bd4ba422ab0e66e89e030c806576753ea3ee08554382c14e685d117b5" - ], - "markers": "python_version != '3.0.*' and python_version != '3.1.*' and python_version < '4' and python_version >= '2.6' and python_version != '3.3.*' and python_version != '3.2.*'", - "version": "==1.23" - }, - "virtualenv": { - "hashes": [ - "sha256:2ce32cd126117ce2c539f0134eb89de91a8413a29baac49cbab3eb50e2026669", - "sha256:ca07b4c0b54e14a91af9f34d0919790b016923d157afda5efdde55c96718f752" - ], - "markers": "python_version != '3.2.*' and python_version >= '2.7' and python_version != '3.1.*' and python_version != '3.0.*'", - "version": "==16.0.0" - }, - "virtualenv-clone": { - "hashes": [ - "sha256:4507071d81013fd03ea9930ec26bc8648b997927a11fa80e8ee81198b57e0ac7", - "sha256:b5cfe535d14dc68dfc1d1bb4ac1209ea28235b91156e2bba8e250d291c3fb4f8" - ], - "version": "==0.3.0" - }, - "werkzeug": { - "hashes": [ - "sha256:c3fd7a7d41976d9f44db327260e263132466836cef6f91512889ed60ad26557c", - "sha256:d5da73735293558eb1651ee2fddc4d0dedcfa06538b8813a2e20011583c9e49b" - ], - "version": "==0.14.1" - } - } -} diff --git a/Piplock b/Piplock deleted file mode 100644 index b31227c..0000000 --- a/Piplock +++ /dev/null @@ -1,29 +0,0 @@ -[[source]] -url = "https://pypi.org/simple" -verify_ssl = true -name = "pypi" - -[packages] -flask = "*" -flask-sqlalchemy = "*" -flask-migrate = "*" -sqlalchemy-migrate = "*" -flask-wtf = "*" -flask-babel = "*" -wtforms-alchemy = "*" -"jinja2-highlight" = "*" -"psycopg2" = "*" -sqlalchemy-utils = "*" -python-slugify = "*" -flask-login = "*" -passlib = "*" - -[dev-packages] -pytest = "*" -pipenv-to-requirements = "*" -coverage = "*" -blinker = "*" -flask-debugtoolbar = "*" - -[requires] -python_version = "3" diff --git a/requirements-dev.txt b/requirements-dev.txt index 6d4c1bd..77842d5 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,39 +1,4 @@ -################################################################################ -# This requirements file has been automatically generated from `Pipfile` with -# `pipenv-to-requirements` -# -# -# This has been done to maintain backward compatibility with tools and services -# that do not support `Pipfile` yet. -# -# Do NOT edit it directly, use `pipenv install [-d]` to modify `Pipfile` and -# `Pipfile.lock` and then regenerate `requirements*.txt`. -################################################################################ - -atomicwrites==1.2.1 -attrs==18.2.0 -blinker==1.4 -certifi==2018.8.24 -chardet==3.0.4 -click==6.7 -coverage==5.0a2 -flask-debugtoolbar==0.10.1 -flask==1.0.2 -idna==2.7 -itsdangerous==0.24 -jinja2==2.10 -markupsafe==1.0 -mock==2.0.0 -more-itertools==4.3.0 -pbr==4.2.0 -pipenv-to-requirements==0.5.1 -pipenv==2018.7.1 -pluggy==0.7.1 -py==1.6.0 -pytest==3.8.0 -requests==2.19.1 -six==1.11.0 -urllib3==1.23 -virtualenv-clone==0.3.0 -virtualenv==16.0.0 -werkzeug==0.14.1 +pytest +coverage +blinker +flask-debugtoolbar diff --git a/requirements.txt b/requirements.txt index 08007a7..2cc788b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,28 +1,6 @@ -################################################################################ -# This requirements file has been automatically generated from `Pipfile` with -# `pipenv-to-requirements` -# -# -# This has been done to maintain backward compatibility with tools and services -# that do not support `Pipfile` yet. -# -# Do NOT edit it directly, use `pipenv install [-d]` to modify `Pipfile` and -# `Pipfile.lock` and then regenerate `requirements*.txt`. -################################################################################ - -babel==2.6.0 -click==6.7 -dominate==2.3.1 +flask==1.0.2 +flask-wtf==0.14.2 flask-babel==0.11.2 +keyboard>=0.13,<0.14 +six>=1.8.0 flask-bootstrap-4-alpha==4.0.0b3.dev2 -flask-wtf==0.14.2 -flask==1.0.2 -itsdangerous==0.24 -jinja2==2.10 -keyboard==0.13.2 -markupsafe==1.0 -pytz==2018.5 -six>=1.10.0 -visitor==0.1.3 -werkzeug==0.14.1 -wtforms==2.2.1 diff --git a/setup.py b/setup.py index d95782c..bb82870 100755 --- a/setup.py +++ b/setup.py @@ -10,10 +10,8 @@ long_description = '' -requirements = [] -if isfile('requirements.txt'): - with open('requirements.txt') as fp: - requirements = fp.readlines() +with open('requirements.txt') as fp: + requirements = fp.readlines() setup(