From ae3cdeb4d4582fff4362f3b68c454358367423d0 Mon Sep 17 00:00:00 2001 From: Shubham Kumar Jha Date: Tue, 16 Jun 2020 22:42:12 +0530 Subject: [PATCH 1/2] Fixed version of pyparsing for Python 2.7 Signed-off-by: Shubham Kumar Jha --- setup.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/setup.py b/setup.py index 58c66cae7..c6a2e233e 100755 --- a/setup.py +++ b/setup.py @@ -30,11 +30,13 @@ def test_suite(): test_suite='setup.test_suite', install_requires=[ 'ply', + 'pyparsing<=1.5.7;python_version<="2.8"', 'rdflib', 'six', 'pyyaml', 'xmltodict', ], + python_requires='>=2.7', entry_points={ 'console_scripts': [ 'spdx-tv2rdf = spdx.tv_to_rdf:main', From a30a982e001efe002b74866c8fcfce73d00dc2f1 Mon Sep 17 00:00:00 2001 From: Shubham Kumar Jha Date: Wed, 17 Jun 2020 12:52:38 +0530 Subject: [PATCH 2/2] Fixed version of pyenv for failing tests of Python 3.4.8 Signed-off-by: Shubham Kumar Jha --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9517e8dd9..7a357339f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -31,7 +31,7 @@ jobs: brew update python --version sudo -H pip install --upgrade virtualenv - brew install pyenv + brew install pyenv -v 1.2.13 echo 'eval "$(pyenv init -)"' >> ~/.bash_profile source ~/.bash_profile pyenv install 3.4.8