diff --git a/.github/workflows/first_startup.yaml b/.github/workflows/first_startup.yaml index 47c845bb878b..732388cc1ff2 100644 --- a/.github/workflows/first_startup.yaml +++ b/.github/workflows/first_startup.yaml @@ -23,7 +23,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ['3.8', '3.11'] + python-version: ['3.8', '3.12'] defaults: run: shell: bash -l {0} diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 037f343d9ee9..2d300c18a3cc 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -22,7 +22,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ['3.8', '3.11'] + python-version: ['3.8', '3.12'] env: LINT_PATH: 'lib/galaxy/dependencies/pinned-lint-requirements.txt' TYPE_PATH: 'lib/galaxy/dependencies/pinned-typecheck-requirements.txt' diff --git a/.github/workflows/lint_openapi_schema.yml b/.github/workflows/lint_openapi_schema.yml index c327fabe72e8..780b584f3b05 100644 --- a/.github/workflows/lint_openapi_schema.yml +++ b/.github/workflows/lint_openapi_schema.yml @@ -20,7 +20,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ['3.8', '3.11'] + python-version: ['3.8', '3.12'] steps: - uses: actions/checkout@v3 with: diff --git a/.github/workflows/osx_startup.yaml b/.github/workflows/osx_startup.yaml index 8271f0bd4cd7..ccc17526f870 100644 --- a/.github/workflows/osx_startup.yaml +++ b/.github/workflows/osx_startup.yaml @@ -21,7 +21,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ['3.8', '3.11'] + python-version: ['3.8', '3.12'] defaults: run: shell: bash -l {0} diff --git a/.github/workflows/reports_startup.yaml b/.github/workflows/reports_startup.yaml index 5597489d3726..397e78442a4a 100644 --- a/.github/workflows/reports_startup.yaml +++ b/.github/workflows/reports_startup.yaml @@ -18,7 +18,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ['3.8', '3.11'] + python-version: ['3.8', '3.12'] defaults: run: shell: bash -l {0} diff --git a/.github/workflows/test_galaxy_packages.yaml b/.github/workflows/test_galaxy_packages.yaml index 402cee12b895..51f871b3fe38 100644 --- a/.github/workflows/test_galaxy_packages.yaml +++ b/.github/workflows/test_galaxy_packages.yaml @@ -18,7 +18,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ['3.8', '3.11'] + python-version: ['3.8', '3.12'] steps: - uses: actions/checkout@v3 with: diff --git a/.github/workflows/toolshed.yaml b/.github/workflows/toolshed.yaml index 48dbb860b391..5552bc4f3900 100644 --- a/.github/workflows/toolshed.yaml +++ b/.github/workflows/toolshed.yaml @@ -21,7 +21,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ['3.8', '3.11'] + python-version: ['3.8', '3.12'] shed-api: ['v1', 'v2'] test-install-client: ['galaxy_api', 'standalone'] services: diff --git a/.github/workflows/unit.yaml b/.github/workflows/unit.yaml index 9c32eae057d6..af5f7810a894 100644 --- a/.github/workflows/unit.yaml +++ b/.github/workflows/unit.yaml @@ -20,7 +20,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ['3.8', '3.11'] + python-version: ['3.8', '3.12'] steps: - uses: actions/checkout@v3 with: diff --git a/lib/galaxy/dependencies/dev-requirements.txt b/lib/galaxy/dependencies/dev-requirements.txt index cee7b0cc4f00..90869973f737 100644 --- a/lib/galaxy/dependencies/dev-requirements.txt +++ b/lib/galaxy/dependencies/dev-requirements.txt @@ -1,171 +1,171 @@ -aiohttp==3.9.1 ; python_version >= "3.8" and python_version < "3.12" -aiosignal==1.3.1 ; python_version >= "3.8" and python_version < "3.12" -alabaster==0.7.13 ; python_version >= "3.8" and python_version < "3.12" -amqp==5.2.0 ; python_version >= "3.8" and python_version < "3.12" -anyio==4.2.0 ; python_version >= "3.8" and python_version < "3.12" -ase==3.22.1 ; python_version >= "3.8" and python_version < "3.12" +aiohttp==3.9.1 ; python_version >= "3.8" and python_version < "3.13" +aiosignal==1.3.1 ; python_version >= "3.8" and python_version < "3.13" +alabaster==0.7.13 ; python_version >= "3.8" and python_version < "3.13" +amqp==5.2.0 ; python_version >= "3.8" and python_version < "3.13" +anyio==4.2.0 ; python_version >= "3.8" and python_version < "3.13" +ase==3.22.1 ; python_version >= "3.8" and python_version < "3.13" async-timeout==4.0.3 ; python_version >= "3.8" and python_version < "3.11" -attrs==23.2.0 ; python_version >= "3.8" and python_version < "3.12" -axe-selenium-python==2.1.6 ; python_version >= "3.8" and python_version < "3.12" -babel==2.14.0 ; python_version >= "3.8" and python_version < "3.12" +attrs==23.2.0 ; python_version >= "3.8" and python_version < "3.13" +axe-selenium-python==2.1.6 ; python_version >= "3.8" and python_version < "3.13" +babel==2.14.0 ; python_version >= "3.8" and python_version < "3.13" backports-zoneinfo==0.2.1 ; python_version >= "3.8" and python_version < "3.9" backports-zoneinfo[tzdata]==0.2.1 ; python_version >= "3.8" and python_version < "3.9" -billiard==4.2.0 ; python_version >= "3.8" and python_version < "3.12" -black==23.12.1 ; python_version >= "3.8" and python_version < "3.12" -build==1.0.3 ; python_version >= "3.8" and python_version < "3.12" -cachecontrol[filecache]==0.13.1 ; python_version >= "3.8" and python_version < "3.12" -celery==5.3.6 ; python_version >= "3.8" and python_version < "3.12" -certifi==2023.11.17 ; python_version >= "3.8" and python_version < "3.12" -cffi==1.16.0 ; python_version >= "3.8" and python_version < "3.12" -charset-normalizer==3.3.2 ; python_version >= "3.8" and python_version < "3.12" -click-didyoumean==0.3.0 ; python_version >= "3.8" and python_version < "3.12" -click-plugins==1.1.1 ; python_version >= "3.8" and python_version < "3.12" -click-repl==0.3.0 ; python_version >= "3.8" and python_version < "3.12" -click==8.1.7 ; python_version >= "3.8" and python_version < "3.12" -codespell==2.2.6 ; python_version >= "3.8" and python_version < "3.12" -colorama==0.4.6 ; python_version >= "3.8" and python_version < "3.12" and (sys_platform == "win32" or platform_system == "Windows" or os_name == "nt") -contourpy==1.1.1 ; python_version >= "3.8" and python_version < "3.12" -coverage[toml]==7.4.0 ; python_version >= "3.8" and python_version < "3.12" -cryptography==41.0.7 ; python_version >= "3.8" and python_version < "3.12" -cwltest==2.4.20231222081524 ; python_version >= "3.8" and python_version < "3.12" -cycler==0.12.1 ; python_version >= "3.8" and python_version < "3.12" -darker==1.7.2 ; python_version >= "3.8" and python_version < "3.12" -defusedxml==0.7.1 ; python_version >= "3.8" and python_version < "3.12" -deprecated==1.2.14 ; python_version >= "3.8" and python_version < "3.12" -docutils==0.18.1 ; python_version >= "3.8" and python_version < "3.12" +billiard==4.2.0 ; python_version >= "3.8" and python_version < "3.13" +black==23.12.1 ; python_version >= "3.8" and python_version < "3.13" +build==1.0.3 ; python_version >= "3.8" and python_version < "3.13" +cachecontrol[filecache]==0.13.1 ; python_version >= "3.8" and python_version < "3.13" +celery==5.3.6 ; python_version >= "3.8" and python_version < "3.13" +certifi==2023.11.17 ; python_version >= "3.8" and python_version < "3.13" +cffi==1.16.0 ; python_version >= "3.8" and python_version < "3.13" +charset-normalizer==3.3.2 ; python_version >= "3.8" and python_version < "3.13" +click-didyoumean==0.3.0 ; python_version >= "3.8" and python_version < "3.13" +click-plugins==1.1.1 ; python_version >= "3.8" and python_version < "3.13" +click-repl==0.3.0 ; python_version >= "3.8" and python_version < "3.13" +click==8.1.7 ; python_version >= "3.8" and python_version < "3.13" +codespell==2.2.6 ; python_version >= "3.8" and python_version < "3.13" +colorama==0.4.6 ; python_version >= "3.8" and python_version < "3.13" and (sys_platform == "win32" or platform_system == "Windows" or os_name == "nt") +contourpy==1.1.1 ; python_version >= "3.8" and python_version < "3.13" +coverage[toml]==7.4.0 ; python_version >= "3.8" and python_version < "3.13" +cryptography==41.0.7 ; python_version >= "3.8" and python_version < "3.13" +cwltest==2.4.20231222081524 ; python_version >= "3.8" and python_version < "3.13" +cycler==0.12.1 ; python_version >= "3.8" and python_version < "3.13" +darker==1.7.2 ; python_version >= "3.8" and python_version < "3.13" +defusedxml==0.7.1 ; python_version >= "3.8" and python_version < "3.13" +deprecated==1.2.14 ; python_version >= "3.8" and python_version < "3.13" +docutils==0.18.1 ; python_version >= "3.8" and python_version < "3.13" exceptiongroup==1.2.0 ; python_version >= "3.8" and python_version < "3.11" -filelock==3.13.1 ; python_version >= "3.8" and python_version < "3.12" -fluent-logger==0.10.0 ; python_version >= "3.8" and python_version < "3.12" -fonttools==4.47.0 ; python_version >= "3.8" and python_version < "3.12" -frozenlist==1.4.1 ; python_version >= "3.8" and python_version < "3.12" -galaxy-release-util==0.1.5 ; python_version >= "3.8" and python_version < "3.12" -greenlet==3.0.1 ; python_version >= "3.8" and python_version < "3.12" -h11==0.14.0 ; python_version >= "3.8" and python_version < "3.12" -httpcore==1.0.2 ; python_version >= "3.8" and python_version < "3.12" -httpx==0.26.0 ; python_version >= "3.8" and python_version < "3.12" -idna==3.6 ; python_version >= "3.8" and python_version < "3.12" -imagesize==1.4.1 ; python_version >= "3.8" and python_version < "3.12" -importlib-metadata==7.0.1 ; python_version >= "3.8" and python_version < "3.12" +filelock==3.13.1 ; python_version >= "3.8" and python_version < "3.13" +fluent-logger==0.10.0 ; python_version >= "3.8" and python_version < "3.13" +fonttools==4.47.0 ; python_version >= "3.8" and python_version < "3.13" +frozenlist==1.4.1 ; python_version >= "3.8" and python_version < "3.13" +galaxy-release-util==0.1.5 ; python_version >= "3.8" and python_version < "3.13" +greenlet==3.0.1 ; python_version >= "3.8" and python_version < "3.13" +h11==0.14.0 ; python_version >= "3.8" and python_version < "3.13" +httpcore==1.0.2 ; python_version >= "3.8" and python_version < "3.13" +httpx==0.26.0 ; python_version >= "3.8" and python_version < "3.13" +idna==3.6 ; python_version >= "3.8" and python_version < "3.13" +imagesize==1.4.1 ; python_version >= "3.8" and python_version < "3.13" +importlib-metadata==7.0.1 ; python_version >= "3.8" and python_version < "3.13" importlib-resources==6.1.1 ; python_version >= "3.8" and python_version < "3.10" -iniconfig==2.0.0 ; python_version >= "3.8" and python_version < "3.12" -isodate==0.6.1 ; python_version >= "3.8" and python_version < "3.12" -isort==5.13.2 ; python_version >= "3.8" and python_version < "3.12" -jaraco-classes==3.3.0 ; python_version >= "3.8" and python_version < "3.12" -jeepney==0.8.0 ; python_version >= "3.8" and python_version < "3.12" and sys_platform == "linux" -jinja2==3.1.2 ; python_version >= "3.8" and python_version < "3.12" -junit-xml==1.9 ; python_version >= "3.8" and python_version < "3.12" -keyring==24.3.0 ; python_version >= "3.8" and python_version < "3.12" -kiwisolver==1.4.5 ; python_version >= "3.8" and python_version < "3.12" -kombu==5.3.4 ; python_version >= "3.8" and python_version < "3.12" -lxml==4.9.4 ; python_version >= "3.8" and python_version < "3.12" -markdown-it-py==3.0.0 ; python_version >= "3.8" and python_version < "3.12" -markdown-it-reporter==0.0.2 ; python_version >= "3.8" and python_version < "3.12" -markupsafe==2.1.3 ; python_version >= "3.8" and python_version < "3.12" +iniconfig==2.0.0 ; python_version >= "3.8" and python_version < "3.13" +isodate==0.6.1 ; python_version >= "3.8" and python_version < "3.13" +isort==5.13.2 ; python_version >= "3.8" and python_version < "3.13" +jaraco-classes==3.3.0 ; python_version >= "3.8" and python_version < "3.13" +jeepney==0.8.0 ; python_version >= "3.8" and python_version < "3.13" and sys_platform == "linux" +jinja2==3.1.2 ; python_version >= "3.8" and python_version < "3.13" +junit-xml==1.9 ; python_version >= "3.8" and python_version < "3.13" +keyring==24.3.0 ; python_version >= "3.8" and python_version < "3.13" +kiwisolver==1.4.5 ; python_version >= "3.8" and python_version < "3.13" +kombu==5.3.4 ; python_version >= "3.8" and python_version < "3.13" +lxml==4.9.4 ; python_version >= "3.8" and python_version < "3.13" +markdown-it-py==3.0.0 ; python_version >= "3.8" and python_version < "3.13" +markdown-it-reporter==0.0.2 ; python_version >= "3.8" and python_version < "3.13" +markupsafe==2.1.3 ; python_version >= "3.8" and python_version < "3.13" matplotlib==3.7.4 ; python_version >= "3.8" and python_version < "3.9" -matplotlib==3.8.2 ; python_version >= "3.9" and python_version < "3.12" -mdit-py-plugins==0.4.0 ; python_version >= "3.8" and python_version < "3.12" -mdurl==0.1.2 ; python_version >= "3.8" and python_version < "3.12" -mirakuru==2.5.2 ; python_version >= "3.8" and python_version < "3.12" -mistune==2.0.5 ; python_version >= "3.8" and python_version < "3.12" -more-itertools==10.1.0 ; python_version >= "3.8" and python_version < "3.12" -msgpack==1.0.7 ; python_version >= "3.8" and python_version < "3.12" -multidict==6.0.4 ; python_version >= "3.8" and python_version < "3.12" -mypy-extensions==1.0.0 ; python_version >= "3.8" and python_version < "3.12" -myst-parser==2.0.0 ; python_version >= "3.8" and python_version < "3.12" -nh3==0.2.15 ; python_version >= "3.8" and python_version < "3.12" +matplotlib==3.8.2 ; python_version >= "3.9" and python_version < "3.13" +mdit-py-plugins==0.4.0 ; python_version >= "3.8" and python_version < "3.13" +mdurl==0.1.2 ; python_version >= "3.8" and python_version < "3.13" +mirakuru==2.5.2 ; python_version >= "3.8" and python_version < "3.13" +mistune==2.0.5 ; python_version >= "3.8" and python_version < "3.13" +more-itertools==10.1.0 ; python_version >= "3.8" and python_version < "3.13" +msgpack==1.0.7 ; python_version >= "3.8" and python_version < "3.13" +multidict==6.0.4 ; python_version >= "3.8" and python_version < "3.13" +mypy-extensions==1.0.0 ; python_version >= "3.8" and python_version < "3.13" +myst-parser==2.0.0 ; python_version >= "3.8" and python_version < "3.13" +nh3==0.2.15 ; python_version >= "3.8" and python_version < "3.13" numpy==1.24.4 ; python_version >= "3.8" and python_version < "3.9" -numpy==1.26.3 ; python_version >= "3.9" and python_version < "3.12" -outcome==1.3.0.post0 ; python_version >= "3.8" and python_version < "3.12" -packaging==23.2 ; python_version >= "3.8" and python_version < "3.12" -pathspec==0.12.1 ; python_version >= "3.8" and python_version < "3.12" -pillow==10.2.0 ; python_version >= "3.8" and python_version < "3.12" -pkce==1.0.3 ; python_version >= "3.8" and python_version < "3.12" -pkginfo==1.9.6 ; python_version >= "3.8" and python_version < "3.12" -platformdirs==4.1.0 ; python_version >= "3.8" and python_version < "3.12" -playwright==1.40.0 ; python_version >= "3.8" and python_version < "3.12" -pluggy==1.3.0 ; python_version >= "3.8" and python_version < "3.12" -port-for==0.7.2 ; python_version >= "3.8" and python_version < "3.12" -prettytable==3.9.0 ; python_version >= "3.8" and python_version < "3.12" -prompt-toolkit==3.0.43 ; python_version >= "3.8" and python_version < "3.12" -psutil==5.9.7 ; python_version >= "3.8" and python_version < "3.12" and sys_platform != "cygwin" -psycopg==3.1.16 ; python_version >= "3.8" and python_version < "3.12" -pycparser==2.21 ; python_version >= "3.8" and python_version < "3.12" -pyee==11.0.1 ; python_version >= "3.8" and python_version < "3.12" -pygithub==2.1.1 ; python_version >= "3.8" and python_version < "3.12" -pygments==2.17.2 ; python_version >= "3.8" and python_version < "3.12" -pyjwt[crypto]==2.8.0 ; python_version >= "3.8" and python_version < "3.12" -pynacl==1.5.0 ; python_version >= "3.8" and python_version < "3.12" -pyparsing==3.1.1 ; python_version >= "3.8" and python_version < "3.12" -pyproject-hooks==1.0.0 ; python_version >= "3.8" and python_version < "3.12" -pysocks==1.7.1 ; python_version >= "3.8" and python_version < "3.12" -pytest-asyncio==0.23.3 ; python_version >= "3.8" and python_version < "3.12" -pytest-base-url==2.0.0 ; python_version >= "3.8" and python_version < "3.12" -pytest-celery==0.0.0 ; python_version >= "3.8" and python_version < "3.12" -pytest-cov==4.1.0 ; python_version >= "3.8" and python_version < "3.12" -pytest-html==4.1.1 ; python_version >= "3.8" and python_version < "3.12" -pytest-httpserver==1.0.8 ; python_version >= "3.8" and python_version < "3.12" -pytest-json-report==1.5.0 ; python_version >= "3.8" and python_version < "3.12" -pytest-metadata==3.0.0 ; python_version >= "3.8" and python_version < "3.12" -pytest-mock==3.12.0 ; python_version >= "3.8" and python_version < "3.12" -pytest-playwright==0.4.3 ; python_version >= "3.8" and python_version < "3.12" -pytest-postgresql==5.0.0 ; python_version >= "3.8" and python_version < "3.12" -pytest-shard==0.1.2 ; python_version >= "3.8" and python_version < "3.12" -pytest==7.4.4 ; python_version >= "3.8" and python_version < "3.12" -python-dateutil==2.8.2 ; python_version >= "3.8" and python_version < "3.12" -python-irodsclient==1.1.9 ; python_version >= "3.8" and python_version < "3.12" -python-slugify==8.0.1 ; python_version >= "3.8" and python_version < "3.12" +numpy==1.26.3 ; python_version >= "3.9" and python_version < "3.13" +outcome==1.3.0.post0 ; python_version >= "3.8" and python_version < "3.13" +packaging==23.2 ; python_version >= "3.8" and python_version < "3.13" +pathspec==0.12.1 ; python_version >= "3.8" and python_version < "3.13" +pillow==10.2.0 ; python_version >= "3.8" and python_version < "3.13" +pkce==1.0.3 ; python_version >= "3.8" and python_version < "3.13" +pkginfo==1.9.6 ; python_version >= "3.8" and python_version < "3.13" +platformdirs==4.1.0 ; python_version >= "3.8" and python_version < "3.13" +playwright==1.40.0 ; python_version >= "3.8" and python_version < "3.13" +pluggy==1.3.0 ; python_version >= "3.8" and python_version < "3.13" +port-for==0.7.2 ; python_version >= "3.8" and python_version < "3.13" +prettytable==3.9.0 ; python_version >= "3.8" and python_version < "3.13" +prompt-toolkit==3.0.43 ; python_version >= "3.8" and python_version < "3.13" +psutil==5.9.7 ; python_version >= "3.8" and python_version < "3.13" and sys_platform != "cygwin" +psycopg==3.1.16 ; python_version >= "3.8" and python_version < "3.13" +pycparser==2.21 ; python_version >= "3.8" and python_version < "3.13" +pyee==11.0.1 ; python_version >= "3.8" and python_version < "3.13" +pygithub==2.1.1 ; python_version >= "3.8" and python_version < "3.13" +pygments==2.17.2 ; python_version >= "3.8" and python_version < "3.13" +pyjwt[crypto]==2.8.0 ; python_version >= "3.8" and python_version < "3.13" +pynacl==1.5.0 ; python_version >= "3.8" and python_version < "3.13" +pyparsing==3.1.1 ; python_version >= "3.8" and python_version < "3.13" +pyproject-hooks==1.0.0 ; python_version >= "3.8" and python_version < "3.13" +pysocks==1.7.1 ; python_version >= "3.8" and python_version < "3.13" +pytest-asyncio==0.23.3 ; python_version >= "3.8" and python_version < "3.13" +pytest-base-url==2.0.0 ; python_version >= "3.8" and python_version < "3.13" +pytest-celery==0.0.0 ; python_version >= "3.8" and python_version < "3.13" +pytest-cov==4.1.0 ; python_version >= "3.8" and python_version < "3.13" +pytest-html==4.1.1 ; python_version >= "3.8" and python_version < "3.13" +pytest-httpserver==1.0.8 ; python_version >= "3.8" and python_version < "3.13" +pytest-json-report==1.5.0 ; python_version >= "3.8" and python_version < "3.13" +pytest-metadata==3.0.0 ; python_version >= "3.8" and python_version < "3.13" +pytest-mock==3.12.0 ; python_version >= "3.8" and python_version < "3.13" +pytest-playwright==0.4.3 ; python_version >= "3.8" and python_version < "3.13" +pytest-postgresql==5.0.0 ; python_version >= "3.8" and python_version < "3.13" +pytest-shard==0.1.2 ; python_version >= "3.8" and python_version < "3.13" +pytest==7.4.4 ; python_version >= "3.8" and python_version < "3.13" +python-dateutil==2.8.2 ; python_version >= "3.8" and python_version < "3.13" +python-irodsclient==1.1.9 ; python_version >= "3.8" and python_version < "3.13" +python-slugify==8.0.1 ; python_version >= "3.8" and python_version < "3.13" pytz==2023.3.post1 ; python_version >= "3.8" and python_version < "3.9" -pywin32-ctypes==0.2.2 ; python_version >= "3.8" and python_version < "3.12" and sys_platform == "win32" -pyyaml==6.0.1 ; python_version >= "3.8" and python_version < "3.12" -rdflib==6.3.2 ; python_version >= "3.8" and python_version < "3.12" -readme-renderer==42.0 ; python_version >= "3.8" and python_version < "3.12" -requests-toolbelt==1.0.0 ; python_version >= "3.8" and python_version < "3.12" -requests==2.31.0 ; python_version >= "3.8" and python_version < "3.12" -responses==0.24.1 ; python_version >= "3.8" and python_version < "3.12" -rfc3986==2.0.0 ; python_version >= "3.8" and python_version < "3.12" -rich==13.7.0 ; python_version >= "3.8" and python_version < "3.12" -ruamel-yaml-clib==0.2.8 ; platform_python_implementation == "CPython" and python_version < "3.12" and python_version >= "3.8" -ruamel-yaml==0.18.5 ; python_version >= "3.8" and python_version < "3.12" -schema-salad==8.5.20240102191335 ; python_version >= "3.8" and python_version < "3.12" +pywin32-ctypes==0.2.2 ; python_version >= "3.8" and python_version < "3.13" and sys_platform == "win32" +pyyaml==6.0.1 ; python_version >= "3.8" and python_version < "3.13" +rdflib==6.3.2 ; python_version >= "3.8" and python_version < "3.13" +readme-renderer==42.0 ; python_version >= "3.8" and python_version < "3.13" +requests-toolbelt==1.0.0 ; python_version >= "3.8" and python_version < "3.13" +requests==2.31.0 ; python_version >= "3.8" and python_version < "3.13" +responses==0.24.1 ; python_version >= "3.8" and python_version < "3.13" +rfc3986==2.0.0 ; python_version >= "3.8" and python_version < "3.13" +rich==13.7.0 ; python_version >= "3.8" and python_version < "3.13" +ruamel-yaml-clib==0.2.8 ; platform_python_implementation == "CPython" and python_version < "3.13" and python_version >= "3.8" +ruamel-yaml==0.18.5 ; python_version >= "3.8" and python_version < "3.13" +schema-salad==8.5.20240102191335 ; python_version >= "3.8" and python_version < "3.13" scipy==1.10.1 ; python_version >= "3.8" and python_version < "3.9" -scipy==1.11.4 ; python_version >= "3.9" and python_version < "3.12" -secretstorage==3.3.3 ; python_version >= "3.8" and python_version < "3.12" and sys_platform == "linux" -selenium==4.16.0 ; python_version >= "3.8" and python_version < "3.12" -seletools==1.4.0 ; python_version >= "3.8" and python_version < "3.12" -setuptools==69.0.3 ; python_version >= "3.8" and python_version < "3.12" -six==1.16.0 ; python_version >= "3.8" and python_version < "3.12" -sniffio==1.3.0 ; python_version >= "3.8" and python_version < "3.12" -snowballstemmer==2.2.0 ; python_version >= "3.8" and python_version < "3.12" -sortedcontainers==2.4.0 ; python_version >= "3.8" and python_version < "3.12" -sphinx-rtd-theme==1.3.0 ; python_version >= "3.8" and python_version < "3.12" -sphinx==7.1.2 ; python_version >= "3.8" and python_version < "3.12" -sphinxcontrib-applehelp==1.0.4 ; python_version >= "3.8" and python_version < "3.12" -sphinxcontrib-devhelp==1.0.2 ; python_version >= "3.8" and python_version < "3.12" -sphinxcontrib-htmlhelp==2.0.1 ; python_version >= "3.8" and python_version < "3.12" -sphinxcontrib-jquery==4.1 ; python_version >= "3.8" and python_version < "3.12" -sphinxcontrib-jsmath==1.0.1 ; python_version >= "3.8" and python_version < "3.12" -sphinxcontrib-qthelp==1.0.3 ; python_version >= "3.8" and python_version < "3.12" -sphinxcontrib-serializinghtml==1.1.5 ; python_version >= "3.8" and python_version < "3.12" -statsd==4.0.1 ; python_version >= "3.8" and python_version < "3.12" -testfixtures==7.2.2 ; python_version >= "3.8" and python_version < "3.12" -text-unidecode==1.3 ; python_version >= "3.8" and python_version < "3.12" -tinydb==4.8.0 ; python_version >= "3.8" and python_version < "3.12" -toml==0.10.2 ; python_version >= "3.8" and python_version < "3.12" +scipy==1.11.4 ; python_version >= "3.9" and python_version < "3.13" +secretstorage==3.3.3 ; python_version >= "3.8" and python_version < "3.13" and sys_platform == "linux" +selenium==4.16.0 ; python_version >= "3.8" and python_version < "3.13" +seletools==1.4.0 ; python_version >= "3.8" and python_version < "3.13" +setuptools==69.0.3 ; python_version >= "3.8" and python_version < "3.13" +six==1.16.0 ; python_version >= "3.8" and python_version < "3.13" +sniffio==1.3.0 ; python_version >= "3.8" and python_version < "3.13" +snowballstemmer==2.2.0 ; python_version >= "3.8" and python_version < "3.13" +sortedcontainers==2.4.0 ; python_version >= "3.8" and python_version < "3.13" +sphinx-rtd-theme==1.3.0 ; python_version >= "3.8" and python_version < "3.13" +sphinx==7.1.2 ; python_version >= "3.8" and python_version < "3.13" +sphinxcontrib-applehelp==1.0.4 ; python_version >= "3.8" and python_version < "3.13" +sphinxcontrib-devhelp==1.0.2 ; python_version >= "3.8" and python_version < "3.13" +sphinxcontrib-htmlhelp==2.0.1 ; python_version >= "3.8" and python_version < "3.13" +sphinxcontrib-jquery==4.1 ; python_version >= "3.8" and python_version < "3.13" +sphinxcontrib-jsmath==1.0.1 ; python_version >= "3.8" and python_version < "3.13" +sphinxcontrib-qthelp==1.0.3 ; python_version >= "3.8" and python_version < "3.13" +sphinxcontrib-serializinghtml==1.1.5 ; python_version >= "3.8" and python_version < "3.13" +statsd==4.0.1 ; python_version >= "3.8" and python_version < "3.13" +testfixtures==7.2.2 ; python_version >= "3.8" and python_version < "3.13" +text-unidecode==1.3 ; python_version >= "3.8" and python_version < "3.13" +tinydb==4.8.0 ; python_version >= "3.8" and python_version < "3.13" +toml==0.10.2 ; python_version >= "3.8" and python_version < "3.13" tomli==2.0.1 ; python_version >= "3.8" and python_full_version <= "3.11.0a6" -trio-websocket==0.11.1 ; python_version >= "3.8" and python_version < "3.12" -trio==0.23.2 ; python_version >= "3.8" and python_version < "3.12" -tuspy==1.0.3 ; python_version >= "3.8" and python_version < "3.12" -twill==3.2.1 ; python_version >= "3.8" and python_version < "3.12" -twine==4.0.2 ; python_version >= "3.8" and python_version < "3.12" -typing-extensions==4.9.0 ; python_version >= "3.8" and python_version < "3.12" -tzdata==2023.4 ; python_version >= "3.8" and python_version < "3.12" -urllib3==1.26.18 ; python_version >= "3.8" and python_version < "3.12" -urllib3[socks]==1.26.18 ; python_version >= "3.8" and python_version < "3.12" -vine==5.1.0 ; python_version >= "3.8" and python_version < "3.12" -watchdog==3.0.0 ; python_version >= "3.8" and python_version < "3.12" -wcwidth==0.2.13 ; python_version >= "3.8" and python_version < "3.12" -werkzeug==3.0.1 ; python_version >= "3.8" and python_version < "3.12" -wrapt==1.16.0 ; python_version >= "3.8" and python_version < "3.12" -wsproto==1.2.0 ; python_version >= "3.8" and python_version < "3.12" -yarl==1.9.4 ; python_version >= "3.8" and python_version < "3.12" -zipp==3.17.0 ; python_version >= "3.8" and python_version < "3.12" +trio-websocket==0.11.1 ; python_version >= "3.8" and python_version < "3.13" +trio==0.23.2 ; python_version >= "3.8" and python_version < "3.13" +tuspy==1.0.3 ; python_version >= "3.8" and python_version < "3.13" +twill==3.2.1 ; python_version >= "3.8" and python_version < "3.13" +twine==4.0.2 ; python_version >= "3.8" and python_version < "3.13" +typing-extensions==4.9.0 ; python_version >= "3.8" and python_version < "3.13" +tzdata==2023.4 ; python_version >= "3.8" and python_version < "3.13" +urllib3==1.26.18 ; python_version >= "3.8" and python_version < "3.13" +urllib3[socks]==1.26.18 ; python_version >= "3.8" and python_version < "3.13" +vine==5.1.0 ; python_version >= "3.8" and python_version < "3.13" +watchdog==3.0.0 ; python_version >= "3.8" and python_version < "3.13" +wcwidth==0.2.13 ; python_version >= "3.8" and python_version < "3.13" +werkzeug==3.0.1 ; python_version >= "3.8" and python_version < "3.13" +wrapt==1.16.0 ; python_version >= "3.8" and python_version < "3.13" +wsproto==1.2.0 ; python_version >= "3.8" and python_version < "3.13" +yarl==1.9.4 ; python_version >= "3.8" and python_version < "3.13" +zipp==3.17.0 ; python_version >= "3.8" and python_version < "3.13" diff --git a/lib/galaxy/dependencies/pinned-requirements.txt b/lib/galaxy/dependencies/pinned-requirements.txt index 18cf6fcde70c..7fca5e0adc58 100644 --- a/lib/galaxy/dependencies/pinned-requirements.txt +++ b/lib/galaxy/dependencies/pinned-requirements.txt @@ -1,216 +1,218 @@ -a2wsgi==1.10.0 ; python_version >= "3.8" and python_version < "3.12" -adal==1.2.7 ; python_version >= "3.8" and python_version < "3.12" -aiobotocore==2.9.0 ; python_version >= "3.8" and python_version < "3.12" -aiodataloader==0.4.0 ; python_version >= "3.8" and python_version < "3.12" -aiofiles==23.2.1 ; python_version >= "3.8" and python_version < "3.12" -aiohttp==3.9.1 ; python_version >= "3.8" and python_version < "3.12" -aioitertools==0.11.0 ; python_version >= "3.8" and python_version < "3.12" -aiosignal==1.3.1 ; python_version >= "3.8" and python_version < "3.12" -alembic==1.13.1 ; python_version >= "3.8" and python_version < "3.12" -amqp==5.2.0 ; python_version >= "3.8" and python_version < "3.12" -aniso8601==9.0.1 ; python_version >= "3.8" and python_version < "3.12" -anyio==4.2.0 ; python_version >= "3.8" and python_version < "3.12" -apispec==6.3.1 ; python_version >= "3.8" and python_version < "3.12" -appdirs==1.4.4 ; python_version >= "3.8" and python_version < "3.12" -arcp==0.2.1 ; python_version >= "3.8" and python_version < "3.12" -argcomplete==3.2.1 ; python_version >= "3.8" and python_version < "3.12" +a2wsgi==1.10.0 ; python_version >= "3.8" and python_version < "3.13" +adal==1.2.7 ; python_version >= "3.8" and python_version < "3.13" +aiobotocore==2.9.0 ; python_version >= "3.8" and python_version < "3.13" +aiodataloader==0.4.0 ; python_version >= "3.8" and python_version < "3.13" +aiofiles==23.2.1 ; python_version >= "3.8" and python_version < "3.13" +aiohttp==3.9.1 ; python_version >= "3.8" and python_version < "3.13" +aioitertools==0.11.0 ; python_version >= "3.8" and python_version < "3.13" +aiosignal==1.3.1 ; python_version >= "3.8" and python_version < "3.13" +alembic==1.13.1 ; python_version >= "3.8" and python_version < "3.13" +amqp==5.2.0 ; python_version >= "3.8" and python_version < "3.13" +aniso8601==9.0.1 ; python_version >= "3.8" and python_version < "3.13" +annotated-types==0.6.0 ; python_version >= "3.8" and python_version < "3.13" +anyio==4.2.0 ; python_version >= "3.8" and python_version < "3.13" +apispec==6.3.1 ; python_version >= "3.8" and python_version < "3.13" +appdirs==1.4.4 ; python_version >= "3.8" and python_version < "3.13" +arcp==0.2.1 ; python_version >= "3.8" and python_version < "3.13" +argcomplete==3.2.1 ; python_version >= "3.8" and python_version < "3.13" async-timeout==4.0.3 ; python_version >= "3.8" and python_version < "3.11" -attmap==0.13.2 ; python_version >= "3.8" and python_version < "3.12" -attrs==23.2.0 ; python_version >= "3.8" and python_version < "3.12" -babel==2.14.0 ; python_version >= "3.8" and python_version < "3.12" +attmap==0.13.2 ; python_version >= "3.8" and python_version < "3.13" +attrs==23.2.0 ; python_version >= "3.8" and python_version < "3.13" +babel==2.14.0 ; python_version >= "3.8" and python_version < "3.13" backports-zoneinfo==0.2.1 ; python_version >= "3.8" and python_version < "3.9" backports-zoneinfo[tzdata]==0.2.1 ; python_version >= "3.8" and python_version < "3.9" -bagit-profile==1.3.1 ; python_version >= "3.8" and python_version < "3.12" -bagit==1.8.1 ; python_version >= "3.8" and python_version < "3.12" -bcrypt==4.1.2 ; python_version >= "3.8" and python_version < "3.12" -bdbag==1.7.1 ; python_version >= "3.8" and python_version < "3.12" -beaker==1.12.1 ; python_version >= "3.8" and python_version < "3.12" -billiard==4.2.0 ; python_version >= "3.8" and python_version < "3.12" -bioblend==1.2.0 ; python_version >= "3.8" and python_version < "3.12" -bleach==6.1.0 ; python_version >= "3.8" and python_version < "3.12" -boltons==23.1.1 ; python_version >= "3.8" and python_version < "3.12" -boto==2.49.0 ; python_version >= "3.8" and python_version < "3.12" -botocore==1.33.13 ; python_version >= "3.8" and python_version < "3.12" -bx-python==0.10.0 ; python_version >= "3.8" and python_version < "3.12" -cachecontrol[filecache]==0.13.1 ; python_version >= "3.8" and python_version < "3.12" -celery==5.3.6 ; python_version >= "3.8" and python_version < "3.12" -certifi==2023.11.17 ; python_version >= "3.8" and python_version < "3.12" -cffi==1.16.0 ; python_version >= "3.8" and python_version < "3.12" -charset-normalizer==3.3.2 ; python_version >= "3.8" and python_version < "3.12" -cheetah3==3.2.6.post1 ; python_version >= "3.8" and python_version < "3.12" -circus==0.18.0 ; python_version >= "3.8" and python_version < "3.12" -click-didyoumean==0.3.0 ; python_version >= "3.8" and python_version < "3.12" -click-plugins==1.1.1 ; python_version >= "3.8" and python_version < "3.12" -click-repl==0.3.0 ; python_version >= "3.8" and python_version < "3.12" -click==8.1.7 ; python_version >= "3.8" and python_version < "3.12" -cloudauthz==0.6.0 ; python_version >= "3.8" and python_version < "3.12" -cloudbridge==3.2.0 ; python_version >= "3.8" and python_version < "3.12" -colorama==0.4.6 ; python_version >= "3.8" and python_version < "3.12" and platform_system == "Windows" -coloredlogs==15.0.1 ; python_version >= "3.8" and python_version < "3.12" -conda-package-streaming==0.9.0 ; python_version >= "3.8" and python_version < "3.12" -cryptography==41.0.7 ; python_version >= "3.8" and python_version < "3.12" -cwl-upgrader==1.2.11 ; python_version >= "3.8" and python_version < "3.12" -cwl-utils==0.32 ; python_version >= "3.8" and python_version < "3.12" -cwltool==3.1.20231207110929 ; python_version >= "3.8" and python_version < "3.12" -decorator==5.1.1 ; python_version >= "3.8" and python_version < "3.12" -defusedxml==0.7.1 ; python_version >= "3.8" and python_version < "3.12" -deprecation==2.1.0 ; python_version >= "3.8" and python_version < "3.12" -dictobj==0.4 ; python_version >= "3.8" and python_version < "3.12" -dnspython==2.4.2 ; python_version >= "3.8" and python_version < "3.12" -docopt==0.6.2 ; python_version >= "3.8" and python_version < "3.12" -docutils==0.18.1 ; python_version >= "3.8" and python_version < "3.12" -dparse==0.6.3 ; python_version >= "3.8" and python_version < "3.12" -ecdsa==0.18.0 ; python_version >= "3.8" and python_version < "3.12" -edam-ontology==1.25.2 ; python_version >= "3.8" and python_version < "3.12" -email-validator==2.1.0.post1 ; python_version >= "3.8" and python_version < "3.12" +bagit-profile==1.3.1 ; python_version >= "3.8" and python_version < "3.13" +bagit==1.8.1 ; python_version >= "3.8" and python_version < "3.13" +bcrypt==4.1.2 ; python_version >= "3.8" and python_version < "3.13" +bdbag==1.7.1 ; python_version >= "3.8" and python_version < "3.13" +beaker==1.12.1 ; python_version >= "3.8" and python_version < "3.13" +billiard==4.2.0 ; python_version >= "3.8" and python_version < "3.13" +bioblend==1.2.0 ; python_version >= "3.8" and python_version < "3.13" +bleach==6.1.0 ; python_version >= "3.8" and python_version < "3.13" +boltons==23.1.1 ; python_version >= "3.8" and python_version < "3.13" +boto==2.49.0 ; python_version >= "3.8" and python_version < "3.13" +botocore==1.33.13 ; python_version >= "3.8" and python_version < "3.13" +bx-python==0.10.0 ; python_version >= "3.8" and python_version < "3.13" +cachecontrol[filecache]==0.13.1 ; python_version >= "3.8" and python_version < "3.13" +celery==5.3.6 ; python_version >= "3.8" and python_version < "3.13" +certifi==2023.11.17 ; python_version >= "3.8" and python_version < "3.13" +cffi==1.16.0 ; python_version >= "3.8" and python_version < "3.13" +charset-normalizer==3.3.2 ; python_version >= "3.8" and python_version < "3.13" +cheetah3==3.2.6.post1 ; python_version >= "3.8" and python_version < "3.13" +circus==0.18.0 ; python_version >= "3.8" and python_version < "3.13" +click-didyoumean==0.3.0 ; python_version >= "3.8" and python_version < "3.13" +click-plugins==1.1.1 ; python_version >= "3.8" and python_version < "3.13" +click-repl==0.3.0 ; python_version >= "3.8" and python_version < "3.13" +click==8.1.7 ; python_version >= "3.8" and python_version < "3.13" +cloudauthz==0.6.0 ; python_version >= "3.8" and python_version < "3.13" +cloudbridge==3.2.0 ; python_version >= "3.8" and python_version < "3.13" +colorama==0.4.6 ; python_version >= "3.8" and python_version < "3.13" and platform_system == "Windows" +coloredlogs==15.0.1 ; python_version >= "3.8" and python_version < "3.13" +conda-package-streaming==0.9.0 ; python_version >= "3.8" and python_version < "3.13" +cryptography==41.0.7 ; python_version >= "3.8" and python_version < "3.13" +cwl-upgrader==1.2.11 ; python_version >= "3.8" and python_version < "3.13" +cwl-utils==0.32 ; python_version >= "3.8" and python_version < "3.13" +cwltool==3.1.20231207110929 ; python_version >= "3.8" and python_version < "3.13" +decorator==5.1.1 ; python_version >= "3.8" and python_version < "3.13" +defusedxml==0.7.1 ; python_version >= "3.8" and python_version < "3.13" +deprecation==2.1.0 ; python_version >= "3.8" and python_version < "3.13" +dictobj==0.4 ; python_version >= "3.8" and python_version < "3.13" +dnspython==2.5.0 ; python_version >= "3.8" and python_version < "3.13" +docopt==0.6.2 ; python_version >= "3.8" and python_version < "3.13" +docutils==0.18.1 ; python_version >= "3.8" and python_version < "3.13" +dparse==0.6.3 ; python_version >= "3.8" and python_version < "3.13" +ecdsa==0.18.0 ; python_version >= "3.8" and python_version < "3.13" +edam-ontology==1.25.2 ; python_version >= "3.8" and python_version < "3.13" +email-validator==2.1.0.post1 ; python_version >= "3.8" and python_version < "3.13" exceptiongroup==1.2.0 ; python_version >= "3.8" and python_version < "3.11" -fastapi==0.108.0 ; python_version >= "3.8" and python_version < "3.12" -filelock==3.13.1 ; python_version >= "3.8" and python_version < "3.12" -frozenlist==1.4.1 ; python_version >= "3.8" and python_version < "3.12" -fs==2.4.16 ; python_version >= "3.8" and python_version < "3.12" -fsspec==2023.12.2 ; python_version >= "3.8" and python_version < "3.12" -future==0.18.3 ; python_version >= "3.8" and python_version < "3.12" -galaxy-sequence-utils==1.1.5 ; python_version >= "3.8" and python_version < "3.12" -galaxy2cwl==0.1.4 ; python_version >= "3.8" and python_version < "3.12" -graphene-sqlalchemy==3.0.0rc1 ; python_version >= "3.8" and python_version < "3.12" -graphene==3.3 ; python_version >= "3.8" and python_version < "3.12" -graphql-core==3.2.3 ; python_version >= "3.8" and python_version < "3.12" -graphql-relay==3.2.0 ; python_version >= "3.8" and python_version < "3.12" -gravity==1.0.5 ; python_version >= "3.8" and python_version < "3.12" -greenlet==3.0.1 ; python_version >= "3.8" and (platform_machine == "aarch64" or platform_machine == "ppc64le" or platform_machine == "x86_64" or platform_machine == "amd64" or platform_machine == "AMD64" or platform_machine == "win32" or platform_machine == "WIN32") and python_version < "3.12" -gunicorn==21.2.0 ; python_version >= "3.8" and python_version < "3.12" -gxformat2==0.18.0 ; python_version >= "3.8" and python_version < "3.12" -h11==0.14.0 ; python_version >= "3.8" and python_version < "3.12" -h5grove==1.3.0 ; python_version >= "3.8" and python_version < "3.12" -h5py==3.10.0 ; python_version >= "3.8" and python_version < "3.12" -humanfriendly==10.0 ; python_version >= "3.8" and python_version < "3.12" -idna==3.6 ; python_version >= "3.8" and python_version < "3.12" -importlib-metadata==7.0.1 ; python_version >= "3.8" and python_version < "3.12" +fastapi==0.108.0 ; python_version >= "3.8" and python_version < "3.13" +filelock==3.13.1 ; python_version >= "3.8" and python_version < "3.13" +frozenlist==1.4.1 ; python_version >= "3.8" and python_version < "3.13" +fs==2.4.16 ; python_version >= "3.8" and python_version < "3.13" +fsspec==2023.12.2 ; python_version >= "3.8" and python_version < "3.13" +future @ git+https://github.com/nsoranzo/python-future.git@74d834334d1f97cf5f874d601e88edae978da578 ; python_version >= "3.8" and python_version < "3.13" +galaxy-sequence-utils==1.1.5 ; python_version >= "3.8" and python_version < "3.13" +galaxy2cwl==0.1.4 ; python_version >= "3.8" and python_version < "3.13" +graphene-sqlalchemy==3.0.0rc1 ; python_version >= "3.8" and python_version < "3.13" +graphene==3.3 ; python_version >= "3.8" and python_version < "3.13" +graphql-core==3.2.3 ; python_version >= "3.8" and python_version < "3.13" +graphql-relay==3.2.0 ; python_version >= "3.8" and python_version < "3.13" +gravity==1.0.5 ; python_version >= "3.8" and python_version < "3.13" +greenlet==3.0.1 ; python_version >= "3.8" and (platform_machine == "aarch64" or platform_machine == "ppc64le" or platform_machine == "x86_64" or platform_machine == "amd64" or platform_machine == "AMD64" or platform_machine == "win32" or platform_machine == "WIN32") and python_version < "3.13" +gunicorn==21.2.0 ; python_version >= "3.8" and python_version < "3.13" +gxformat2==0.18.0 ; python_version >= "3.8" and python_version < "3.13" +h11==0.14.0 ; python_version >= "3.8" and python_version < "3.13" +h5grove==1.3.0 ; python_version >= "3.8" and python_version < "3.13" +h5py==3.10.0 ; python_version >= "3.8" and python_version < "3.13" +humanfriendly==10.0 ; python_version >= "3.8" and python_version < "3.13" +idna==3.6 ; python_version >= "3.8" and python_version < "3.13" +importlib-metadata==7.0.1 ; python_version >= "3.8" and python_version < "3.13" importlib-resources==6.1.1 ; python_version >= "3.8" and python_version < "3.9" -isa-rwval==0.10.10 ; python_version >= "3.8" and python_version < "3.12" -isodate==0.6.1 ; python_version >= "3.8" and python_version < "3.12" -jinja2==3.1.2 ; python_version >= "3.8" and python_version < "3.12" -jmespath==1.0.1 ; python_version >= "3.8" and python_version < "3.12" -jsonref==1.1.0 ; python_version >= "3.8" and python_version < "3.12" -jsonschema-specifications==2023.12.1 ; python_version >= "3.8" and python_version < "3.12" -jsonschema==4.20.0 ; python_version >= "3.8" and python_version < "3.12" -kombu==5.3.4 ; python_version >= "3.8" and python_version < "3.12" -lagom==2.6.0 ; python_version >= "3.8" and python_version < "3.12" -lxml==4.9.4 ; python_version >= "3.8" and python_version < "3.12" -mako==1.3.0 ; python_version >= "3.8" and python_version < "3.12" -markdown-it-py==3.0.0 ; python_version >= "3.8" and python_version < "3.12" -markdown==3.5.1 ; python_version >= "3.8" and python_version < "3.12" -markupsafe==2.1.3 ; python_version >= "3.8" and python_version < "3.12" -mdurl==0.1.2 ; python_version >= "3.8" and python_version < "3.12" -mercurial==6.6.1 ; python_version >= "3.8" and python_version < "3.12" -mistune==2.0.5 ; python_version >= "3.8" and python_version < "3.12" -mrcfile==1.4.3 ; python_version >= "3.8" and python_version < "3.12" -msal==1.26.0 ; python_version >= "3.8" and python_version < "3.12" -msgpack==1.0.7 ; python_version >= "3.8" and python_version < "3.12" -multidict==6.0.4 ; python_version >= "3.8" and python_version < "3.12" -mypy-extensions==1.0.0 ; python_version >= "3.8" and python_version < "3.12" -networkx==2.5 ; python_version >= "3.8" and python_version < "3.12" -nodeenv==1.8.0 ; python_version >= "3.8" and python_version < "3.12" +isa-rwval==0.10.10 ; python_version >= "3.8" and python_version < "3.13" +isodate==0.6.1 ; python_version >= "3.8" and python_version < "3.13" +jinja2==3.1.2 ; python_version >= "3.8" and python_version < "3.13" +jmespath==1.0.1 ; python_version >= "3.8" and python_version < "3.13" +jsonref==1.1.0 ; python_version >= "3.8" and python_version < "3.13" +jsonschema-specifications==2023.12.1 ; python_version >= "3.8" and python_version < "3.13" +jsonschema==4.20.0 ; python_version >= "3.8" and python_version < "3.13" +kombu==5.3.4 ; python_version >= "3.8" and python_version < "3.13" +lagom==2.6.0 ; python_version >= "3.8" and python_version < "3.13" +lxml==4.9.4 ; python_version >= "3.8" and python_version < "3.13" +mako==1.3.0 ; python_version >= "3.8" and python_version < "3.13" +markdown-it-py==3.0.0 ; python_version >= "3.8" and python_version < "3.13" +markdown==3.5.1 ; python_version >= "3.8" and python_version < "3.13" +markupsafe==2.1.3 ; python_version >= "3.8" and python_version < "3.13" +mdurl==0.1.2 ; python_version >= "3.8" and python_version < "3.13" +mercurial==6.6.1 ; python_version >= "3.8" and python_version < "3.13" +mistune==2.0.5 ; python_version >= "3.8" and python_version < "3.13" +mrcfile==1.4.3 ; python_version >= "3.8" and python_version < "3.13" +msal==1.26.0 ; python_version >= "3.8" and python_version < "3.13" +msgpack==1.0.7 ; python_version >= "3.8" and python_version < "3.13" +multidict==6.0.4 ; python_version >= "3.8" and python_version < "3.13" +mypy-extensions==1.0.0 ; python_version >= "3.8" and python_version < "3.13" +networkx==2.5 ; python_version >= "3.8" and python_version < "3.13" +nodeenv==1.8.0 ; python_version >= "3.8" and python_version < "3.13" numpy==1.24.4 ; python_version >= "3.8" and python_version < "3.9" -numpy==1.26.3 ; python_version >= "3.9" and python_version < "3.12" -oauthlib==3.2.2 ; python_version >= "3.8" and python_version < "3.12" -orjson==3.9.10 ; python_version >= "3.8" and python_version < "3.12" -oyaml==1.0 ; python_version >= "3.8" and python_version < "3.12" -packaging==23.2 ; python_version >= "3.8" and python_version < "3.12" -paramiko==3.4.0 ; python_version >= "3.8" and python_version < "3.12" -parsley==1.3 ; python_version >= "3.8" and python_version < "3.12" -paste==3.7.1 ; python_version >= "3.8" and python_version < "3.12" -pastedeploy==3.1.0 ; python_version >= "3.8" and python_version < "3.12" -pebble==5.0.6 ; python_version >= "3.8" and python_version < "3.12" +numpy==1.26.3 ; python_version >= "3.9" and python_version < "3.13" +oauthlib==3.2.2 ; python_version >= "3.8" and python_version < "3.13" +orjson==3.9.10 ; python_version >= "3.8" and python_version < "3.13" +oyaml==1.0 ; python_version >= "3.8" and python_version < "3.13" +packaging==23.2 ; python_version >= "3.8" and python_version < "3.13" +paramiko==3.4.0 ; python_version >= "3.8" and python_version < "3.13" +parsley==1.3 ; python_version >= "3.8" and python_version < "3.13" +paste==3.7.1 ; python_version >= "3.8" and python_version < "3.13" +pastedeploy==3.1.0 ; python_version >= "3.8" and python_version < "3.13" +pebble==5.0.6 ; python_version >= "3.8" and python_version < "3.13" pkgutil-resolve-name==1.3.10 ; python_version >= "3.8" and python_version < "3.9" -promise==2.3 ; python_version >= "3.8" and python_version < "3.12" -prompt-toolkit==3.0.43 ; python_version >= "3.8" and python_version < "3.12" -prov==1.5.1 ; python_version >= "3.8" and python_version < "3.12" -psutil==5.9.7 ; python_version >= "3.8" and python_version < "3.12" -pulsar-galaxy-lib==0.15.6 ; python_version >= "3.8" and python_version < "3.12" -pyasn1==0.5.1 ; python_version >= "3.8" and python_version < "3.12" -pycparser==2.21 ; python_version >= "3.8" and python_version < "3.12" -pycryptodome==3.19.1 ; python_version >= "3.8" and python_version < "3.12" -pydantic-tes==0.1.5 ; python_version >= "3.8" and python_version < "3.12" -pydantic==2.5.3 ; python_version >= "3.8" and python_version < "3.12" -pydantic[email]==2.5.3 ; python_version >= "3.8" and python_version < "3.12" -pydot==2.0.0 ; python_version >= "3.8" and python_version < "3.12" -pyeventsystem==0.1.0 ; python_version >= "3.8" and python_version < "3.12" -pyfaidx==0.7.2.2 ; python_version >= "3.8" and python_version < "3.12" -pygments==2.17.2 ; python_version >= "3.8" and python_version < "3.12" -pyjwt==2.8.0 ; python_version >= "3.8" and python_version < "3.12" -pyjwt[crypto]==2.8.0 ; python_version >= "3.8" and python_version < "3.12" -pykwalify==1.8.0 ; python_version >= "3.8" and python_version < "3.12" -pylibmagic==0.5.0 ; python_version >= "3.8" and python_version < "3.12" -pynacl==1.5.0 ; python_version >= "3.8" and python_version < "3.12" -pyparsing==3.1.1 ; python_version >= "3.8" and python_version < "3.12" -pyreadline3==3.4.1 ; sys_platform == "win32" and python_version >= "3.8" and python_version < "3.12" -pysam==0.22.0 ; python_version >= "3.8" and python_version < "3.12" -python-dateutil==2.8.2 ; python_version >= "3.8" and python_version < "3.12" -python-jose==3.3.0 ; python_version >= "3.8" and python_version < "3.12" -python-magic==0.4.27 ; python_version >= "3.8" and python_version < "3.12" -python-multipart==0.0.6 ; python_version >= "3.8" and python_version < "3.12" -python3-openid==3.2.0 ; python_version >= "3.8" and python_version < "3.12" -pytz==2023.3.post1 ; python_version >= "3.8" and python_version < "3.12" -pyyaml==6.0.1 ; python_version >= "3.8" and python_version < "3.12" -pyzmq==25.1.2 ; python_version >= "3.8" and python_version < "3.12" -rdflib==6.3.2 ; python_version >= "3.8" and python_version < "3.12" -referencing==0.32.1 ; python_version >= "3.8" and python_version < "3.12" -refgenconf==0.12.2 ; python_version >= "3.8" and python_version < "3.12" -regex==2023.12.25 ; python_version >= "3.8" and python_version < "3.12" -repoze-lru==0.7 ; python_version >= "3.8" and python_version < "3.12" -requests-oauthlib==1.3.1 ; python_version >= "3.8" and python_version < "3.12" -requests-toolbelt==1.0.0 ; python_version >= "3.8" and python_version < "3.12" -requests-unixsocket==0.3.0 ; python_version >= "3.8" and python_version < "3.12" -requests==2.31.0 ; python_version >= "3.8" and python_version < "3.12" -rich==13.7.0 ; python_version >= "3.8" and python_version < "3.12" -rocrate==0.9.0 ; python_version >= "3.8" and python_version < "3.12" -routes==2.5.1 ; python_version >= "3.8" and python_version < "3.12" -rpds-py==0.16.2 ; python_version >= "3.8" and python_version < "3.12" -rsa==4.9 ; python_version >= "3.8" and python_version < "3.12" -ruamel-yaml-clib==0.2.8 ; platform_python_implementation == "CPython" and python_version < "3.12" and python_version >= "3.8" -ruamel-yaml==0.18.5 ; python_version >= "3.8" and python_version < "3.12" -s3fs==2023.12.2 ; python_version >= "3.8" and python_version < "3.12" -schema-salad==8.5.20240102191335 ; python_version >= "3.8" and python_version < "3.12" -setuptools-scm==5.0.2 ; python_version >= "3.8" and python_version < "3.12" -setuptools==69.0.3 ; python_version >= "3.8" and python_version < "3.12" -shellescape==3.8.1 ; python_version >= "3.8" and python_version < "3.12" -six==1.16.0 ; python_version >= "3.8" and python_version < "3.12" -sniffio==1.3.0 ; python_version >= "3.8" and python_version < "3.12" -social-auth-core[openidconnect]==4.0.3 ; python_version >= "3.8" and python_version < "3.12" -sortedcontainers==2.4.0 ; python_version >= "3.8" and python_version < "3.12" -spython==0.3.13 ; python_version >= "3.8" and python_version < "3.12" -sqlalchemy==1.4.51 ; python_version >= "3.8" and python_version < "3.12" -sqlitedict==2.1.0 ; python_version >= "3.8" and python_version < "3.12" -sqlparse==0.4.4 ; python_version >= "3.8" and python_version < "3.12" -starlette-context==0.3.6 ; python_version >= "3.8" and python_version < "3.12" -starlette-graphene3==0.6.0 ; python_version >= "3.8" and python_version < "3.12" -starlette==0.32.0.post1 ; python_version >= "3.8" and python_version < "3.12" -supervisor==4.2.5 ; python_version >= "3.8" and python_version < "3.12" -svgwrite==1.4.3 ; python_version >= "3.8" and python_version < "3.12" -tenacity==8.2.3 ; python_version >= "3.8" and python_version < "3.12" -tifffile==2023.7.10 ; python_version >= "3.8" and python_version < "3.12" -tinydb==4.8.0 ; python_version >= "3.8" and python_version < "3.12" +promise==2.3 ; python_version >= "3.8" and python_version < "3.13" +prompt-toolkit==3.0.43 ; python_version >= "3.8" and python_version < "3.13" +prov==1.5.1 ; python_version >= "3.8" and python_version < "3.13" +psutil==5.9.7 ; python_version >= "3.8" and python_version < "3.13" +pulsar-galaxy-lib==0.15.6 ; python_version >= "3.8" and python_version < "3.13" +pyasn1==0.5.1 ; python_version >= "3.8" and python_version < "3.13" +pycparser==2.21 ; python_version >= "3.8" and python_version < "3.13" +pycryptodome==3.19.1 ; python_version >= "3.8" and python_version < "3.13" +pydantic-core==2.14.6 ; python_version >= "3.8" and python_version < "3.13" +pydantic-tes==0.1.5 ; python_version >= "3.8" and python_version < "3.13" +pydantic==2.5.3 ; python_version >= "3.8" and python_version < "3.13" +pydantic[email]==2.5.3 ; python_version >= "3.8" and python_version < "3.13" +pydot==2.0.0 ; python_version >= "3.8" and python_version < "3.13" +pyeventsystem==0.1.0 ; python_version >= "3.8" and python_version < "3.13" +pyfaidx==0.7.2.2 ; python_version >= "3.8" and python_version < "3.13" +pygments==2.17.2 ; python_version >= "3.8" and python_version < "3.13" +pyjwt==2.8.0 ; python_version >= "3.8" and python_version < "3.13" +pyjwt[crypto]==2.8.0 ; python_version >= "3.8" and python_version < "3.13" +pykwalify==1.8.0 ; python_version >= "3.8" and python_version < "3.13" +pylibmagic==0.5.0 ; python_version >= "3.8" and python_version < "3.13" +pynacl==1.5.0 ; python_version >= "3.8" and python_version < "3.13" +pyparsing==3.1.1 ; python_version >= "3.8" and python_version < "3.13" +pyreadline3==3.4.1 ; sys_platform == "win32" and python_version >= "3.8" and python_version < "3.13" +pysam==0.22.0 ; python_version >= "3.8" and python_version < "3.13" +python-dateutil==2.8.2 ; python_version >= "3.8" and python_version < "3.13" +python-jose==3.3.0 ; python_version >= "3.8" and python_version < "3.13" +python-magic==0.4.27 ; python_version >= "3.8" and python_version < "3.13" +python-multipart==0.0.6 ; python_version >= "3.8" and python_version < "3.13" +python3-openid==3.2.0 ; python_version >= "3.8" and python_version < "3.13" +pytz==2023.3.post1 ; python_version >= "3.8" and python_version < "3.13" +pyyaml==6.0.1 ; python_version >= "3.8" and python_version < "3.13" +pyzmq==25.1.2 ; python_version >= "3.8" and python_version < "3.13" +rdflib==6.3.2 ; python_version >= "3.8" and python_version < "3.13" +referencing==0.32.1 ; python_version >= "3.8" and python_version < "3.13" +refgenconf==0.12.2 ; python_version >= "3.8" and python_version < "3.13" +regex==2023.12.25 ; python_version >= "3.8" and python_version < "3.13" +repoze-lru==0.7 ; python_version >= "3.8" and python_version < "3.13" +requests-oauthlib==1.3.1 ; python_version >= "3.8" and python_version < "3.13" +requests-toolbelt==1.0.0 ; python_version >= "3.8" and python_version < "3.13" +requests-unixsocket==0.3.0 ; python_version >= "3.8" and python_version < "3.13" +requests==2.31.0 ; python_version >= "3.8" and python_version < "3.13" +rich==13.7.0 ; python_version >= "3.8" and python_version < "3.13" +rocrate==0.9.0 ; python_version >= "3.8" and python_version < "3.13" +routes==2.5.1 ; python_version >= "3.8" and python_version < "3.13" +rpds-py==0.16.2 ; python_version >= "3.8" and python_version < "3.13" +rsa==4.9 ; python_version >= "3.8" and python_version < "3.13" +ruamel-yaml-clib==0.2.8 ; platform_python_implementation == "CPython" and python_version < "3.13" and python_version >= "3.8" +ruamel-yaml==0.18.5 ; python_version >= "3.8" and python_version < "3.13" +s3fs==2023.12.2 ; python_version >= "3.8" and python_version < "3.13" +schema-salad==8.5.20240102191335 ; python_version >= "3.8" and python_version < "3.13" +setuptools-scm==5.0.2 ; python_version >= "3.8" and python_version < "3.13" +setuptools==69.0.3 ; python_version >= "3.8" and python_version < "3.13" +shellescape==3.8.1 ; python_version >= "3.8" and python_version < "3.13" +six==1.16.0 ; python_version >= "3.8" and python_version < "3.13" +sniffio==1.3.0 ; python_version >= "3.8" and python_version < "3.13" +social-auth-core[openidconnect]==4.0.3 ; python_version >= "3.8" and python_version < "3.13" +sortedcontainers==2.4.0 ; python_version >= "3.8" and python_version < "3.13" +spython==0.3.13 ; python_version >= "3.8" and python_version < "3.13" +sqlalchemy==1.4.51 ; python_version >= "3.8" and python_version < "3.13" +sqlitedict==2.1.0 ; python_version >= "3.8" and python_version < "3.13" +sqlparse==0.4.4 ; python_version >= "3.8" and python_version < "3.13" +starlette-context==0.3.6 ; python_version >= "3.8" and python_version < "3.13" +starlette-graphene3==0.6.0 ; python_version >= "3.8" and python_version < "3.13" +starlette==0.32.0.post1 ; python_version >= "3.8" and python_version < "3.13" +supervisor==4.2.5 ; python_version >= "3.8" and python_version < "3.13" +svgwrite==1.4.3 ; python_version >= "3.8" and python_version < "3.13" +tenacity==8.2.3 ; python_version >= "3.8" and python_version < "3.13" +tifffile==2023.7.10 ; python_version >= "3.8" and python_version < "3.13" +tinydb==4.8.0 ; python_version >= "3.8" and python_version < "3.13" tomli==2.0.1 ; python_version >= "3.8" and python_version < "3.11" -tornado==6.4 ; python_version >= "3.8" and python_version < "3.12" -tqdm==4.66.1 ; python_version >= "3.8" and python_version < "3.12" -tuspy==1.0.3 ; python_version >= "3.8" and python_version < "3.12" -tuswsgi==0.5.5 ; python_version >= "3.8" and python_version < "3.12" -typing-extensions==4.9.0 ; python_version >= "3.8" and python_version < "3.12" -tzdata==2023.4 ; python_version >= "3.8" and python_version < "3.12" -tzlocal==5.2 ; python_version >= "3.8" and python_version < "3.12" -ubiquerg==0.6.3 ; python_version >= "3.8" and python_version < "3.12" -urllib3==1.26.18 ; python_version >= "3.8" and python_version < "3.12" -uvicorn==0.25.0 ; python_version >= "3.8" and python_version < "3.12" -uvloop==0.19.0 ; python_version >= "3.8" and python_version < "3.12" -vine==5.1.0 ; python_version >= "3.8" and python_version < "3.12" -wcwidth==0.2.13 ; python_version >= "3.8" and python_version < "3.12" -webencodings==0.5.1 ; python_version >= "3.8" and python_version < "3.12" -webob==1.8.7 ; python_version >= "3.8" and python_version < "3.12" -whoosh==2.7.4 ; python_version >= "3.8" and python_version < "3.12" -wrapt==1.16.0 ; python_version >= "3.8" and python_version < "3.12" -yacman==0.9.2 ; python_version >= "3.8" and python_version < "3.12" -yarl==1.9.4 ; python_version >= "3.8" and python_version < "3.12" -zipp==3.17.0 ; python_version >= "3.8" and python_version < "3.12" -zipstream-new==1.1.8 ; python_version >= "3.8" and python_version < "3.12" -zstandard==0.22.0 ; python_version >= "3.8" and python_version < "3.12" +tornado==6.4 ; python_version >= "3.8" and python_version < "3.13" +tqdm==4.66.1 ; python_version >= "3.8" and python_version < "3.13" +tuspy==1.0.3 ; python_version >= "3.8" and python_version < "3.13" +tuswsgi==0.5.5 ; python_version >= "3.8" and python_version < "3.13" +typing-extensions==4.9.0 ; python_version >= "3.8" and python_version < "3.13" +tzdata==2023.4 ; python_version >= "3.8" and python_version < "3.13" +tzlocal==5.2 ; python_version >= "3.8" and python_version < "3.13" +ubiquerg==0.6.3 ; python_version >= "3.8" and python_version < "3.13" +urllib3==1.26.18 ; python_version >= "3.8" and python_version < "3.13" +uvicorn==0.25.0 ; python_version >= "3.8" and python_version < "3.13" +uvloop==0.19.0 ; python_version >= "3.8" and python_version < "3.13" +vine==5.1.0 ; python_version >= "3.8" and python_version < "3.13" +wcwidth==0.2.13 ; python_version >= "3.8" and python_version < "3.13" +webencodings==0.5.1 ; python_version >= "3.8" and python_version < "3.13" +webob==1.8.7 ; python_version >= "3.8" and python_version < "3.13" +whoosh==2.7.4 ; python_version >= "3.8" and python_version < "3.13" +wrapt==1.16.0 ; python_version >= "3.8" and python_version < "3.13" +yacman==0.9.2 ; python_version >= "3.8" and python_version < "3.13" +yarl==1.9.4 ; python_version >= "3.8" and python_version < "3.13" +zipp==3.17.0 ; python_version >= "3.8" and python_version < "3.13" +zipstream-new==1.1.8 ; python_version >= "3.8" and python_version < "3.13" +zstandard==0.22.0 ; python_version >= "3.8" and python_version < "3.13" diff --git a/lib/galaxy/dependencies/pinned-typecheck-requirements.txt b/lib/galaxy/dependencies/pinned-typecheck-requirements.txt index 6802040ff366..77f07fd86ab1 100644 --- a/lib/galaxy/dependencies/pinned-typecheck-requirements.txt +++ b/lib/galaxy/dependencies/pinned-typecheck-requirements.txt @@ -1,21 +1,23 @@ -cffi==1.16.0 ; python_version >= "3.8" and python_version < "3.12" -cryptography==41.0.7 ; python_version >= "3.8" and python_version < "3.12" -mypy-extensions==1.0.0 ; python_version >= "3.8" and python_version < "3.12" -mypy==1.8.0 ; python_version >= "3.8" and python_version < "3.12" -pycparser==2.21 ; python_version >= "3.8" and python_version < "3.12" -pydantic==2.5.3 ; python_version >= "3.8" and python_version < "3.12" +annotated-types==0.6.0 ; python_version >= "3.8" and python_version < "3.13" +cffi==1.16.0 ; python_version >= "3.8" and python_version < "3.13" +cryptography==41.0.7 ; python_version >= "3.8" and python_version < "3.13" +mypy-extensions==1.0.0 ; python_version >= "3.8" and python_version < "3.13" +mypy==1.8.0 ; python_version >= "3.8" and python_version < "3.13" +pycparser==2.21 ; python_version >= "3.8" and python_version < "3.13" +pydantic-core==2.14.6 ; python_version >= "3.8" and python_version < "3.13" +pydantic==2.5.3 ; python_version >= "3.8" and python_version < "3.13" tomli==2.0.1 ; python_version >= "3.8" and python_version < "3.11" -types-bleach==6.1.0.1 ; python_version >= "3.8" and python_version < "3.12" -types-boto==2.49.18.9 ; python_version >= "3.8" and python_version < "3.12" -types-contextvars==2.4.7.3 ; python_version >= "3.8" and python_version < "3.12" -types-dataclasses==0.6.6 ; python_version >= "3.8" and python_version < "3.12" -types-docutils==0.20.0.20240106 ; python_version >= "3.8" and python_version < "3.12" -types-markdown==3.5.0.20240106 ; python_version >= "3.8" and python_version < "3.12" -types-paramiko==3.4.0.20240106 ; python_version >= "3.8" and python_version < "3.12" -types-pkg-resources==0.1.3 ; python_version >= "3.8" and python_version < "3.12" -types-python-dateutil==2.8.19.20240106 ; python_version >= "3.8" and python_version < "3.12" -types-pyyaml==6.0.12.12 ; python_version >= "3.8" and python_version < "3.12" -types-requests==2.31.0.6 ; python_version >= "3.8" and python_version < "3.12" -types-six==1.16.21.20240106 ; python_version >= "3.8" and python_version < "3.12" -types-urllib3==1.26.25.14 ; python_version >= "3.8" and python_version < "3.12" -typing-extensions==4.9.0 ; python_version >= "3.8" and python_version < "3.12" +types-bleach==6.1.0.1 ; python_version >= "3.8" and python_version < "3.13" +types-boto==2.49.18.9 ; python_version >= "3.8" and python_version < "3.13" +types-contextvars==2.4.7.3 ; python_version >= "3.8" and python_version < "3.13" +types-dataclasses==0.6.6 ; python_version >= "3.8" and python_version < "3.13" +types-docutils==0.20.0.20240106 ; python_version >= "3.8" and python_version < "3.13" +types-markdown==3.5.0.20240106 ; python_version >= "3.8" and python_version < "3.13" +types-paramiko==3.4.0.20240106 ; python_version >= "3.8" and python_version < "3.13" +types-pkg-resources==0.1.3 ; python_version >= "3.8" and python_version < "3.13" +types-python-dateutil==2.8.19.20240106 ; python_version >= "3.8" and python_version < "3.13" +types-pyyaml==6.0.12.12 ; python_version >= "3.8" and python_version < "3.13" +types-requests==2.31.0.6 ; python_version >= "3.8" and python_version < "3.13" +types-six==1.16.21.20240106 ; python_version >= "3.8" and python_version < "3.13" +types-urllib3==1.26.25.14 ; python_version >= "3.8" and python_version < "3.13" +typing-extensions==4.9.0 ; python_version >= "3.8" and python_version < "3.13" diff --git a/lib/galaxy/dependencies/update.sh b/lib/galaxy/dependencies/update.sh index 01708a54cfe4..ffce51cc6b5e 100755 --- a/lib/galaxy/dependencies/update.sh +++ b/lib/galaxy/dependencies/update.sh @@ -6,8 +6,8 @@ set -e -SUPPORTED_PYTHON_VERSIONS="3.8 3.9 3.10 3.11" -NOT_SUPPORTED_NEXT_PYTHON_VERSION="3.12" +SUPPORTED_PYTHON_VERSIONS="3.8 3.9 3.10 3.11 3.12" +NOT_SUPPORTED_NEXT_PYTHON_VERSION="3.13" this_directory="$(cd "$(dirname "$0")" > /dev/null && pwd)" @@ -86,9 +86,9 @@ split_requirement () { } # For some packages there is no recent version that works on all Python versions -# supported by Galaxy, so Poetry resorts to an old version that didn't have a -# maximum Python version pin. Here we replace any such requirement with multiple -# Python-version-specific requirements. +# supported by Galaxy, so Poetry resorts to an old version. Here we replace any +# such requirement with multiple Python-version-specific requirements. +# Packages which specify a maximum Python version pin: split_requirement matplotlib split_requirement numpy split_requirement scipy diff --git a/lib/galaxy/dependencies/update_lint_requirements.sh b/lib/galaxy/dependencies/update_lint_requirements.sh index 0225d931d11d..623f95f54dc9 100755 --- a/lib/galaxy/dependencies/update_lint_requirements.sh +++ b/lib/galaxy/dependencies/update_lint_requirements.sh @@ -3,9 +3,8 @@ set -e # This script updates the pinned requirements for linting. -# The lint requirements are split from the other ones due to incompatible -# dependencies: flake8 requires importlib-metadata 4.2, while the Galaxy's core -# dependencies depend on importlib-metadata 4.13. +# The lint requirements are split from the other ones since they often have +# incompatible dependencies. THIS_DIRECTORY="$(cd "$(dirname "$0")" > /dev/null && pwd)" diff --git a/lib/galaxy/files/sources/invenio.py b/lib/galaxy/files/sources/invenio.py index 3ddf4fee107b..12fcbd761b19 100644 --- a/lib/galaxy/files/sources/invenio.py +++ b/lib/galaxy/files/sources/invenio.py @@ -294,7 +294,7 @@ def _get_download_file_url(self, record_id: str, filename: str, user_context: Op # TODO: This is a temporary workaround for the fact that the "content" API # does not support downloading files from S3 or other remote storage classes. # More info: https://inveniordm.docs.cern.ch/reference/file_storage/#remote-files-r - download_file_content_url = f"{file_details_url.replace('/api','')}?download=1" + download_file_content_url = f"{file_details_url.replace('/api', '')}?download=1" return download_file_content_url def _is_api_url(self, url: str) -> bool: diff --git a/lib/galaxy/util/resources.py b/lib/galaxy/util/resources.py index 071921a68b77..0e90245539bd 100644 --- a/lib/galaxy/util/resources.py +++ b/lib/galaxy/util/resources.py @@ -2,20 +2,17 @@ """ import sys -if sys.version_info >= (3, 12): - from importlib.resources import ( - Anchor, - as_file, - files, - ) - from importlib.resources.abc import Traversable -elif sys.version_info >= (3, 9): - from importlib.abc import Traversable +if sys.version_info >= (3, 9): from importlib.resources import ( as_file, files, Package as Anchor, ) + + if sys.version_info >= (3, 12): + from importlib.resources.abc import Traversable + else: + from importlib.abc import Traversable else: from importlib_resources import ( as_file, diff --git a/packages/app/setup.cfg b/packages/app/setup.cfg index f9c42b31180a..3dd7e40ee12e 100644 --- a/packages/app/setup.cfg +++ b/packages/app/setup.cfg @@ -13,6 +13,7 @@ classifiers = Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 Programming Language :: Python :: 3.11 + Programming Language :: Python :: 3.12 Topic :: Software Development Topic :: Software Development :: Code Generators Topic :: Software Development :: Testing diff --git a/packages/auth/setup.cfg b/packages/auth/setup.cfg index 5dfbe3c629e2..076669b4c250 100644 --- a/packages/auth/setup.cfg +++ b/packages/auth/setup.cfg @@ -13,6 +13,7 @@ classifiers = Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 Programming Language :: Python :: 3.11 + Programming Language :: Python :: 3.12 Topic :: Software Development Topic :: Software Development :: Code Generators Topic :: Software Development :: Testing diff --git a/packages/config/setup.cfg b/packages/config/setup.cfg index a4bbe8efb729..a377dacfdabb 100644 --- a/packages/config/setup.cfg +++ b/packages/config/setup.cfg @@ -13,6 +13,7 @@ classifiers = Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 Programming Language :: Python :: 3.11 + Programming Language :: Python :: 3.12 Topic :: Software Development Topic :: Software Development :: Code Generators Topic :: Software Development :: Testing diff --git a/packages/data/setup.cfg b/packages/data/setup.cfg index f5ed7b98b714..a9f189d8ef27 100644 --- a/packages/data/setup.cfg +++ b/packages/data/setup.cfg @@ -13,6 +13,7 @@ classifiers = Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 Programming Language :: Python :: 3.11 + Programming Language :: Python :: 3.12 Topic :: Software Development Topic :: Software Development :: Code Generators Topic :: Software Development :: Testing diff --git a/packages/files/setup.cfg b/packages/files/setup.cfg index 3f7f01acaf1b..5ac1eec2acee 100644 --- a/packages/files/setup.cfg +++ b/packages/files/setup.cfg @@ -13,6 +13,7 @@ classifiers = Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 Programming Language :: Python :: 3.11 + Programming Language :: Python :: 3.12 Topic :: Software Development Topic :: Software Development :: Code Generators Topic :: Software Development :: Testing diff --git a/packages/job_execution/setup.cfg b/packages/job_execution/setup.cfg index 1d77581d51ff..4be22661024a 100644 --- a/packages/job_execution/setup.cfg +++ b/packages/job_execution/setup.cfg @@ -13,6 +13,7 @@ classifiers = Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 Programming Language :: Python :: 3.11 + Programming Language :: Python :: 3.12 Topic :: Software Development Topic :: Software Development :: Code Generators Topic :: Software Development :: Testing diff --git a/packages/job_metrics/setup.cfg b/packages/job_metrics/setup.cfg index d9576a25c86d..4d16b381adcc 100644 --- a/packages/job_metrics/setup.cfg +++ b/packages/job_metrics/setup.cfg @@ -14,6 +14,7 @@ classifiers = Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 Programming Language :: Python :: 3.11 + Programming Language :: Python :: 3.12 Topic :: Software Development Topic :: Software Development :: Code Generators Topic :: Software Development :: Testing @@ -38,4 +39,4 @@ python_requires = >=3.7 [options.packages.find] exclude = - tests* \ No newline at end of file + tests* diff --git a/packages/meta/setup.cfg b/packages/meta/setup.cfg index e3d3a152e651..a5ac9edb2620 100644 --- a/packages/meta/setup.cfg +++ b/packages/meta/setup.cfg @@ -14,6 +14,7 @@ classifiers = Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 Programming Language :: Python :: 3.11 + Programming Language :: Python :: 3.12 Topic :: Scientific/Engineering :: Bio-Informatics Topic :: Software Development Topic :: Software Development :: Code Generators diff --git a/packages/navigation/setup.cfg b/packages/navigation/setup.cfg index 7b346eaa30cb..2c8c32db2fab 100644 --- a/packages/navigation/setup.cfg +++ b/packages/navigation/setup.cfg @@ -13,6 +13,7 @@ classifiers = Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 Programming Language :: Python :: 3.11 + Programming Language :: Python :: 3.12 Topic :: Software Development Topic :: Software Development :: Code Generators Topic :: Software Development :: Testing diff --git a/packages/objectstore/setup.cfg b/packages/objectstore/setup.cfg index 7117a92a5ce6..2122a4c390b4 100644 --- a/packages/objectstore/setup.cfg +++ b/packages/objectstore/setup.cfg @@ -14,6 +14,7 @@ classifiers = Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 Programming Language :: Python :: 3.11 + Programming Language :: Python :: 3.12 Topic :: Software Development Topic :: Software Development :: Code Generators Topic :: Software Development :: Testing diff --git a/packages/schema/setup.cfg b/packages/schema/setup.cfg index b80052e2ad40..d732f5a8cdc3 100644 --- a/packages/schema/setup.cfg +++ b/packages/schema/setup.cfg @@ -12,6 +12,8 @@ classifiers = Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 + Programming Language :: Python :: 3.11 + Programming Language :: Python :: 3.12 Topic :: Software Development Topic :: Software Development :: Code Generators Topic :: Software Development :: Testing diff --git a/packages/selenium/setup.cfg b/packages/selenium/setup.cfg index 338943d2013e..79cabcad10b7 100644 --- a/packages/selenium/setup.cfg +++ b/packages/selenium/setup.cfg @@ -13,6 +13,7 @@ classifiers = Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 Programming Language :: Python :: 3.11 + Programming Language :: Python :: 3.12 Topic :: Software Development Topic :: Software Development :: Code Generators Topic :: Software Development :: Testing diff --git a/packages/test_api/setup.cfg b/packages/test_api/setup.cfg index a759e952956e..f429b01114ba 100644 --- a/packages/test_api/setup.cfg +++ b/packages/test_api/setup.cfg @@ -13,6 +13,7 @@ classifiers = Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 Programming Language :: Python :: 3.11 + Programming Language :: Python :: 3.12 Topic :: Software Development Topic :: Software Development :: Code Generators Topic :: Software Development :: Testing diff --git a/packages/test_base/setup.cfg b/packages/test_base/setup.cfg index 17c957eec67a..d0e46454cb0a 100644 --- a/packages/test_base/setup.cfg +++ b/packages/test_base/setup.cfg @@ -13,6 +13,7 @@ classifiers = Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 Programming Language :: Python :: 3.11 + Programming Language :: Python :: 3.12 Topic :: Software Development Topic :: Software Development :: Code Generators Topic :: Software Development :: Testing diff --git a/packages/test_driver/setup.cfg b/packages/test_driver/setup.cfg index 444182cef8a5..9d79fb553c16 100644 --- a/packages/test_driver/setup.cfg +++ b/packages/test_driver/setup.cfg @@ -13,6 +13,7 @@ classifiers = Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 Programming Language :: Python :: 3.11 + Programming Language :: Python :: 3.12 Topic :: Software Development Topic :: Software Development :: Code Generators Topic :: Software Development :: Testing diff --git a/packages/test_selenium/setup.cfg b/packages/test_selenium/setup.cfg index 177fbc9ba8ad..f8993d8da273 100644 --- a/packages/test_selenium/setup.cfg +++ b/packages/test_selenium/setup.cfg @@ -13,6 +13,7 @@ classifiers = Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 Programming Language :: Python :: 3.11 + Programming Language :: Python :: 3.12 Topic :: Software Development Topic :: Software Development :: Code Generators Topic :: Software Development :: Testing diff --git a/packages/tool_shed/setup.cfg b/packages/tool_shed/setup.cfg index 304c61ed9f40..784c1d0edaec 100644 --- a/packages/tool_shed/setup.cfg +++ b/packages/tool_shed/setup.cfg @@ -13,6 +13,7 @@ classifiers = Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 Programming Language :: Python :: 3.11 + Programming Language :: Python :: 3.12 Topic :: Software Development Topic :: Software Development :: Code Generators Topic :: Software Development :: Testing diff --git a/packages/tool_util/setup.cfg b/packages/tool_util/setup.cfg index f382f1a4167b..442c1ef95a46 100644 --- a/packages/tool_util/setup.cfg +++ b/packages/tool_util/setup.cfg @@ -14,6 +14,7 @@ classifiers = Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 Programming Language :: Python :: 3.11 + Programming Language :: Python :: 3.12 Topic :: Software Development Topic :: Software Development :: Code Generators Topic :: Software Development :: Testing diff --git a/packages/tours/setup.cfg b/packages/tours/setup.cfg index 57ab2f4ff51a..af106a9a8aa8 100644 --- a/packages/tours/setup.cfg +++ b/packages/tours/setup.cfg @@ -13,6 +13,7 @@ classifiers = Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 Programming Language :: Python :: 3.11 + Programming Language :: Python :: 3.12 Topic :: Software Development Topic :: Software Development :: Code Generators Topic :: Software Development :: Testing diff --git a/packages/util/setup.cfg b/packages/util/setup.cfg index 39708d11975a..ffa6c59a3346 100644 --- a/packages/util/setup.cfg +++ b/packages/util/setup.cfg @@ -14,6 +14,7 @@ classifiers = Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 Programming Language :: Python :: 3.11 + Programming Language :: Python :: 3.12 Topic :: Software Development Topic :: Software Development :: Code Generators Topic :: Software Development :: Testing @@ -51,7 +52,7 @@ jstree = dictobj template = Cheetah3!=3.2.6.post2 - future + future @ git+https://github.com/nsoranzo/python-future.git@python312-imp-module_past [options.packages.find] exclude = diff --git a/packages/web_apps/setup.cfg b/packages/web_apps/setup.cfg index 6f3ae894e2ea..29caba4e5960 100644 --- a/packages/web_apps/setup.cfg +++ b/packages/web_apps/setup.cfg @@ -13,6 +13,7 @@ classifiers = Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 Programming Language :: Python :: 3.11 + Programming Language :: Python :: 3.12 Topic :: Software Development Topic :: Software Development :: Code Generators Topic :: Software Development :: Testing diff --git a/packages/web_framework/setup.cfg b/packages/web_framework/setup.cfg index 0174c8945028..b6d82df31986 100644 --- a/packages/web_framework/setup.cfg +++ b/packages/web_framework/setup.cfg @@ -13,6 +13,7 @@ classifiers = Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 Programming Language :: Python :: 3.11 + Programming Language :: Python :: 3.12 Topic :: Software Development Topic :: Software Development :: Code Generators Topic :: Software Development :: Testing diff --git a/packages/web_stack/setup.cfg b/packages/web_stack/setup.cfg index 6c1ff8aaee98..11f720e1299f 100644 --- a/packages/web_stack/setup.cfg +++ b/packages/web_stack/setup.cfg @@ -13,6 +13,7 @@ classifiers = Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.10 Programming Language :: Python :: 3.11 + Programming Language :: Python :: 3.12 Topic :: Software Development Topic :: Software Development :: Code Generators Topic :: Software Development :: Testing diff --git a/pyproject.toml b/pyproject.toml index 719823435444..580fe670c094 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -59,7 +59,7 @@ dparse = "*" edam-ontology = "*" fastapi = ">=0.108" fs = "*" -future = "*" +future = { git = "https://github.com/nsoranzo/python-future.git", branch = "python312-imp-module_past" } galaxy_sequence_utils = "*" graphene-sqlalchemy = "3.0.0rc1" # need a beta release to be compat. with starlette plugin gravity = ">=1.0.4" @@ -93,7 +93,7 @@ pykwalify = "*" pylibmagic = "*" pyparsing = "*" pysam = ">=0.21" # for Python 3.11 support on macOS -python = ">=3.8,<3.12" # Keep maximum version strict to appease numpy and scipy +python = ">=3.8,<3.13" # Keep maximum version strict to appease numpy and scipy python-dateutil = "*" python-magic = "*" python-multipart = "*" # required to support form parsing in FastAPI/Starlette diff --git a/test/unit/util/test_fill_template.py b/test/unit/util/test_fill_template.py index 883040b86775..15c708030926 100644 --- a/test/unit/util/test_fill_template.py +++ b/test/unit/util/test_fill_template.py @@ -1,8 +1,15 @@ +import sys + import pytest from Cheetah.NameMapper import NotFound from galaxy.util.template import fill_template +# In Python 3.12 calling `locals()`` inside a comprehension now includes +# variables from outside the comprehension, see +# https://docs.python.org/dev/whatsnew/3.12.html#pep-709-comprehension-inlining +PY312_OR_LATER = sys.version_info[:2] >= (3, 12) + SIMPLE_TEMPLATE = """#for item in $a_list: echo $item #end for @@ -48,8 +55,12 @@ def test_fill_simple_template(): def test_fill_list_comprehension_template(): - with pytest.raises(NotFound): - fill_template(LIST_COMPREHENSION_TEMPLATE, retry=0) + if PY312_OR_LATER: + template_str = fill_template(LIST_COMPREHENSION_TEMPLATE, retry=0) + assert template_str == "echo 1\n" + else: + with pytest.raises(NotFound): + fill_template(LIST_COMPREHENSION_TEMPLATE, retry=0) def test_fill_list_comprehension_template_2(): @@ -58,13 +69,21 @@ def test_fill_list_comprehension_template_2(): def test_fill_dict_comprehension(): - with pytest.raises(NotFound): - fill_template(DICT_COMPREHENSION_TEMPLATE, retry=1) + if PY312_OR_LATER: + template_str = fill_template(DICT_COMPREHENSION_TEMPLATE, retry=1) + assert template_str == "echo 1\n" + else: + with pytest.raises(NotFound): + fill_template(DICT_COMPREHENSION_TEMPLATE, retry=1) def test_set_comprehension(): - with pytest.raises(NotFound): - fill_template(SET_COMPR_TEMPLATE, retry=1) + if PY312_OR_LATER: + template_str = fill_template(SET_COMPR_TEMPLATE, retry=1) + assert template_str == "echo 1\n" + else: + with pytest.raises(NotFound): + fill_template(SET_COMPR_TEMPLATE, retry=1) def test_gen_expr():