diff --git a/dev-requirements.txt b/dev-requirements.txt index c9fde17c..fabbd2f1 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -7,42 +7,56 @@ appdirs==1.4.4 # via virtualenv aspy.yaml==1.3.0 # via pre-commit atomicwrites==1.4.0 # via pytest -attrs==19.3.0 # via pytest +attrs==19.3.0 # via -c requirements.txt, jsonschema, pytest certifi==2020.6.20 # via -c requirements.txt, requests cfgv==2.0.1 # via -r dev-requirements.in, pre-commit chardet==3.0.4 # via -c requirements.txt, requests click==7.1.2 # via -c requirements.txt, flask +configparser==4.0.2 # via -c requirements.txt, detect-secrets, importlib-metadata +contextlib2==0.6.0.post1 # via -c requirements.txt, importlib-metadata, importlib-resources, zipp coverage==5.2 # via pytest-cov detect-secrets==0.13.0 # via -r dev-requirements.in distlib==0.3.1 # via virtualenv +# manual edit to install only with py2 +enum34==1.1.10;python_version=="2.7" # via detect-secrets filelock==3.0.12 # via virtualenv flask==1.1.2 # via -c requirements.txt, pytest-flask +funcsigs==1.0.2 # via pytest +# manual edit to install only with py2 +functools32==3.2.3.post2;python_version=="2.7" # via -c requirements.txt, detect-secrets, jsonschema +future==0.18.2 # via -c requirements.txt, detect-secrets +# manual edit to install only with py2 +futures==3.3.0;python_version=="2.7" # via pre-commit identify==1.4.24 # via pre-commit idna==2.10 # via -c requirements.txt, requests -importlib-metadata==1.7.0 # via pluggy, pre-commit, virtualenv +importlib-metadata==1.7.0 # via -c requirements.txt, jsonschema, pluggy, pre-commit, virtualenv importlib-resources==3.0.0 # via pre-commit, virtualenv itsdangerous==1.1.0 # via -c requirements.txt, flask jinja2==2.11.2 # via -c requirements.txt, flask -jsonschema==2.6.0 # via -c requirements.txt, swagger-spec-validator +jsonschema==3.2.0 # via -c requirements.txt, swagger-spec-validator markupsafe==1.1.1 # via -c requirements.txt, jinja2 more-itertools==5.0.0 # via -r dev-requirements.in, pytest nodeenv==1.4.0 # via pre-commit -pathlib2==2.3.5 # via pytest +pathlib2==2.3.5 # via -c requirements.txt, importlib-metadata, importlib-resources, pytest, virtualenv pluggy==0.13.1 # via pytest pre-commit==1.21.0 # via -r dev-requirements.in py==1.9.0 # via pytest +pyrsistent==0.16.0 # via -c requirements.txt, jsonschema pytest-cov==2.9.0 # via -r dev-requirements.in pytest-flask==0.15.1 # via -r dev-requirements.in pytest==3.10.1 # via -r dev-requirements.in, pytest-cov, pytest-flask pyyaml==5.3.1 # via -r dev-requirements.in, aspy.yaml, detect-secrets, pre-commit, swagger-spec-validator requests==2.24.0 # via -c requirements.txt, detect-secrets -six==1.15.0 # via -c requirements.txt, cfgv, more-itertools, pathlib2, pre-commit, pytest, swagger-spec-validator, virtualenv +scandir==1.10.0 # via -c requirements.txt, pathlib2 +singledispatch==3.4.0.3 # via importlib-resources +six==1.15.0 # via -c requirements.txt, cfgv, jsonschema, more-itertools, pathlib2, pre-commit, pyrsistent, pytest, singledispatch, swagger-spec-validator, virtualenv swagger-spec-validator==2.7.3 # via -r dev-requirements.in toml==0.10.1 # via pre-commit +typing==3.7.4.3 # via importlib-resources urllib3==1.25.9 # via -c requirements.txt, requests virtualenv==20.0.27 # via pre-commit werkzeug==0.16.1 # via -c requirements.txt, flask, pytest-flask -zipp==1.2.0 # via importlib-metadata, importlib-resources +zipp==1.2.0 # via -c requirements.txt, importlib-metadata, importlib-resources # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements.txt b/requirements.txt index df5becc2..0725ea2c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,26 +2,39 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile +# pip-compile setup.py # +attrs==19.3.0 # via jsonschema git+https://github.com/uc-cdis/cdislogging.git@0.0.2#egg=cdislogging # via indexd (setup.py) certifi==2020.6.20 # via requests chardet==3.0.4 # via requests click==7.1.2 # via flask +configparser==4.0.2 # via importlib-metadata +contextlib2==0.6.0.post1 # via importlib-metadata, zipp git+https://github.com/uc-cdis/doiclient.git@1.0.0#egg=doiclient # via indexd (setup.py) git+https://github.com/uc-cdis/dosclient.git@1.0.0#egg=dosclient # via indexd (setup.py) flask==1.1.2 # via indexd (setup.py) +# manual edit to install only with py2 +functools32==3.2.3.post2;python_version=="2.7" # via jsonschema future==0.18.2 # via indexd (setup.py) idna==2.10 # via requests +importlib-metadata==1.7.0 # via jsonschema git+https://github.com/NCI-GDC/indexclient.git@2.0.0#egg=indexclient # via indexd (setup.py) itsdangerous==1.1.0 # via flask jinja2==2.11.2 # via flask -jsonschema==2.6.0 # via indexd (setup.py) +jsonschema==3.2.0 # via indexd (setup.py) markupsafe==1.1.1 # via jinja2 +pathlib2==2.3.5 # via importlib-metadata psycopg2==2.8.5 # via indexd (setup.py) +pyrsistent==0.16.0 # via jsonschema requests==2.24.0 # via doiclient, dosclient, indexclient -six==1.15.0 # via sqlalchemy-utils +scandir==1.10.0 # via pathlib2 +six==1.15.0 # via jsonschema, pathlib2, pyrsistent, sqlalchemy-utils sqlalchemy-utils==0.36.3 # via indexd (setup.py) sqlalchemy==1.3.18 # via indexd (setup.py), sqlalchemy-utils urllib3==1.25.9 # via requests werkzeug==0.16.1 # via flask, indexd (setup.py) +zipp==1.2.0 # via importlib-metadata + +# The following packages are considered to be unsafe in a requirements file: +# setuptools diff --git a/setup.py b/setup.py index b3e9158a..4afd31a6 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ setup( name='indexd', - version='2.4.0', + version='2.5.0', packages=find_packages(), package_data={ 'index': [ @@ -12,7 +12,7 @@ scripts=["bin/index_admin.py", "bin/indexd", "bin/migrate_index.py"], install_requires=[ 'flask~=1.1', - 'jsonschema~=2.5', + 'jsonschema>3,<4', 'sqlalchemy~=1.3', # Support Python 2 until everything that uses indexd in its tests has been updated. 'sqlalchemy-utils>=0.32,<0.36.4', diff --git a/tests/test_client.py b/tests/test_client.py index 46106a46..b9bc30aa 100644 --- a/tests/test_client.py +++ b/tests/test_client.py @@ -883,7 +883,7 @@ def test_bad_hashes(client, user, typ, h): json_resp = resp.json assert 'error' in json_resp if typ not in ACCEPTABLE_HASHES: - assert 'is not valid' in json_resp['error'] + assert 'Failed validating' in json_resp['error'] else: assert 'does not match' in json_resp['error']