From b62fd75833ef54fdc5b847fdd0644abb2699651c Mon Sep 17 00:00:00 2001 From: Qiao Qiao <68757394+qiaouchicago@users.noreply.github.com> Date: Tue, 14 Feb 2023 13:55:22 -0600 Subject: [PATCH] Feat/dev 290 standardize deps (#282) * standadize dependencies * update dependencies, update version * add back flask for dev-requirements --- .gitignore | 2 + dev-requirements.in | 13 +++ dev-requirements.txt | 214 ++++++++++++++++++++++++++++++++++++++++-- gdc_client/version.py | 4 +- requirements.txt | 55 ++++++++++- setup.py | 18 +++- 6 files changed, 290 insertions(+), 16 deletions(-) create mode 100644 dev-requirements.in diff --git a/.gitignore b/.gitignore index be093817..52dae555 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ __pycache__/ # Distribution / packaging .Python env/ +venv venv/ .venv/ build/ @@ -23,6 +24,7 @@ var/ *.egg-info/ .installed.cfg *.egg +.eggs # PyInstaller # Usually these files are written by a python script from a template diff --git a/dev-requirements.in b/dev-requirements.in new file mode 100644 index 00000000..aa683b3e --- /dev/null +++ b/dev-requirements.in @@ -0,0 +1,13 @@ +-c requirements.txt + +flask~=1.0.2 +pytest~=4.6.2 +pytest-cov~=2.7.1 +requests-mock~=1.5.2 +moto~=1.3.14 +python-jose<3.3.0 # lower the requirements for cryptography, so python3.5 could work +httmock~=1.3.0 + + # required by moto, limit version for jsonschema +cfn-lint<0.22.0 +aws-sam-translator<1.12.0 diff --git a/dev-requirements.txt b/dev-requirements.txt index fd2c5e9f..293e51ee 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,10 +1,208 @@ -flask==1.0.2 -pytest==4.6.2 +# +# This file is autogenerated by pip-compile +# To update, run: +# +# pip-compile dev-requirements.in +# +atomicwrites==1.4.1 + # via pytest +attrs==22.1.0 + # via pytest +aws-sam-translator==1.11.0 + # via + # -r dev-requirements.in + # cfn-lint +aws-xray-sdk==2.11.0 + # via moto +boto3==1.16.63 + # via + # aws-sam-translator + # moto +boto==2.49.0 + # via moto +botocore==1.19.63 + # via + # aws-xray-sdk + # boto3 + # moto + # s3transfer +certifi==2021.10.8 + # via + # -c requirements.txt + # requests +cffi==1.15.1 + # via + # -c requirements.txt + # cryptography +cfn-lint==0.21.6 + # via + # -r dev-requirements.in + # moto +chardet==3.0.4 + # via + # -c requirements.txt + # requests +click==7.1.2 + # via flask +coverage==5.5 + # via pytest-cov +cryptography==2.8 + # via + # -c requirements.txt + # moto + # python-jose + # sshpubkeys +docker==4.4.4 + # via moto +ecdsa==0.14.1 + # via + # moto + # python-jose + # sshpubkeys +flask==1.0.4 + # via -r dev-requirements.in +httmock==1.3.0 + # via -r dev-requirements.in +idna==2.8 + # via + # -c requirements.txt + # moto + # requests +importlib-metadata==2.1.3 + # via + # pluggy + # pytest +itsdangerous==1.1.0 + # via flask +jinja2==2.11.3 + # via + # flask + # moto +jmespath==0.10.0 + # via + # boto3 + # botocore +jsondiff==2.0.0 + # via moto +jsonpatch==1.32 + # via cfn-lint +jsonpointer==2.3 + # via jsonpatch +jsonschema==2.6.0 + # via + # -c requirements.txt + # aws-sam-translator + # cfn-lint +markupsafe==1.1.1 + # via + # jinja2 + # moto +mock==3.0.5 + # via moto +more-itertools==8.14.0 + # via + # moto + # pytest +moto==1.3.16 + # via -r dev-requirements.in +packaging==20.9 + # via pytest +pathlib2==2.3.7.post1 + # via pytest +pluggy==0.13.1 + # via pytest +py==1.11.0 + # via pytest +pyasn1==0.4.3 + # via + # -c requirements.txt + # python-jose + # rsa +pycparser==2.21 + # via + # -c requirements.txt + # cffi +pyparsing==2.4.7 + # via packaging pytest-cov==2.7.1 -codacy-coverage==1.3.11 + # via -r dev-requirements.in +pytest==4.6.2 + # via + # -r dev-requirements.in + # pytest-cov +python-dateutil==2.8.2 + # via + # botocore + # moto +python-jose[cryptography]==3.2.0 + # via + # -r dev-requirements.in + # moto +pytz==2022.7.1 + # via moto +pyyaml==5.3.1 + # via + # -c requirements.txt + # cfn-lint + # moto requests-mock==1.5.2 -tox==3.13.2 -pre-commit==1.21.0 -cfgv==2.0.1 -moto~=1.3.14 -httmock~=1.3.0 + # via -r dev-requirements.in +requests==2.22.0 + # via + # -c requirements.txt + # cfn-lint + # docker + # httmock + # moto + # requests-mock + # responses +responses==0.17.0 + # via moto +rsa==4.7.2 + # via python-jose +s3transfer==0.3.7 + # via boto3 +six==1.16.0 + # via + # -c requirements.txt + # aws-sam-translator + # cfn-lint + # cryptography + # docker + # ecdsa + # mock + # moto + # pathlib2 + # pytest + # python-dateutil + # python-jose + # requests-mock + # responses + # websocket-client +sshpubkeys==3.3.1 + # via moto +urllib3==1.25.11 + # via + # -c requirements.txt + # botocore + # requests + # responses +wcwidth==0.2.6 + # via pytest +websocket-client==0.59.0 + # via docker +werkzeug==1.0.1 + # via + # flask + # moto +wrapt==1.14.1 + # via aws-xray-sdk +xmltodict==0.13.0 + # via moto +zipp==1.2.0 + # via + # importlib-metadata + # moto + +# The following packages are considered to be unsafe in a requirements file: +# setuptools diff --git a/gdc_client/version.py b/gdc_client/version.py index b0146867..894cfbac 100644 --- a/gdc_client/version.py +++ b/gdc_client/version.py @@ -1 +1,3 @@ -__version__ = "v1.6.1" +from importlib_metadata import version + +__version__ = version("gdc_client") diff --git a/requirements.txt b/requirements.txt index a3d225ba..92e0db53 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,11 +1,56 @@ +# +# This file is autogenerated by pip-compile +# To update, run: +# +# pip-compile +# +certifi==2021.10.8 + # via requests +cffi==1.15.1 + # via cryptography +chardet==3.0.4 + # via requests cryptography==2.8 + # via + # gdc_client (setup.py) + # pyopenssl +idna==2.8 + # via requests +intervaltree==3.0.2 + # via gdc_client (setup.py) jsonschema==2.6.0 + # via gdc_client (setup.py) lxml==4.4.2 + # via gdc_client (setup.py) ndg-httpsclient==0.5.0 + # via gdc_client (setup.py) +progressbar2==3.43.1 + # via gdc_client (setup.py) pyasn1==0.4.3 -pyOpenSSL==18.0.0 -PyYAML==3.13 -intervaltree==3.0.2 -termcolor==1.1.0 + # via + # gdc_client (setup.py) + # ndg-httpsclient +pycparser==2.21 + # via cffi +pyopenssl==18.0.0 + # via + # gdc_client (setup.py) + # ndg-httpsclient +python-utils==2.7.1 + # via progressbar2 +pyyaml==5.3.1 + # via gdc_client (setup.py) requests==2.22.0 -progressbar2==3.43.1 + # via gdc_client (setup.py) +six==1.16.0 + # via + # cryptography + # progressbar2 + # pyopenssl + # python-utils +sortedcontainers==2.4.0 + # via intervaltree +termcolor==1.1.0 + # via gdc_client (setup.py) +urllib3==1.25.11 + # via requests diff --git a/setup.py b/setup.py index c41491a5..f66014af 100644 --- a/setup.py +++ b/setup.py @@ -1,10 +1,24 @@ from setuptools import setup, find_packages -from gdc_client.version import __version__ setup( name="gdc_client", - version=__version__, + use_scm_version={"local_scheme": "dirty-tag",}, + setup_requires=["setuptools_scm<6"], packages=find_packages(), package_data={}, scripts=["bin/gdc-client"], + install_requires=[ + "cryptography~=2.8", + "jsonschema~=2.6.0", + "lxml~=4.4.2", + "ndg-httpsclient~=0.5.0", + "pyasn1~=0.4.3", + "pyOpenSSL~=18.0.0", + "PyYAML>=5.1", + "intervaltree~=3.0.2", + "importlib_metadata; python_version<'3.8'", + "termcolor~=1.1.0", + "requests~=2.22.0", + "progressbar2~=3.43.1", + ], )