From 9e97f1eef789a1ec5d1926611f74e44057d01781 Mon Sep 17 00:00:00 2001 From: Daniel Hollas Date: Wed, 28 May 2025 15:52:47 +0100 Subject: [PATCH 1/2] Unpin and update bpython bpython is an alternative interactive shell, basically lighter-weight ipython. Both can be used for the `verdi shell` command, ipython is installed by default, while bpython is installed via optional 'bpython' extras. Minimum version was bumped to 0.20, which is the first version to support python 3.9. I've removed the upper pin, so that new versions can naturally track new python versions. See bpython changelog: https://github.com/bpython/bpython/blob/main/CHANGELOG.rst --- .pre-commit-config.yaml | 2 +- pyproject.toml | 2 +- uv.lock | 23 +++++++++++++++++------ 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 2289acd6ad..27142e5dcf 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -45,7 +45,7 @@ repos: )$ - repo: https://github.com/astral-sh/uv-pre-commit - rev: 0.7.6 + rev: 0.8.0 hooks: # Check and update the uv lockfile - id: uv-lock diff --git a/pyproject.toml b/pyproject.toml index 1f6a37dce8..d4582a5cda 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -214,7 +214,7 @@ atomic_tools = [ 'spglib>=1.14,<3.0' ] bpython = [ - 'bpython~=0.18.0' + 'bpython~=0.20' ] docs = [ 'pydata-sphinx-theme~=0.15.1', diff --git a/uv.lock b/uv.lock index 406df90edb..9c0ae45a3d 100644 --- a/uv.lock +++ b/uv.lock @@ -1,5 +1,5 @@ version = 1 -revision = 3 +revision = 2 requires-python = ">=3.9" resolution-markers = [ "python_full_version >= '3.12' and sys_platform == 'win32'", @@ -184,7 +184,7 @@ requires-dist = [ { name = "archive-path", specifier = "~=0.4.2" }, { name = "ase", marker = "extra == 'atomic-tools'", specifier = "~=3.21" }, { name = "asyncssh", specifier = "~=2.19.0" }, - { name = "bpython", marker = "extra == 'bpython'", specifier = "~=0.18.0" }, + { name = "bpython", marker = "extra == 'bpython'", specifier = "~=0.20" }, { name = "chardet", marker = "sys_platform == 'win32'", specifier = "~=5.2.0" }, { name = "circus", specifier = "~=0.19.0" }, { name = "click", specifier = ">=8.1.0,<8.3" }, @@ -635,19 +635,21 @@ wheels = [ [[package]] name = "bpython" -version = "0.18" +version = "0.25" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "curtsies", version = "0.4.2", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version < '3.10'" }, { name = "curtsies", version = "0.4.3", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version >= '3.10'" }, + { name = "cwcwidth" }, { name = "greenlet" }, { name = "pygments" }, + { name = "pyxdg" }, { name = "requests" }, - { name = "six" }, + { name = "typing-extensions", marker = "python_full_version < '3.11'" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/cc/af/4ebe98f22713b4d66d57b85d6f3f4d12e7ea208d967df24bf2f666bf0f74/bpython-0.18.tar.gz", hash = "sha256:56cc20dbe568c98c81de4990fddf5862c0d8d3ab0ad1cf7057988abc5f7686c2", size = 213321, upload-time = "2019-04-03T18:15:26.538Z" } +sdist = { url = "https://files.pythonhosted.org/packages/ba/dd/cc02bf66f342a4673867fdf6c1f9fce90ec1e91e651b21bc4af4890101da/bpython-0.25.tar.gz", hash = "sha256:c246fc909ef6dcc26e9d8cb4615b0e6b1613f3543d12269b19ffd0782166c65b", size = 207610, upload-time = "2025-01-17T09:35:22.382Z" } wheels = [ - { url = "https://files.pythonhosted.org/packages/c7/0c/22459d1c7f45faada154b9bb4e04c0000b9cc691cd232b7915667f0a4574/bpython-0.18-py2.py3-none-any.whl", hash = "sha256:c7c6de7309311fd607d6cb47ef7e2d6e065d0a299199d51220d57732850a3efa", size = 183963, upload-time = "2019-04-03T18:15:24.419Z" }, + { url = "https://files.pythonhosted.org/packages/ba/74/5470df025854d5e213793b62cbea032fd66919562662955789fcc5dc17d6/bpython-0.25-py3-none-any.whl", hash = "sha256:28fd86008ca5ef6100ead407c9743aa60c51293a18ba5b18fcacea7f5b7f2257", size = 176131, upload-time = "2025-01-17T09:35:19.444Z" }, ] [[package]] @@ -4647,6 +4649,15 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/47/96/90fa02f19b1eff7469ad7bf0ef8efca248025de9f1d0a0b25682d2aacf68/pywinpty-2.0.15-cp39-cp39-win_amd64.whl", hash = "sha256:d261cd88fcd358cfb48a7ca0700db3e1c088c9c10403c9ebc0d8a8b57aa6a117", size = 1405302, upload-time = "2025-02-03T21:55:40.394Z" }, ] +[[package]] +name = "pyxdg" +version = "0.28" +source = { registry = "https://pypi.org/simple" } +sdist = { url = "https://files.pythonhosted.org/packages/b0/25/7998cd2dec731acbd438fbf91bc619603fc5188de0a9a17699a781840452/pyxdg-0.28.tar.gz", hash = "sha256:3267bb3074e934df202af2ee0868575484108581e6f3cb006af1da35395e88b4", size = 77776, upload-time = "2022-06-05T11:35:01Z" } +wheels = [ + { url = "https://files.pythonhosted.org/packages/e5/8d/cf41b66a8110670e3ad03dab9b759704eeed07fa96e90fdc0357b2ba70e2/pyxdg-0.28-py2.py3-none-any.whl", hash = "sha256:bdaf595999a0178ecea4052b7f4195569c1ff4d344567bccdc12dfdf02d545ab", size = 49520, upload-time = "2022-06-05T11:34:58.832Z" }, +] + [[package]] name = "pyyaml" version = "6.0.2" From e72b593745f0152e398d017ab33c5753f6fc32f2 Mon Sep 17 00:00:00 2001 From: Daniel Hollas Date: Mon, 29 Sep 2025 17:53:09 +0100 Subject: [PATCH 2/2] Bump minimum uv version --- .github/actions/install-aiida-core/action.yml | 2 +- .pre-commit-config.yaml | 2 +- .readthedocs.yml | 4 ++-- pyproject.toml | 2 +- uv.lock | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/actions/install-aiida-core/action.yml b/.github/actions/install-aiida-core/action.yml index 4cae095e3c..ac18a6e978 100644 --- a/.github/actions/install-aiida-core/action.yml +++ b/.github/actions/install-aiida-core/action.yml @@ -34,7 +34,7 @@ runs: - name: Set up uv uses: astral-sh/setup-uv@v6 with: - version: 0.7.6 + version: 0.8.22 python-version: ${{ inputs.python-version }} activate-environment: true diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 27142e5dcf..8666753111 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -45,7 +45,7 @@ repos: )$ - repo: https://github.com/astral-sh/uv-pre-commit - rev: 0.8.0 + rev: 0.8.22 hooks: # Check and update the uv lockfile - id: uv-lock diff --git a/.readthedocs.yml b/.readthedocs.yml index 1926a218f8..9ab91ab5ef 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -17,8 +17,8 @@ build: # https://docs.readthedocs.io/en/stable/build-customization.html#install-dependencies-with-uv pre_create_environment: - asdf plugin add uv - - asdf install uv 0.7.6 - - asdf global uv 0.7.6 + - asdf install uv 0.8.22 + - asdf global uv 0.8.22 create_environment: # Create a virtual environment in '.venv/' folder # which is picked up automatically by `uv sync` and `uv run` commands below diff --git a/pyproject.toml b/pyproject.toml index d4582a5cda..90a802204e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -557,4 +557,4 @@ commands = molecule {posargs:test} # .pre-commit-config.yaml # .github/actions/install-aiida-core/action.yml # .readthedocs.yml -required-version = ">=0.7.0" +required-version = ">=0.8.4" diff --git a/uv.lock b/uv.lock index 9c0ae45a3d..c221ea1839 100644 --- a/uv.lock +++ b/uv.lock @@ -1,5 +1,5 @@ version = 1 -revision = 2 +revision = 3 requires-python = ">=3.9" resolution-markers = [ "python_full_version >= '3.12' and sys_platform == 'win32'",