From 118f2a1f8b09a9505c7211f05b75be1a9b01531f Mon Sep 17 00:00:00 2001 From: wpk Date: Tue, 31 Dec 2024 10:47:17 -0500 Subject: [PATCH] chore: update template --- .python-version | 2 +- Makefile | 2 +- ...1-uvxrun-tools.txt => py312-uvxrun-tools.txt} | 16 ++-------------- ...ash.json => py312-uvxrun-tools.txt.hash.json} | 0 requirements/{py311-dev.yaml => py312-dev.yaml} | 2 +- uv.lock | 2 +- 6 files changed, 6 insertions(+), 18 deletions(-) rename requirements/lock/{py311-uvxrun-tools.txt => py312-uvxrun-tools.txt} (98%) rename requirements/lock/{py311-uvxrun-tools.txt.hash.json => py312-uvxrun-tools.txt.hash.json} (100%) rename requirements/{py311-dev.yaml => py312-dev.yaml} (96%) diff --git a/.python-version b/.python-version index 2c07333..e4fba21 100644 --- a/.python-version +++ b/.python-version @@ -1 +1 @@ -3.11 +3.12 diff --git a/Makefile b/Makefile index d116a10..69b42cf 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ .DEFAULT_GOAL := help -_PY_DEFAULT = 311 +_PY_DEFAULT = $(shell cat .python-version | sed "s/\.//") UVXRUN = uv run --no-config --frozen tools/uvxrun.py UVXRUN_OPTS = -r requirements/lock/py$(_PY_DEFAULT)-uvxrun-tools.txt -v UVXRUN_NO_PROJECT = uv run --with "packaging" --no-project tools/uvxrun.py diff --git a/requirements/lock/py311-uvxrun-tools.txt b/requirements/lock/py312-uvxrun-tools.txt similarity index 98% rename from requirements/lock/py311-uvxrun-tools.txt rename to requirements/lock/py312-uvxrun-tools.txt index db78e03..8593d53 100644 --- a/requirements/lock/py311-uvxrun-tools.txt +++ b/requirements/lock/py312-uvxrun-tools.txt @@ -1,5 +1,5 @@ # This file was autogenerated by uv via the following command: -# uv pip compile --universal --config-file=requirements/uv.toml -p 3.11 requirements/uvxrun-tools.txt -o requirements/lock/py311-uvxrun-tools.txt +# uv pip compile --universal --config-file=requirements/uv.toml -p 3.12 requirements/uvxrun-tools.txt -o requirements/lock/py312-uvxrun-tools.txt annotated-types==0.7.0 \ --hash=sha256:1f02e8b43a8fbbc3f3e0d4f0f4bfc8131bcb4eebe8849b8e5c773f3a1c582a53 \ --hash=sha256:aff07c09a53a08bc8cfccb9c85b05f1aa9a2a6f23728d790723543408344ce89 @@ -16,10 +16,6 @@ autopep8==2.3.1 \ --hash=sha256:8d6c87eba648fdcfc83e29b788910b8643171c395d9c4bcf115ece035b9c9dda \ --hash=sha256:a203fe0fcad7939987422140ab17a930f684763bf7335bdb6709991dd7ef6c2d # via nbqa -backports-tarfile==1.2.0 ; python_full_version < '3.12' \ - --hash=sha256:77e284d754527b01fb1e6fa8a1afe577858ebe4e9dad8919e34c862cb399bc34 \ - --hash=sha256:d75e02c268746e1b8144c278978b6e98e85de6ad16f8e4b0844a154557eca991 - # via jaraco-context beautifulsoup4==4.12.3 \ --hash=sha256:74e3d1928edc070d21748185c46e3fb33490f22f52a3addee9aee0f4f7781051 \ --hash=sha256:b80878c9f40111313e55da8ba20bdba06d8fa3969fc68304167741bbf9e082ed @@ -300,10 +296,6 @@ idna==3.10 \ --hash=sha256:12f65c9b470abda6dc35cf8e63cc574b1c52b11df2c86030af0ac09b01b13ea9 \ --hash=sha256:946d195a0d259cbba61165e88e65941f16e9b36ea6ddb97f00452bae8b1287d3 # via requests -importlib-metadata==8.5.0 ; python_full_version < '3.12' \ - --hash=sha256:45e54197d28b7a7f1559e60b95e7c567032b602131fbd588f1497f47880aa68b \ - --hash=sha256:71522656f0abace1d072b9e5481a48f07c138e00f079c38c8f883823f9c26bd7 - # via keyring ipython==8.31.0 \ --hash=sha256:46ec58f8d3d076a61d128fe517a51eb730e3aaf0c184ea8c17d16e366660c6a6 \ --hash=sha256:b6a2274606bec6166405ff05e54932ed6e5cfecaca1fc05f2cacde7bb074d70b @@ -1059,7 +1051,7 @@ typer==0.15.1 \ typing-extensions==4.12.2 \ --hash=sha256:04e5ca0351e0f3f85c6853954072df659d0d13fac324d0072316b67d7794700d \ --hash=sha256:1a7ead55c7e559dd4dee8856e3a88b41225abfe1ce8df57b7c13915fe121ffb8 - # via conda-lock, ipython, mypy, pydantic, pydantic-core, pyright, python-utils, typer + # via conda-lock, mypy, pydantic, pydantic-core, pyright, python-utils, typer urllib3==1.26.20 \ --hash=sha256:0ed14ccfbf1c30a9072c7ca157e4319b70d65f623e91e7b32fadb2853431016e \ --hash=sha256:40c2dc0c681e47eb8f90e7e27bf6ff7df2e677421fd46756da1161c39ca70d32 @@ -1076,7 +1068,3 @@ webencodings==0.5.1 \ --hash=sha256:a0af1213f3c2226497a97e2b3aa01a7e4bee4f403f95be16fc9acd2947514a78 \ --hash=sha256:b36a1c245f2d304965eb4e0a82848379241dc04b865afcc4aab16748587e1923 # via html5lib -zipp==3.21.0 ; python_full_version < '3.12' \ - --hash=sha256:2c9958f6430a2040341a52eb608ed6dd93ef4392e02ffe219417c1b28b5dd1f4 \ - --hash=sha256:ac1bbe05fd2991f160ebce24ffbac5f6d11d83dc90891255885223d42b3cd931 - # via importlib-metadata diff --git a/requirements/lock/py311-uvxrun-tools.txt.hash.json b/requirements/lock/py312-uvxrun-tools.txt.hash.json similarity index 100% rename from requirements/lock/py311-uvxrun-tools.txt.hash.json rename to requirements/lock/py312-uvxrun-tools.txt.hash.json diff --git a/requirements/py311-dev.yaml b/requirements/py312-dev.yaml similarity index 96% rename from requirements/py311-dev.yaml rename to requirements/py312-dev.yaml index 8e1689c..8308db3 100644 --- a/requirements/py311-dev.yaml +++ b/requirements/py312-dev.yaml @@ -10,7 +10,7 @@ channels: - conda-forge dependencies: - - python=3.11 + - python=3.12 - ipykernel - mypy>=1.14.1 - nox>=2024.4.15 diff --git a/uv.lock b/uv.lock index b1c67cc..f841965 100644 --- a/uv.lock +++ b/uv.lock @@ -2315,7 +2315,7 @@ wheels = [ [[package]] name = "pyproject2conda" -version = "0.15.1.dev4" +version = "0.16.1.dev1" source = { editable = "." } dependencies = [ { name = "packaging" },