From 7783f46172eb630a6ef151e1868367ab36d606c9 Mon Sep 17 00:00:00 2001 From: Qiao Qiao Date: Tue, 6 Feb 2024 10:37:56 -0600 Subject: [PATCH 01/16] add current branch to github action for debug --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 00d6e5ab..15e48de3 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -5,7 +5,7 @@ on: - develop - release/** - hotfix/** - - feat/dev-583-remove-set-env-in-github-actions + - feat/dev-2469-fix-github-action tags: - "*" From b09774a2b31a86bb0b6ebba870a1dcb8be8b3a37 Mon Sep 17 00:00:00 2001 From: Qiao Qiao Date: Tue, 6 Feb 2024 10:49:20 -0600 Subject: [PATCH 02/16] add debug info in bin package --- bin/package | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/package b/bin/package index 2bce6639..65a964b8 100755 --- a/bin/package +++ b/bin/package @@ -1,6 +1,6 @@ #!/usr/bin/env bash -set -e +set -euox pipefail function cleanup() { # get rid of the virtualenv From 4723dd680880c7c57f72e3643b81f733fa79d915 Mon Sep 17 00:00:00 2001 From: Qiao Qiao Date: Tue, 6 Feb 2024 11:01:06 -0600 Subject: [PATCH 03/16] fix install in pacakge --- bin/package | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/package b/bin/package index 65a964b8..38db9fd1 100755 --- a/bin/package +++ b/bin/package @@ -69,7 +69,7 @@ esac # setup.py is in previous dir cd .. -python -m pip install -r requirements.txt +python -m pip install --no-deps -r requirements.txt python setup.py install # go back go the ./gdc_client/bin dir From 68cd46058ea3870abed0f552f440d46fa3150575 Mon Sep 17 00:00:00 2001 From: Qiao Qiao Date: Tue, 6 Feb 2024 11:08:39 -0600 Subject: [PATCH 04/16] fix package install --- bin/package | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/package b/bin/package index 38db9fd1..e4f911e8 100755 --- a/bin/package +++ b/bin/package @@ -70,7 +70,7 @@ esac cd .. python -m pip install --no-deps -r requirements.txt -python setup.py install +python -m pip install --no-deps . # go back go the ./gdc_client/bin dir cd bin From 29a7d44d456ddfb7335455f50c22e6a47a59e7e1 Mon Sep 17 00:00:00 2001 From: Qiao Qiao Date: Tue, 6 Feb 2024 11:16:30 -0600 Subject: [PATCH 05/16] update setup.py --- setup.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/setup.py b/setup.py index 1454119f..4b4501cb 100644 --- a/setup.py +++ b/setup.py @@ -5,6 +5,15 @@ use_scm_version={ "local_scheme": "dirty-tag", }, + classifiers=[ + "License :: OSI Approved :: Apache Software License", + "Programming Language :: Python", + "Programming Language :: Python :: 3", + "Programming Language :: Python :: 3.5", + "Programming Language :: Python :: 3.6", + "Programming Language :: Python :: 3.7", + ], + python_requires=">=3.5", setup_requires=["setuptools_scm<6"], packages=find_packages(), package_data={}, From 86826e83e637eeb10468234a42ab7b27a075c58f Mon Sep 17 00:00:00 2001 From: Qiao Qiao Date: Tue, 6 Feb 2024 11:30:54 -0600 Subject: [PATCH 06/16] pip-compile with py36 --- requirements.txt | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/requirements.txt b/requirements.txt index 92e0db53..dd10626b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile +# This file is autogenerated by pip-compile with python 3.6 # To update, run: # # pip-compile @@ -12,36 +12,38 @@ chardet==3.0.4 # via requests cryptography==2.8 # via - # gdc_client (setup.py) + # gdc-client (setup.py) # pyopenssl idna==2.8 # via requests +importlib-metadata==4.8.3 ; python_version < "3.8" + # via gdc-client (setup.py) intervaltree==3.0.2 - # via gdc_client (setup.py) + # via gdc-client (setup.py) jsonschema==2.6.0 - # via gdc_client (setup.py) + # via gdc-client (setup.py) lxml==4.4.2 - # via gdc_client (setup.py) + # via gdc-client (setup.py) ndg-httpsclient==0.5.0 - # via gdc_client (setup.py) + # via gdc-client (setup.py) progressbar2==3.43.1 - # via gdc_client (setup.py) + # via gdc-client (setup.py) pyasn1==0.4.3 # via - # gdc_client (setup.py) + # gdc-client (setup.py) # ndg-httpsclient pycparser==2.21 # via cffi pyopenssl==18.0.0 # via - # gdc_client (setup.py) + # gdc-client (setup.py) # ndg-httpsclient python-utils==2.7.1 # via progressbar2 pyyaml==5.3.1 - # via gdc_client (setup.py) + # via gdc-client (setup.py) requests==2.22.0 - # via gdc_client (setup.py) + # via gdc-client (setup.py) six==1.16.0 # via # cryptography @@ -51,6 +53,10 @@ six==1.16.0 sortedcontainers==2.4.0 # via intervaltree termcolor==1.1.0 - # via gdc_client (setup.py) + # via gdc-client (setup.py) +typing-extensions==4.1.1 + # via importlib-metadata urllib3==1.25.11 # via requests +zipp==3.6.0 + # via importlib-metadata From 896e9431a713a8a1b1abfbc493613d5c3aa61a05 Mon Sep 17 00:00:00 2001 From: Qiao Qiao Date: Tue, 6 Feb 2024 11:33:49 -0600 Subject: [PATCH 07/16] pip-compile dev-reqs with py36 --- dev-requirements.txt | 165 +++++++++++++++++++++++++++++-------------- 1 file changed, 113 insertions(+), 52 deletions(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index 293e51ee..868c17ce 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,170 +1,219 @@ # -# This file is autogenerated by pip-compile +# This file is autogenerated by pip-compile with python 3.6 # To update, run: # -# pip-compile dev-requirements.in +# pip-compile dev-requirements.txt # atomicwrites==1.4.1 - # via pytest + # via + # -r dev-requirements.txt + # pytest attrs==22.1.0 - # via pytest + # via + # -r dev-requirements.txt + # pytest aws-sam-translator==1.11.0 # via - # -r dev-requirements.in + # -r dev-requirements.txt # cfn-lint aws-xray-sdk==2.11.0 - # via moto + # via + # -r dev-requirements.txt + # moto +boto==2.49.0 + # via + # -r dev-requirements.txt + # moto boto3==1.16.63 # via + # -r dev-requirements.txt # aws-sam-translator # moto -boto==2.49.0 - # via moto botocore==1.19.63 # via + # -r dev-requirements.txt # aws-xray-sdk # boto3 # moto # s3transfer certifi==2021.10.8 # via - # -c requirements.txt + # -r dev-requirements.txt # requests cffi==1.15.1 # via - # -c requirements.txt + # -r dev-requirements.txt # cryptography cfn-lint==0.21.6 # via - # -r dev-requirements.in + # -r dev-requirements.txt # moto chardet==3.0.4 # via - # -c requirements.txt + # -r dev-requirements.txt # requests click==7.1.2 - # via flask + # via + # -r dev-requirements.txt + # flask coverage==5.5 - # via pytest-cov + # via + # -r dev-requirements.txt + # pytest-cov cryptography==2.8 # via - # -c requirements.txt + # -r dev-requirements.txt # moto # python-jose # sshpubkeys docker==4.4.4 - # via moto + # via + # -r dev-requirements.txt + # moto ecdsa==0.14.1 # via + # -r dev-requirements.txt # moto # python-jose # sshpubkeys flask==1.0.4 - # via -r dev-requirements.in + # via -r dev-requirements.txt httmock==1.3.0 - # via -r dev-requirements.in + # via -r dev-requirements.txt idna==2.8 # via - # -c requirements.txt + # -r dev-requirements.txt # moto # requests importlib-metadata==2.1.3 # via + # -r dev-requirements.txt # pluggy # pytest itsdangerous==1.1.0 - # via flask + # via + # -r dev-requirements.txt + # flask jinja2==2.11.3 # via + # -r dev-requirements.txt # flask # moto jmespath==0.10.0 # via + # -r dev-requirements.txt # boto3 # botocore jsondiff==2.0.0 - # via moto + # via + # -r dev-requirements.txt + # moto jsonpatch==1.32 - # via cfn-lint + # via + # -r dev-requirements.txt + # cfn-lint jsonpointer==2.3 - # via jsonpatch + # via + # -r dev-requirements.txt + # jsonpatch jsonschema==2.6.0 # via - # -c requirements.txt + # -r dev-requirements.txt # aws-sam-translator # cfn-lint markupsafe==1.1.1 # via + # -r dev-requirements.txt # jinja2 # moto mock==3.0.5 - # via moto + # via + # -r dev-requirements.txt + # moto more-itertools==8.14.0 # via + # -r dev-requirements.txt # moto # pytest moto==1.3.16 - # via -r dev-requirements.in + # via -r dev-requirements.txt packaging==20.9 - # via pytest + # via + # -r dev-requirements.txt + # pytest pathlib2==2.3.7.post1 - # via pytest + # via -r dev-requirements.txt pluggy==0.13.1 - # via pytest + # via + # -r dev-requirements.txt + # pytest py==1.11.0 - # via pytest + # via + # -r dev-requirements.txt + # pytest pyasn1==0.4.3 # via - # -c requirements.txt + # -r dev-requirements.txt # python-jose # rsa pycparser==2.21 # via - # -c requirements.txt + # -r dev-requirements.txt # cffi pyparsing==2.4.7 - # via packaging -pytest-cov==2.7.1 - # via -r dev-requirements.in + # via + # -r dev-requirements.txt + # packaging pytest==4.6.2 # via - # -r dev-requirements.in + # -r dev-requirements.txt # pytest-cov +pytest-cov==2.7.1 + # via -r dev-requirements.txt python-dateutil==2.8.2 # via + # -r dev-requirements.txt # botocore # moto python-jose[cryptography]==3.2.0 # via - # -r dev-requirements.in + # -r dev-requirements.txt # moto pytz==2022.7.1 - # via moto + # via + # -r dev-requirements.txt + # moto pyyaml==5.3.1 # via - # -c requirements.txt + # -r dev-requirements.txt # cfn-lint # moto -requests-mock==1.5.2 - # via -r dev-requirements.in requests==2.22.0 # via - # -c requirements.txt + # -r dev-requirements.txt # cfn-lint # docker # httmock # moto # requests-mock # responses +requests-mock==1.5.2 + # via -r dev-requirements.txt responses==0.17.0 - # via moto + # via + # -r dev-requirements.txt + # moto rsa==4.7.2 - # via python-jose + # via + # -r dev-requirements.txt + # python-jose s3transfer==0.3.7 - # via boto3 + # via + # -r dev-requirements.txt + # boto3 six==1.16.0 # via - # -c requirements.txt + # -r dev-requirements.txt # aws-sam-translator # cfn-lint # cryptography @@ -180,27 +229,39 @@ six==1.16.0 # responses # websocket-client sshpubkeys==3.3.1 - # via moto + # via + # -r dev-requirements.txt + # moto urllib3==1.25.11 # via - # -c requirements.txt + # -r dev-requirements.txt # botocore # requests # responses wcwidth==0.2.6 - # via pytest + # via + # -r dev-requirements.txt + # pytest websocket-client==0.59.0 - # via docker + # via + # -r dev-requirements.txt + # docker werkzeug==1.0.1 # via + # -r dev-requirements.txt # flask # moto wrapt==1.14.1 - # via aws-xray-sdk + # via + # -r dev-requirements.txt + # aws-xray-sdk xmltodict==0.13.0 - # via moto + # via + # -r dev-requirements.txt + # moto zipp==1.2.0 # via + # -r dev-requirements.txt # importlib-metadata # moto From 6219ff0be72c8d5d769e42570419c2581a43de93 Mon Sep 17 00:00:00 2001 From: Qiao Qiao Date: Tue, 6 Feb 2024 11:40:42 -0600 Subject: [PATCH 08/16] pip-compile dev-reqs with py36 --- dev-requirements.txt | 166 ++++++++++++++----------------------------- 1 file changed, 54 insertions(+), 112 deletions(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index 868c17ce..3426729d 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -2,195 +2,151 @@ # This file is autogenerated by pip-compile with python 3.6 # To update, run: # -# pip-compile dev-requirements.txt +# pip-compile dev-requirements.in # atomicwrites==1.4.1 - # via - # -r dev-requirements.txt - # pytest + # via pytest attrs==22.1.0 - # via - # -r dev-requirements.txt - # pytest + # via pytest aws-sam-translator==1.11.0 # via - # -r dev-requirements.txt + # -r dev-requirements.in # cfn-lint aws-xray-sdk==2.11.0 - # via - # -r dev-requirements.txt - # moto + # via moto boto==2.49.0 - # via - # -r dev-requirements.txt - # moto + # via moto boto3==1.16.63 # via - # -r dev-requirements.txt # aws-sam-translator # moto botocore==1.19.63 # via - # -r dev-requirements.txt # aws-xray-sdk # boto3 # moto # s3transfer certifi==2021.10.8 # via - # -r dev-requirements.txt + # -c requirements.txt # requests cffi==1.15.1 # via - # -r dev-requirements.txt + # -c requirements.txt # cryptography cfn-lint==0.21.6 # via - # -r dev-requirements.txt + # -r dev-requirements.in # moto chardet==3.0.4 # via - # -r dev-requirements.txt + # -c requirements.txt # requests click==7.1.2 - # via - # -r dev-requirements.txt - # flask + # via flask coverage==5.5 - # via - # -r dev-requirements.txt - # pytest-cov + # via pytest-cov cryptography==2.8 # via - # -r dev-requirements.txt + # -c requirements.txt # moto # python-jose # sshpubkeys docker==4.4.4 - # via - # -r dev-requirements.txt - # moto + # via moto ecdsa==0.14.1 # via - # -r dev-requirements.txt # moto # python-jose # sshpubkeys flask==1.0.4 - # via -r dev-requirements.txt + # via -r dev-requirements.in httmock==1.3.0 - # via -r dev-requirements.txt + # via -r dev-requirements.in idna==2.8 # via - # -r dev-requirements.txt + # -c requirements.txt # moto # requests -importlib-metadata==2.1.3 +importlib-metadata==4.8.3 ; python_version < "3.8" # via - # -r dev-requirements.txt + # -c requirements.txt # pluggy # pytest itsdangerous==1.1.0 - # via - # -r dev-requirements.txt - # flask + # via flask jinja2==2.11.3 # via - # -r dev-requirements.txt # flask # moto jmespath==0.10.0 # via - # -r dev-requirements.txt # boto3 # botocore jsondiff==2.0.0 - # via - # -r dev-requirements.txt - # moto + # via moto jsonpatch==1.32 - # via - # -r dev-requirements.txt - # cfn-lint + # via cfn-lint jsonpointer==2.3 - # via - # -r dev-requirements.txt - # jsonpatch + # via jsonpatch jsonschema==2.6.0 # via - # -r dev-requirements.txt + # -c requirements.txt # aws-sam-translator # cfn-lint markupsafe==1.1.1 # via - # -r dev-requirements.txt # jinja2 # moto mock==3.0.5 - # via - # -r dev-requirements.txt - # moto + # via moto more-itertools==8.14.0 # via - # -r dev-requirements.txt # moto # pytest moto==1.3.16 - # via -r dev-requirements.txt + # via -r dev-requirements.in packaging==20.9 - # via - # -r dev-requirements.txt - # pytest -pathlib2==2.3.7.post1 - # via -r dev-requirements.txt + # via pytest pluggy==0.13.1 - # via - # -r dev-requirements.txt - # pytest + # via pytest py==1.11.0 - # via - # -r dev-requirements.txt - # pytest + # via pytest pyasn1==0.4.3 # via - # -r dev-requirements.txt + # -c requirements.txt # python-jose # rsa pycparser==2.21 # via - # -r dev-requirements.txt + # -c requirements.txt # cffi pyparsing==2.4.7 - # via - # -r dev-requirements.txt - # packaging + # via packaging pytest==4.6.2 # via - # -r dev-requirements.txt + # -r dev-requirements.in # pytest-cov pytest-cov==2.7.1 - # via -r dev-requirements.txt + # via -r dev-requirements.in python-dateutil==2.8.2 # via - # -r dev-requirements.txt # botocore # moto python-jose[cryptography]==3.2.0 # via - # -r dev-requirements.txt + # -r dev-requirements.in # moto pytz==2022.7.1 - # via - # -r dev-requirements.txt - # moto + # via moto pyyaml==5.3.1 # via - # -r dev-requirements.txt + # -c requirements.txt # cfn-lint # moto requests==2.22.0 # via - # -r dev-requirements.txt + # -c requirements.txt # cfn-lint # docker # httmock @@ -198,22 +154,16 @@ requests==2.22.0 # requests-mock # responses requests-mock==1.5.2 - # via -r dev-requirements.txt + # via -r dev-requirements.in responses==0.17.0 - # via - # -r dev-requirements.txt - # moto + # via moto rsa==4.7.2 - # via - # -r dev-requirements.txt - # python-jose + # via python-jose s3transfer==0.3.7 - # via - # -r dev-requirements.txt - # boto3 + # via boto3 six==1.16.0 # via - # -r dev-requirements.txt + # -c requirements.txt # aws-sam-translator # cfn-lint # cryptography @@ -221,7 +171,6 @@ six==1.16.0 # ecdsa # mock # moto - # pathlib2 # pytest # python-dateutil # python-jose @@ -229,39 +178,32 @@ six==1.16.0 # responses # websocket-client sshpubkeys==3.3.1 + # via moto +typing-extensions==4.1.1 # via - # -r dev-requirements.txt - # moto + # -c requirements.txt + # importlib-metadata urllib3==1.25.11 # via - # -r dev-requirements.txt + # -c requirements.txt # botocore # requests # responses wcwidth==0.2.6 - # via - # -r dev-requirements.txt - # pytest + # via pytest websocket-client==0.59.0 - # via - # -r dev-requirements.txt - # docker + # via docker werkzeug==1.0.1 # via - # -r dev-requirements.txt # flask # moto wrapt==1.14.1 - # via - # -r dev-requirements.txt - # aws-xray-sdk + # via aws-xray-sdk xmltodict==0.13.0 + # via moto +zipp==3.6.0 # via - # -r dev-requirements.txt - # moto -zipp==1.2.0 - # via - # -r dev-requirements.txt + # -c requirements.txt # importlib-metadata # moto From dc9fbb4202db9f8359587333b76ffc0ccf577781 Mon Sep 17 00:00:00 2001 From: Qiao Qiao Date: Tue, 6 Feb 2024 12:04:53 -0600 Subject: [PATCH 09/16] update version of pyinstaller --- bin/package | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/package b/bin/package index e4f911e8..4e19a43b 100755 --- a/bin/package +++ b/bin/package @@ -78,7 +78,7 @@ cd bin echo "Building for ${TARGET_ENVIRONMENT}..." # Make sure the correct version of pyinstaller and setuptools are installed -pip install -U "PyInstaller==3.5" +pip install -U "PyInstaller>=4.10" # Ran into ModuleNotFoundError: No module named 'pkg_resources.py2_warn' with higher versions of setuptools pip install --upgrade 'setuptools<45.0.0' @@ -96,6 +96,7 @@ pyinstaller \ --additional-hooks-dir=. \ --noconfirm \ --onefile \ + --copy-metadata gdc-client \ -c gdc-client echo "Testing produced binary..." From 8eba81384a537ff8d74c1457915b1872e48be65f Mon Sep 17 00:00:00 2001 From: Qiao Qiao Date: Tue, 6 Feb 2024 12:11:58 -0600 Subject: [PATCH 10/16] update variables --- bin/package | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/package b/bin/package index 4e19a43b..3052814d 100755 --- a/bin/package +++ b/bin/package @@ -107,7 +107,7 @@ echo "Zipping binary..." cd dist PRE_ZIP_NAME="gdc-client_${VERSION}_${TARGET_ENVIRONMENT}_x64" -if [ -n "${DATE}" ]; then +if [ -n "${DATE+x}" ]; then PRE_ZIP_NAME="gdc-client_${VERSION}_${DATE}_${TARGET_ENVIRONMENT}_x64" fi From e514dee006bdffdb5120c38888210ddcee45b819 Mon Sep 17 00:00:00 2001 From: Qiao Qiao Date: Tue, 6 Feb 2024 12:43:50 -0600 Subject: [PATCH 11/16] update travis tox --- .travis.yml | 32 ++++++++------------------------ tox.ini | 2 +- 2 files changed, 9 insertions(+), 25 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8264f73d..53eaeacf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,24 +1,8 @@ -language: generic - -sudo: false - -before_install: - - unset PYENV_ROOT - - rm -rf ~/.pyenv - - curl -L https://github.com/pyenv/pyenv-installer/raw/master/bin/pyenv-installer | bash - - export PATH="$HOME/.pyenv/bin:$PATH" - -install: - - virtualenv venv - - source venv/bin/activate - - pip install tox-travis tox-pyenv - - pyenv install 3.5.7 - - pyenv install 3.6.9 - - pyenv install 3.7.5 - -script: - - pyenv local 3.5.7 3.6.9 3.7.5 - - tox -e py35,py36,py37 - -after_script: - - tox -e coverage +language: python +python: + - "3.5" + - "3.6" + - "3.7" + +install: pip install tox-travis +script: tox diff --git a/tox.ini b/tox.ini index 24a722eb..d4ca7611 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist=py35,py36 +envlist=py35,py36,py37 [testenv] setenv= From 7b00ec20405d17cb3af9ceb832952a0eb193dba9 Mon Sep 17 00:00:00 2001 From: Qiao Qiao Date: Tue, 6 Feb 2024 12:44:22 -0600 Subject: [PATCH 12/16] update gitlab --- .gitlab-ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b38c8d84..aa4f003d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,9 +8,12 @@ include: - templates/common/python.yaml tox: + variables: + BASE_CONTAINER_VERSION: 1.2.0 parallel: matrix: - BUILD_PY_VERSION: + - python3.5 - python3.6 - python3.7 script: From ffd8310f5dcc50acdd4d8d0f14d3325bd65c2f11 Mon Sep 17 00:00:00 2001 From: Qiao Qiao Date: Tue, 6 Feb 2024 12:52:02 -0600 Subject: [PATCH 13/16] pin importlib_metadata version for py35 --- dev-requirements.txt | 6 +----- requirements.txt | 4 +--- setup.py | 2 +- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index 3426729d..f0be58c6 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -68,7 +68,7 @@ idna==2.8 # -c requirements.txt # moto # requests -importlib-metadata==4.8.3 ; python_version < "3.8" +importlib-metadata==2.1.3 ; python_version < "3.8" # via # -c requirements.txt # pluggy @@ -179,10 +179,6 @@ six==1.16.0 # websocket-client sshpubkeys==3.3.1 # via moto -typing-extensions==4.1.1 - # via - # -c requirements.txt - # importlib-metadata urllib3==1.25.11 # via # -c requirements.txt diff --git a/requirements.txt b/requirements.txt index dd10626b..6d82946d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -16,7 +16,7 @@ cryptography==2.8 # pyopenssl idna==2.8 # via requests -importlib-metadata==4.8.3 ; python_version < "3.8" +importlib-metadata==2.1.3 ; python_version < "3.8" # via gdc-client (setup.py) intervaltree==3.0.2 # via gdc-client (setup.py) @@ -54,8 +54,6 @@ sortedcontainers==2.4.0 # via intervaltree termcolor==1.1.0 # via gdc-client (setup.py) -typing-extensions==4.1.1 - # via importlib-metadata urllib3==1.25.11 # via requests zipp==3.6.0 diff --git a/setup.py b/setup.py index 4b4501cb..b4c9e10f 100644 --- a/setup.py +++ b/setup.py @@ -27,7 +27,7 @@ "pyOpenSSL~=18.0.0", "PyYAML>=5.1", "intervaltree~=3.0.2", - "importlib_metadata; python_version<'3.8'", + "importlib_metadata<=2.1.3; python_version<'3.8'", # 2.1.3 last support for py35 "termcolor~=1.1.0", "requests~=2.22.0", "progressbar2~=3.43.1", From 05139c26b5f88b600fc9177ac34cdec2d39bebb2 Mon Sep 17 00:00:00 2001 From: Qiao Qiao Date: Tue, 6 Feb 2024 12:54:48 -0600 Subject: [PATCH 14/16] fix gitlab-ci --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index aa4f003d..a77495bb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,9 +13,9 @@ tox: parallel: matrix: - BUILD_PY_VERSION: - - python3.5 - - python3.6 - - python3.7 + - python35 + - python36 + - python37 script: - tox -r -e py From 279746ae972ad0360ef216deb5aa8db4ce3cf1f7 Mon Sep 17 00:00:00 2001 From: Qiao Qiao Date: Tue, 6 Feb 2024 13:35:41 -0600 Subject: [PATCH 15/16] pin zipp for py35 --- dev-requirements.txt | 2 +- requirements.txt | 6 ++++-- setup.py | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dev-requirements.txt b/dev-requirements.txt index f0be58c6..f5149cc2 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -197,7 +197,7 @@ wrapt==1.14.1 # via aws-xray-sdk xmltodict==0.13.0 # via moto -zipp==3.6.0 +zipp==1.2.0 # via # -c requirements.txt # importlib-metadata diff --git a/requirements.txt b/requirements.txt index 6d82946d..5900016c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -56,5 +56,7 @@ termcolor==1.1.0 # via gdc-client (setup.py) urllib3==1.25.11 # via requests -zipp==3.6.0 - # via importlib-metadata +zipp==1.2.0 + # via + # gdc-client (setup.py) + # importlib-metadata diff --git a/setup.py b/setup.py index b4c9e10f..4fe111e0 100644 --- a/setup.py +++ b/setup.py @@ -31,5 +31,6 @@ "termcolor~=1.1.0", "requests~=2.22.0", "progressbar2~=3.43.1", + "zipp<2", # zipp < 2 for python3.5 ], ) From 83534b3ef6e6806661d8443b6423c3a61f9b7ec8 Mon Sep 17 00:00:00 2001 From: Qiao Qiao Date: Tue, 6 Feb 2024 14:19:33 -0600 Subject: [PATCH 16/16] fix py35 test in gitlab --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a77495bb..9d94f23f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,6 +17,8 @@ tox: - python36 - python37 script: + # for python3.5 apt install libffi-dev + - apt-get update && apt-get install libffi-dev - tox -r -e py