From 2dd72a0f77a856070c0874a7c21f0804cc110e87 Mon Sep 17 00:00:00 2001 From: sethg Date: Wed, 23 Dec 2020 12:00:58 +0100 Subject: [PATCH 1/5] Add py2 specific install requirements --- requirements-dev.txt | 4 ---- setup.py | 8 +++++++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index fdbc449..b522074 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,8 +1,6 @@ colorama docutils flake8 -click -lark-parser==0.11.1 # git+git://github.com/erezsh/lark.git#egg=lark pluggy py @@ -12,8 +10,6 @@ pytest pytest-cov tox virtualenv -jsonschema -jsonref==0.2 glob2 coveralls sphinx \ No newline at end of file diff --git a/setup.py b/setup.py index 7c14255..61bbe8a 100644 --- a/setup.py +++ b/setup.py @@ -38,7 +38,13 @@ def readme(): author_email='sethg@geographika.co.uk', license='MIT', packages=['mappyfile'], - install_requires=['lark-parser==0.11.1', 'jsonschema >=2.0', 'jsonref==0.2', 'click'], + install_requires=[ + 'lark-parser==0.11.1', + 'jsonschema >=2.0', + 'jsonref==0.2', + 'click; python_version>="3.0.0"' + 'click < 8.0.0; python_version=="2.7"' + ], zip_safe=False, entry_points = { 'console_scripts': ['mappyfile=mappyfile.cli:main'], From e99e90c59fd2f09f83ec9c442b84d87645f12d47 Mon Sep 17 00:00:00 2001 From: sethg Date: Wed, 23 Dec 2020 12:09:36 +0100 Subject: [PATCH 2/5] Add missing comma --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 61bbe8a..7e9a8cb 100644 --- a/setup.py +++ b/setup.py @@ -42,7 +42,7 @@ def readme(): 'lark-parser==0.11.1', 'jsonschema >=2.0', 'jsonref==0.2', - 'click; python_version>="3.0.0"' + 'click; python_version>="3.0.0"', 'click < 8.0.0; python_version=="2.7"' ], zip_safe=False, From df5268618315e7ce5e1048310ed7524796a033b3 Mon Sep 17 00:00:00 2001 From: sethg Date: Wed, 23 Dec 2020 12:10:55 +0100 Subject: [PATCH 3/5] Allow less restrictive lark versioning --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 7e9a8cb..4162b32 100644 --- a/setup.py +++ b/setup.py @@ -39,8 +39,8 @@ def readme(): license='MIT', packages=['mappyfile'], install_requires=[ - 'lark-parser==0.11.1', - 'jsonschema >=2.0', + 'lark-parser>=0.9.0', + 'jsonschema>=2.0', 'jsonref==0.2', 'click; python_version>="3.0.0"', 'click < 8.0.0; python_version=="2.7"' From ea1fb3c8f55858386930bedda914f68273a6f82e Mon Sep 17 00:00:00 2001 From: sethg Date: Wed, 23 Dec 2020 12:39:58 +0100 Subject: [PATCH 4/5] Fix pyrsistent py27 version --- setup.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/setup.py b/setup.py index 4162b32..fc17491 100644 --- a/setup.py +++ b/setup.py @@ -40,6 +40,9 @@ def readme(): packages=['mappyfile'], install_requires=[ 'lark-parser>=0.9.0', + # pyrsistent is a dependency of jsonschema but py2 is not + # supported beyond 0.16.0 + 'pyrsistent<=0.16.0; python_version=="2.7"', 'jsonschema>=2.0', 'jsonref==0.2', 'click; python_version>="3.0.0"', From 000b9dd89a5c2a1ed030c957d812f36bf56996bb Mon Sep 17 00:00:00 2001 From: sethg Date: Wed, 23 Dec 2020 14:24:44 +0100 Subject: [PATCH 5/5] Allow patch pyresistant versions --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index fc17491..d65a036 100644 --- a/setup.py +++ b/setup.py @@ -42,7 +42,7 @@ def readme(): 'lark-parser>=0.9.0', # pyrsistent is a dependency of jsonschema but py2 is not # supported beyond 0.16.0 - 'pyrsistent<=0.16.0; python_version=="2.7"', + 'pyrsistent<0.17.0; python_version=="2.7"', 'jsonschema>=2.0', 'jsonref==0.2', 'click; python_version>="3.0.0"',