diff --git a/.github/workflows/dependencies.yaml b/.github/workflows/dependencies.yaml index 8cd1dd04051..fbb6acbb966 100644 --- a/.github/workflows/dependencies.yaml +++ b/.github/workflows/dependencies.yaml @@ -27,6 +27,7 @@ jobs: - name: Create pull request uses: peter-evans/create-pull-request@v3 with: + author: galaxybot token: ${{ secrets.GALAXYBOT_PAT }} commit-message: Update Python dependencies branch: dev_auto_update_dependencies diff --git a/lib/galaxy/dependencies/dev-requirements.txt b/lib/galaxy/dependencies/dev-requirements.txt index 769efd4aa9a..79650ee0fb7 100644 --- a/lib/galaxy/dependencies/dev-requirements.txt +++ b/lib/galaxy/dependencies/dev-requirements.txt @@ -3,15 +3,15 @@ adal==1.2.7 aiofiles==0.8.0; python_version >= "3.6" and python_version < "4.0" alabaster==0.7.12; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" and python_version >= "3.6" -amqp==5.0.6; python_version >= "3.7" -anyio==3.4.0; python_full_version >= "3.6.2" and python_version >= "3.6" +amqp==5.0.9; python_version >= "3.7" +anyio==3.4.0; python_version >= "3.7" and python_full_version >= "3.6.2" appdirs==1.4.4 argcomplete==1.12.3; python_version >= "3.6" and python_version < "4" asgiref==3.4.1; python_version >= "3.6" async-generator==1.10; python_version >= "3.7" and python_version < "4.0" atomicwrites==1.4.0; python_version >= "3.7" and python_full_version < "3.0.0" and sys_platform == "win32" or sys_platform == "win32" and python_version >= "3.7" and python_full_version >= "3.4.0" attmap==0.13.2 -attrs==21.2.0; python_version >= "3.7" and python_full_version < "3.0.0" and python_version < "4.0" or python_full_version >= "3.5.0" and python_version >= "3.7" and python_version < "4.0" +attrs==21.4.0; python_version >= "3.7" and python_full_version < "3.0.0" and python_version < "4.0" or python_full_version >= "3.5.0" and python_version >= "3.7" and python_version < "4.0" babel==2.9.1; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.4.0") bagit-profile==1.3.1; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version < "4" bagit==1.8.1; python_version >= "3.6" and python_full_version < "3.0.0" and python_version < "4" or python_full_version >= "3.5.0" and python_version < "4" and python_version >= "3.6" @@ -24,10 +24,10 @@ black==21.12b0; python_full_version >= "3.6.2" and python_version >= "3.6" bleach==4.1.0; python_version >= "3.6" boltons==21.0.0 boto==2.49.0 -bx-python==0.8.12; python_version >= "3.6" +bx-python==0.8.13; python_version >= "3.7" cachecontrol==0.12.10; python_version >= "3.6" and python_version < "4" cached-property==1.5.2; python_version < "3.8" and python_version >= "3.7" -celery==5.2.1; python_version >= "3.7" +celery==5.2.3; python_version >= "3.7" certifi==2021.10.8; python_version >= "3.7" and python_full_version < "3.0.0" and python_version < "4" or python_full_version >= "3.6.0" and python_version < "4" and python_version >= "3.7" cffi==1.15.0 charset-normalizer==2.0.9; python_full_version >= "3.6.0" and python_version >= "3.6" and python_version < "4" @@ -43,7 +43,7 @@ colorama==0.4.4; sys_platform == "win32" and python_version >= "3.7" and python_ coloredlogs==15.0.1; python_version >= "3.6" and python_full_version < "3.0.0" and python_version < "4" or python_version >= "3.6" and python_version < "4" and python_full_version >= "3.5.0" commonmark==0.9.1; python_full_version >= "3.6.2" and python_full_version < "4.0.0" coverage==6.2; python_version >= "3.6" -cryptography==36.0.0; python_version >= "3.7" and python_full_version < "3.0.0" and python_version < "4" or python_full_version >= "3.6.0" and python_version < "4" and python_version >= "3.7" +cryptography==36.0.1; python_version >= "3.7" and python_full_version < "3.0.0" and python_version < "4" or python_full_version >= "3.6.0" and python_version < "4" and python_version >= "3.7" cwltest==2.2.20210901154959; python_version >= "3.6" and python_version < "4" cwltool==3.1.20211107152837; python_version >= "3.6" and python_version < "4" darker==1.3.2; python_version >= "3.6" @@ -72,20 +72,20 @@ h5py==3.6.0; python_version >= "3.7" httpcore==0.14.3; python_version >= "3.6" httpx==0.21.1; python_version >= "3.6" humanfriendly==10.0; python_version >= "3.6" and python_full_version < "3.0.0" and python_version < "4" or python_version >= "3.6" and python_version < "4" and python_full_version >= "3.5.0" -idna==3.3; python_version >= "3.7" and python_version < "4.0" and python_full_version >= "3.6.2" +idna==3.3 imagesize==1.3.0; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" and python_version >= "3.6" -importlib-metadata==4.8.2; python_version == "3.7" and (python_version >= "3.6" and python_full_version < "3.0.0" and python_version < "3.8" or python_full_version >= "3.6.0" and python_version < "3.8" and python_version >= "3.6") +importlib-metadata==4.10.0; python_version == "3.7" and (python_version >= "3.7" and python_full_version < "3.0.0" and python_version < "3.8" or python_full_version >= "3.6.0" and python_version < "3.8" and python_version >= "3.7") importlib-resources==5.4.0; python_version < "3.9" and python_version >= "3.7" iniconfig==1.1.1; python_version >= "3.7" isa-rwval==0.10.10 -isodate==0.6.0; python_version >= "3.7" and python_version < "4" +isodate==0.6.1; python_version >= "3.7" and python_version < "4" jinja2==3.0.3; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" and python_version >= "3.6" -jsonschema==4.2.1; python_version >= "3.7" +jsonschema==4.3.2; python_version >= "3.7" junit-xml==1.9; python_version >= "3.6" and python_version < "4" -kombu==5.2.2; python_version >= "3.7" +kombu==5.2.3; python_version >= "3.7" lagom==1.7.0; python_version >= "3.6" and python_version < "4.0" lockfile==0.12.2; python_version >= "3.6" and python_version < "4" -lxml==4.6.4; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.5.0") +lxml==4.7.1; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.5.0") mako==1.1.6; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.4.0") markdown-it-reporter==0.0.2 markdown==3.3.6; python_version >= "3.6" @@ -111,24 +111,24 @@ paste==3.5.0 pastedeploy==2.1.1 pathspec==0.9.0; python_full_version >= "3.6.2" and python_version >= "3.6" pbr==5.8.0; python_version >= "2.6" -platformdirs==2.4.0; python_full_version >= "3.6.2" and python_version >= "3.6" +platformdirs==2.4.1; python_full_version >= "3.6.2" and python_version >= "3.7" pluggy==1.0.0; python_version >= "3.7" port-for==0.6.1; python_version >= "3.7" -prettytable==2.4.0; python_version >= "3.6" +prettytable==2.5.0; python_version >= "3.6" prompt-toolkit==3.0.24; python_full_version >= "3.6.2" and python_version >= "3.7" prov==1.5.1; python_version >= "3.6" and python_version < "4" -psutil==5.8.0; (python_version >= "2.6" and python_full_version < "3.0.0") or (python_full_version >= "3.4.0") +psutil==5.9.0; (python_version >= "2.6" and python_full_version < "3.0.0") or (python_full_version >= "3.4.0") pulsar-galaxy-lib==0.14.13 py==1.11.0; python_version >= "3.7" and python_full_version < "3.0.0" and implementation_name == "pypy" or python_full_version >= "3.5.0" and python_version >= "3.7" and implementation_name == "pypy" pyasn1==0.4.8; python_version >= "3.6" and python_version < "4" pycparser==2.21 pycryptodome==3.12.0; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.5.0") -pydantic==1.8.2; python_version >= "3.6" and python_version < "4.0" and python_full_version >= "3.6.1" +pydantic==1.9.0; python_version >= "3.6" and python_version < "4.0" and python_full_version >= "3.6.1" pydot==1.4.2; python_version >= "3.6" and python_full_version < "3.0.0" and python_version < "4" or python_version >= "3.6" and python_version < "4" and python_full_version >= "3.4.0" pyeventsystem==0.1.0 pyfaidx==0.6.3.1 pygithub==1.55; python_version >= "3.6" -pygments==2.10.0; python_full_version >= "3.6.2" and python_full_version < "4.0.0" and python_version >= "3.6" and (python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" and python_version >= "3.6") +pygments==2.11.1; python_full_version >= "3.6.2" and python_full_version < "4.0.0" and python_version >= "3.6" and (python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" and python_version >= "3.6") pyjwt==2.3.0; python_version >= "3.6" pykwalify==1.8.0 pynacl==1.4.0; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" and python_version >= "3.6" @@ -145,7 +145,7 @@ pytest-html==3.1.1; python_version >= "3.6" pytest-json-report==1.4.1 pytest-metadata==1.11.0; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.6.0" and python_version >= "3.6" pytest-mock==3.6.1; python_version >= "3.6" -pytest-postgresql==4.0.0; python_version >= "3.7" +pytest-postgresql==4.1.0; python_version >= "3.7" pytest-pythonpath==0.7.3 pytest-shard==0.1.2; python_version >= "3.6" pytest==6.2.5; python_version >= "3.6" @@ -167,23 +167,23 @@ requests-toolbelt==0.9.1; python_version >= "3.6" requests==2.26.0; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.6.0") responses==0.16.0; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.5.0") rfc3986==1.5.0; python_version >= "3.6" -rich==10.15.2; python_full_version >= "3.6.2" and python_full_version < "4.0.0" +rich==10.16.1; python_full_version >= "3.6.2" and python_full_version < "4.0.0" routes==2.5.1 rsa==4.8; python_version >= "3.6" and python_version < "4" ruamel.yaml.clib==0.2.6; platform_python_implementation == "CPython" and python_version < "3.10" and python_version >= "3.6" ruamel.yaml==0.17.17; python_version >= "3.6" and python_version < "4" -schema-salad==8.2.20211116214159; python_version >= "3.6" and python_version < "4" +schema-salad==8.2.20211222191353; python_version >= "3.6" and python_version < "4" selenium==4.1.0; python_version >= "3.7" and python_version < "4.0" setuptools-scm==5.0.2; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version < "4" shellescape==3.8.1; python_version >= "3.6" and python_version < "4" six==1.16.0; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.3.0") -sniffio==1.2.0; python_version >= "3.7" and python_version < "4.0" and python_full_version >= "3.6.2" +sniffio==1.2.0; python_version >= "3.7" and python_full_version >= "3.6.2" and python_version < "4.0" snowballstemmer==2.2.0; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" and python_version >= "3.6" social-auth-core==4.0.3 sortedcontainers==2.4.0 sphinx-markdown-tables==0.0.15 sphinx-rtd-theme==1.0.0; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.4.0") -sphinx==4.3.1; python_version >= "3.6" +sphinx==4.3.2; python_version >= "3.6" sphinxcontrib-applehelp==1.0.2; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" and python_version >= "3.6" sphinxcontrib-devhelp==1.0.2; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" and python_version >= "3.6" sphinxcontrib-htmlhelp==2.0.0; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" and python_version >= "3.6" @@ -191,7 +191,7 @@ sphinxcontrib-jsmath==1.0.1; python_version >= "3.6" and python_full_version < " sphinxcontrib-qthelp==1.0.3; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" and python_version >= "3.6" sphinxcontrib-serializinghtml==1.1.5; python_version >= "3.6" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" and python_version >= "3.6" sqlalchemy-migrate==0.13.0 -sqlalchemy==1.4.28; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.6.0") +sqlalchemy==1.4.29; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.6.0") sqlitedict==1.7.0 sqlparse==0.4.2; python_version >= "3.5" starlette-context==0.3.3; python_version >= "3.7" @@ -204,7 +204,7 @@ testfixtures==6.18.3 tifffile==2021.11.2; python_version >= "3.7" tinydb==4.5.0; python_version >= "3.5" and python_version < "4.0" toml==0.10.2; python_version >= "3.7" and python_full_version < "3.0.0" or python_full_version >= "3.3.0" and python_version >= "3.7" -tomli==1.2.2; python_full_version >= "3.6.2" and python_version >= "3.6" +tomli==1.2.3; python_full_version >= "3.6.2" and python_version >= "3.6" tornado==6.1; python_version >= "3.5" tqdm==4.62.3; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" trio-websocket==0.9.2; python_version >= "3.7" and python_version < "4.0" @@ -228,5 +228,5 @@ wrapt==1.13.3; python_version >= "3.6" and python_full_version < "3.0.0" or pyth wsproto==1.0.0; python_version >= "3.7" and python_version < "4.0" and python_full_version >= "3.6.1" xmlrunner==1.7.7 yacman==0.8.4 -zipp==3.6.0; python_version == "3.7" and (python_version >= "3.6" and python_full_version < "3.0.0" and python_version < "3.8" or python_full_version >= "3.6.0" and python_version < "3.8" and python_version >= "3.6") +zipp==3.7.0; python_version == "3.7" and (python_version >= "3.7" and python_full_version < "3.0.0" and python_version < "3.8" or python_full_version >= "3.6.0" and python_version < "3.8" and python_version >= "3.7") zipstream-new==1.1.8 diff --git a/lib/galaxy/dependencies/pinned-lint-requirements.txt b/lib/galaxy/dependencies/pinned-lint-requirements.txt index 6fd5258713f..3f01031d450 100644 --- a/lib/galaxy/dependencies/pinned-lint-requirements.txt +++ b/lib/galaxy/dependencies/pinned-lint-requirements.txt @@ -1,4 +1,4 @@ -attrs==21.2.0 +attrs==21.4.0 flake8==4.0.1 flake8-bugbear==21.11.29 flake8-import-order==0.18.1 @@ -10,20 +10,20 @@ pycodestyle==2.8.0 pyflakes==2.4.0 toml==0.10.2 typed-ast==1.4.3 -types-bleach==4.1.1 -types-boto==2.49.2 +types-bleach==4.1.2 +types-boto==2.49.3 types-contextvars==2.4.0 -types-cryptography==3.3.9 -types-dataclasses==0.6.1 -types-docutils==0.17.1 +types-cryptography==3.3.10 +types-dataclasses==0.6.2 +types-docutils==0.17.2 types-enum34==1.1.1 types-ipaddress==1.0.1 -types-Markdown==3.3.9 -types-paramiko==2.8.4 +types-Markdown==3.3.10 +types-paramiko==2.8.6 types-pkg-resources==0.1.3 -types-python-dateutil==2.8.3 +types-python-dateutil==2.8.4 types-PyYAML==6.0.1 -types-requests==2.26.1 -types-six==1.16.3 +types-requests==2.26.3 +types-six==1.16.6 typing_extensions==4.0.1 -zipp==3.6.0 +zipp==3.7.0 diff --git a/lib/galaxy/dependencies/pinned-requirements.txt b/lib/galaxy/dependencies/pinned-requirements.txt index 8251a210f84..5b743c333be 100644 --- a/lib/galaxy/dependencies/pinned-requirements.txt +++ b/lib/galaxy/dependencies/pinned-requirements.txt @@ -2,12 +2,12 @@ adal==1.2.7 aiofiles==0.8.0; python_version >= "3.6" and python_version < "4.0" -amqp==5.0.6; python_version >= "3.7" +amqp==5.0.9; python_version >= "3.7" appdirs==1.4.4 argcomplete==1.12.3; python_version >= "3.6" and python_version < "4" asgiref==3.4.1; python_version >= "3.6" attmap==0.13.2 -attrs==21.2.0; python_version >= "3.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.7" +attrs==21.4.0; python_version >= "3.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.7" babel==2.9.1; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.4.0") bagit-profile==1.3.1; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version < "4" bagit==1.8.1; python_version >= "3.6" and python_full_version < "3.0.0" and python_version < "4" or python_full_version >= "3.5.0" and python_version < "4" and python_version >= "3.6" @@ -19,10 +19,10 @@ bioblend==0.16.0; python_version >= "3.6" bleach==4.1.0; python_version >= "3.6" boltons==21.0.0 boto==2.49.0 -bx-python==0.8.12; python_version >= "3.6" +bx-python==0.8.13; python_version >= "3.7" cachecontrol==0.12.10; python_version >= "3.6" and python_version < "4" cached-property==1.5.2; python_version < "3.8" and python_version >= "3.7" -celery==5.2.1; python_version >= "3.7" +celery==5.2.3; python_version >= "3.7" certifi==2021.10.8; python_version >= "3.6" and python_full_version < "3.0.0" and python_version < "4" or python_full_version >= "3.6.0" and python_version < "4" and python_version >= "3.6" cffi==1.15.0; implementation_name == "pypy" and python_version >= "3.6" and (python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.4.0") charset-normalizer==2.0.9; python_full_version >= "3.6.0" and python_version >= "3.6" and python_version < "4" @@ -37,7 +37,7 @@ cloudbridge==3.0.0 colorama==0.4.4; platform_system == "Windows" and python_version >= "3.7" and python_full_version >= "3.6.2" and python_full_version < "4.0.0" and (python_version >= "2.7" and python_full_version < "3.0.0" and platform_system == "Windows" or python_full_version >= "3.5.0" and platform_system == "Windows") coloredlogs==15.0.1; python_version >= "3.6" and python_full_version < "3.0.0" and python_version < "4" or python_version >= "3.6" and python_version < "4" and python_full_version >= "3.5.0" commonmark==0.9.1; python_full_version >= "3.6.2" and python_full_version < "4.0.0" -cryptography==36.0.0; python_version >= "3.6" and python_full_version < "3.0.0" and python_version < "4" or python_full_version >= "3.6.0" and python_version < "4" and python_version >= "3.6" +cryptography==36.0.1; python_version >= "3.6" and python_full_version < "3.0.0" and python_version < "4" or python_full_version >= "3.6.0" and python_version < "4" and python_version >= "3.6" cwltool==3.1.20211107152837; python_version >= "3.6" and python_version < "4" decorator==5.1.0; python_version >= "3.6" and python_version < "4" defusedxml==0.7.1; python_version >= "3.0" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version >= "3.0" @@ -59,16 +59,16 @@ gxformat2==0.15.0 h11==0.12.0; python_version >= "3.6" h5py==3.6.0; python_version >= "3.7" humanfriendly==10.0; python_version >= "3.6" and python_full_version < "3.0.0" and python_version < "4" or python_version >= "3.6" and python_version < "4" and python_full_version >= "3.5.0" -idna==3.3; python_version >= "3.6" and python_full_version < "3.0.0" and python_version < "4" or python_full_version >= "3.6.0" and python_version >= "3.6" and python_version < "4" -importlib-metadata==4.8.2; python_version == "3.7" and (python_version >= "3.6" and python_full_version < "3.0.0" and python_version < "3.8" or python_full_version >= "3.6.0" and python_version < "3.8" and python_version >= "3.6") +idna==3.3; python_full_version >= "3.6.2" and python_version >= "3.7" and python_version < "4" +importlib-metadata==4.10.0; python_version == "3.7" and (python_version >= "3.7" and python_full_version < "3.0.0" and python_version < "3.8" or python_full_version >= "3.6.0" and python_version < "3.8" and python_version >= "3.7") importlib-resources==5.4.0; python_version < "3.9" and python_version >= "3.7" isa-rwval==0.10.10 -isodate==0.6.0; python_version >= "3.7" and python_version < "4" -jsonschema==4.2.1; python_version >= "3.7" -kombu==5.2.2; python_version >= "3.7" +isodate==0.6.1; python_version >= "3.7" and python_version < "4" +jsonschema==4.3.2; python_version >= "3.7" +kombu==5.2.3; python_version >= "3.7" lagom==1.7.0; python_version >= "3.6" and python_version < "4.0" lockfile==0.12.2; python_version >= "3.6" and python_version < "4" -lxml==4.6.4; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.5.0") +lxml==4.7.1; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.5.0") mako==1.1.6; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.4.0") markdown==3.3.6; python_version >= "3.6" markupsafe==2.0.1; python_version >= "3.6" @@ -91,17 +91,17 @@ pastedeploy==2.1.1 pbr==5.8.0; python_version >= "2.6" prompt-toolkit==3.0.24; python_full_version >= "3.6.2" and python_version >= "3.7" prov==1.5.1; python_version >= "3.6" and python_version < "4" -psutil==5.8.0; (python_version >= "2.6" and python_full_version < "3.0.0") or (python_full_version >= "3.4.0") +psutil==5.9.0; (python_version >= "2.6" and python_full_version < "3.0.0") or (python_full_version >= "3.4.0") pulsar-galaxy-lib==0.14.13 py==1.11.0; python_version >= "3.6" and python_full_version < "3.0.0" and implementation_name == "pypy" or implementation_name == "pypy" and python_version >= "3.6" and python_full_version >= "3.5.0" pyasn1==0.4.8; python_version >= "3.6" and python_version < "4" pycparser==2.21; python_version >= "3.6" and python_full_version < "3.0.0" and implementation_name == "pypy" and (python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.4.0") or implementation_name == "pypy" and python_version >= "3.6" and (python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.4.0") and python_full_version >= "3.4.0" pycryptodome==3.12.0; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.5.0") -pydantic==1.8.2; python_version >= "3.6" and python_version < "4.0" and python_full_version >= "3.6.1" +pydantic==1.9.0; python_version >= "3.6" and python_version < "4.0" and python_full_version >= "3.6.1" pydot==1.4.2; python_version >= "3.6" and python_full_version < "3.0.0" and python_version < "4" or python_version >= "3.6" and python_version < "4" and python_full_version >= "3.4.0" pyeventsystem==0.1.0 pyfaidx==0.6.3.1 -pygments==2.10.0; python_full_version >= "3.6.2" and python_full_version < "4.0.0" and python_version >= "3.5" +pygments==2.11.1; python_full_version >= "3.6.2" and python_full_version < "4.0.0" and python_version >= "3.5" pyjwt==2.3.0; python_version >= "3.6" pykwalify==1.8.0 pynacl==1.4.0; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" @@ -124,19 +124,19 @@ repoze.lru==0.7 requests-oauthlib==1.3.0; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.4.0" requests-toolbelt==0.9.1; python_version >= "3.6" requests==2.26.0; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.6.0") -rich==10.15.2; python_full_version >= "3.6.2" and python_full_version < "4.0.0" +rich==10.16.1; python_full_version >= "3.6.2" and python_full_version < "4.0.0" routes==2.5.1 rsa==4.8; python_version >= "3.6" and python_version < "4" ruamel.yaml.clib==0.2.6; platform_python_implementation == "CPython" and python_version < "3.10" and python_version >= "3.6" ruamel.yaml==0.17.17; python_version >= "3.6" and python_version < "4" -schema-salad==8.2.20211116214159; python_version >= "3.6" and python_version < "4" +schema-salad==8.2.20211222191353; python_version >= "3.6" and python_version < "4" setuptools-scm==5.0.2; python_version >= "2.7" and python_full_version < "3.0.0" or python_full_version >= "3.5.0" and python_version < "4" shellescape==3.8.1; python_version >= "3.6" and python_version < "4" six==1.16.0; python_version >= "3.7" and python_full_version < "3.0.0" and python_version < "4" or python_full_version >= "3.4.0" and python_version >= "3.7" and python_version < "4" social-auth-core==4.0.3 sortedcontainers==2.4.0 sqlalchemy-migrate==0.13.0 -sqlalchemy==1.4.28; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.6.0") +sqlalchemy==1.4.29; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.6.0") sqlitedict==1.7.0 sqlparse==0.4.2; python_version >= "3.5" starlette-context==0.3.3; python_version >= "3.7" @@ -159,5 +159,5 @@ webencodings==0.5.1; python_version >= "3.6" webob==1.8.7; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.3.0") whoosh==2.7.4 yacman==0.8.4 -zipp==3.6.0; python_version == "3.7" and (python_version >= "3.6" and python_full_version < "3.0.0" and python_version < "3.8" or python_full_version >= "3.6.0" and python_version < "3.8" and python_version >= "3.6") +zipp==3.7.0; python_version == "3.7" and (python_version >= "3.7" and python_full_version < "3.0.0" and python_version < "3.8" or python_full_version >= "3.6.0" and python_version < "3.8" and python_version >= "3.7") zipstream-new==1.1.8 diff --git a/packages/app/requirements.txt b/packages/app/requirements.txt index 7b73ec92c8b..7468b5a2c04 100644 --- a/packages/app/requirements.txt +++ b/packages/app/requirements.txt @@ -15,7 +15,9 @@ kombu lagom Mako Markdown +paramiko!=2.9.0,!=2.9.1 pulsar-galaxy-lib>=0.14.13 +pydantic pykwalify refgenconf>=0.12.0 sqlitedict diff --git a/packages/web_framework/requirements.txt b/packages/web_framework/requirements.txt index 2aabc3e555b..c60ad2b07fc 100644 --- a/packages/web_framework/requirements.txt +++ b/packages/web_framework/requirements.txt @@ -4,7 +4,7 @@ galaxy-util galaxy-web-stack MarkupSafe paste -pydantic<1.8 +pydantic requests Routes SQLAlchemy>=1.4.25,<2 diff --git a/packages/webapps/requirements.txt b/packages/webapps/requirements.txt index 8392e9eb703..0e18dbbfb16 100644 --- a/packages/webapps/requirements.txt +++ b/packages/webapps/requirements.txt @@ -1,8 +1,9 @@ galaxy-app Cheetah3 -fastapi>=0.68.2,!=0.69.0,!=0.70.0 +fastapi>=0.68.2,!=0.69.0,!=0.70.0,!=0.70.1 fastapi-utils Mako +pydantic python-multipart # required to support form parsing in FastAPI/Starlette starlette typing-extensions diff --git a/pyproject.toml b/pyproject.toml index d389aab2e31..690beb6b130 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -33,7 +33,7 @@ dictobj = "*" docutils = "!=0.17, !=0.17.1" edam-ontology = "*" Fabric3 = "*" -fastapi = ">=0.68.2, !=0.69.0, !=0.70.0" # https://github.com/tiangolo/fastapi/issues/4041 +fastapi = ">=0.68.2, !=0.69.0, !=0.70.0, !=0.70.1" # https://github.com/tiangolo/fastapi/issues/4041 fastapi-utils = "*" fs = "*" future = "*" @@ -51,12 +51,13 @@ mrcfile = "*" nodeenv = "*" nose = "*" numpy = "*" -paramiko = "*" +paramiko = "!=2.9.0, !=2.9.1" # https://github.com/paramiko/paramiko/issues/1961 Parsley = "*" Paste = "*" psutil = "*" pulsar-galaxy-lib = ">=0.14.13" pycryptodome = "*" +pydantic = "*" pykwalify = "*" pyparsing = "*" pysam = "*"