From c6aa4713be48d902231ca5bf5472f3660376a22f Mon Sep 17 00:00:00 2001 From: Nicola Soranzo Date: Thu, 15 Aug 2024 15:49:04 +0100 Subject: [PATCH] Replace types-pkg-resources with types-setuptools All types-pkg-resources packages have been removed from PyPI: https://pypi.org/project/types-pkg-resources/ in favour of types-setuptools. This is breaking our Update dependencies GitHub workflow, see e.g.: https://github.com/galaxyproject/galaxy/actions/runs/10328479305 --- lib/galaxy/dependencies/pinned-typecheck-requirements.txt | 2 +- pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/galaxy/dependencies/pinned-typecheck-requirements.txt b/lib/galaxy/dependencies/pinned-typecheck-requirements.txt index 0aab0f8b71ce..45c2ad37343e 100644 --- a/lib/galaxy/dependencies/pinned-typecheck-requirements.txt +++ b/lib/galaxy/dependencies/pinned-typecheck-requirements.txt @@ -22,11 +22,11 @@ types-docutils==0.21.0.20240711 ; python_version >= "3.8" and python_version < " types-html5lib==1.1.11.20240228 ; python_version >= "3.8" and python_version < "3.13" types-markdown==3.6.0.20240316 ; python_version >= "3.8" and python_version < "3.13" types-paramiko==3.4.0.20240423 ; 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.9.0.20240316 ; python_version >= "3.8" and python_version < "3.13" types-pyyaml==6.0.12.20240311 ; 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-s3transfer==0.10.1 ; python_version >= "3.8" and python_version < "3.13" +types-setuptools==71.1.0.20240813 ; python_version >= "3.8" and python_version < "3.13" types-six==1.16.21.20240513 ; 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.12.2 ; python_version >= "3.8" and python_version < "3.13" diff --git a/pyproject.toml b/pyproject.toml index 56147a86ef77..27804756a180 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -183,10 +183,10 @@ types-dataclasses = "*" types-docutils = "*" types-Markdown = "*" types-paramiko = "*" -types-pkg-resources = "*" types-python-dateutil = "*" types-PyYAML = "*" types-requests = "*" +types-setuptools = "*" types-six = "*" [tool.ruff]