From 1aaf2420b29aa749496749998c305e91a60284e1 Mon Sep 17 00:00:00 2001 From: Pavel Zwerschke Date: Sun, 9 Nov 2025 20:35:13 +0100 Subject: [PATCH 1/6] bump conda-forge-metadata --- pixi.toml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pixi.toml b/pixi.toml index e3d5551..e6c6629 100644 --- a/pixi.toml +++ b/pixi.toml @@ -1,4 +1,4 @@ -[project] +[workspace] name = "conda-metadata-app" version = "0.1.0" description = "A streamlit app to query metadata from conda packages" @@ -13,23 +13,20 @@ schema = "python -m conda_metadata_app.app_config" save-version-info = "python -m conda_metadata_app.version_info" postinstall-production = "pip install --no-deps --disable-pip-version-check dist/conda_metadata_app-*.whl" - [dependencies] python = "3.12.*" +pip = "*" pydantic-settings = ">=2.4.0,<3" pydantic = ">=2.8.2,<3" typing-extensions = ">=4.12.2,<5" zstandard = ">=0.23.0,<0.24" py-rattler = ">=0.7.0,<0.8" -conda-forge-metadata = ">=0.11.0,<0.12" +conda-forge-metadata = ">=0.12.0,<0.13" conda-package-streaming = ">=0.12.0,<0.13" conda-oci-mirror = ">=0.2.3,<0.3" streamlit = ">=1.44.0,<2" streamlit-searchbox = "==0.1.20" -[host-dependencies] -pip = "*" - [feature.build.dependencies] python-build = "*" hatchling = "*" @@ -41,6 +38,7 @@ build-wheel = "python -m build --no-isolation --wheel ." pixi-pycharm = ">=0.0.6,<0.0.7" [environments] -default = [] # includes default feature +# includes default feature +default = [] build = ["build"] dev = { features = ["dev"], no-default-feature = true } From fc58bf2eddde0ac33f8693ea5c89326967975554 Mon Sep 17 00:00:00 2001 From: Pavel Zwerschke Date: Sun, 9 Nov 2025 22:25:50 +0100 Subject: [PATCH 2/6] bump --- pixi.lock | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/pixi.lock b/pixi.lock index a566a6d..971edf9 100644 --- a/pixi.lock +++ b/pixi.lock @@ -40,7 +40,7 @@ environments: - conda: https://conda.anaconda.org/conda-forge/noarch/charset-normalizer-3.4.3-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/click-8.3.0-pyh707e725_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/colorama-0.4.6-pyhd8ed1ab_1.conda - - conda: https://conda.anaconda.org/conda-forge/noarch/conda-forge-metadata-0.11.0-pyhd8ed1ab_1.conda + - conda: https://conda.anaconda.org/conda-forge/noarch/conda-forge-metadata-0.12.0-pyhcf101f3_1.conda - conda: https://conda.anaconda.org/conda-forge/noarch/conda-oci-mirror-0.2.3-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/conda-package-handling-2.4.0-pyh7900ff3_2.conda - conda: https://conda.anaconda.org/conda-forge/noarch/conda-package-streaming-0.12.0-pyhd8ed1ab_0.conda @@ -229,7 +229,7 @@ environments: - conda: https://conda.anaconda.org/conda-forge/noarch/charset-normalizer-3.4.3-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/click-8.3.0-pyh707e725_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/colorama-0.4.6-pyhd8ed1ab_1.conda - - conda: https://conda.anaconda.org/conda-forge/noarch/conda-forge-metadata-0.11.0-pyhd8ed1ab_1.conda + - conda: https://conda.anaconda.org/conda-forge/noarch/conda-forge-metadata-0.12.0-pyhcf101f3_1.conda - conda: https://conda.anaconda.org/conda-forge/noarch/conda-oci-mirror-0.2.3-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/conda-package-handling-2.4.0-pyh7900ff3_2.conda - conda: https://conda.anaconda.org/conda-forge/noarch/conda-package-streaming-0.12.0-pyhd8ed1ab_0.conda @@ -417,7 +417,7 @@ environments: - conda: https://conda.anaconda.org/conda-forge/noarch/charset-normalizer-3.4.3-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/click-8.3.0-pyh707e725_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/colorama-0.4.6-pyhd8ed1ab_1.conda - - conda: https://conda.anaconda.org/conda-forge/noarch/conda-forge-metadata-0.11.0-pyhd8ed1ab_1.conda + - conda: https://conda.anaconda.org/conda-forge/noarch/conda-forge-metadata-0.12.0-pyhcf101f3_1.conda - conda: https://conda.anaconda.org/conda-forge/noarch/conda-oci-mirror-0.2.3-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/conda-package-handling-2.4.0-pyh7900ff3_2.conda - conda: https://conda.anaconda.org/conda-forge/noarch/conda-package-streaming-0.12.0-pyhd8ed1ab_0.conda @@ -596,7 +596,7 @@ environments: - conda: https://conda.anaconda.org/conda-forge/noarch/charset-normalizer-3.4.3-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/click-8.3.0-pyh707e725_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/colorama-0.4.6-pyhd8ed1ab_1.conda - - conda: https://conda.anaconda.org/conda-forge/noarch/conda-forge-metadata-0.11.0-pyhd8ed1ab_1.conda + - conda: https://conda.anaconda.org/conda-forge/noarch/conda-forge-metadata-0.12.0-pyhcf101f3_1.conda - conda: https://conda.anaconda.org/conda-forge/noarch/conda-oci-mirror-0.2.3-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/conda-package-handling-2.4.0-pyh7900ff3_2.conda - conda: https://conda.anaconda.org/conda-forge/noarch/conda-package-streaming-0.12.0-pyhd8ed1ab_0.conda @@ -771,7 +771,7 @@ environments: - conda: https://conda.anaconda.org/conda-forge/noarch/charset-normalizer-3.4.3-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/click-8.3.0-pyh7428d3b_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/colorama-0.4.6-pyhd8ed1ab_1.conda - - conda: https://conda.anaconda.org/conda-forge/noarch/conda-forge-metadata-0.11.0-pyhd8ed1ab_1.conda + - conda: https://conda.anaconda.org/conda-forge/noarch/conda-forge-metadata-0.12.0-pyhcf101f3_1.conda - conda: https://conda.anaconda.org/conda-forge/noarch/conda-oci-mirror-0.2.3-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/conda-package-handling-2.4.0-pyh7900ff3_2.conda - conda: https://conda.anaconda.org/conda-forge/noarch/conda-package-streaming-0.12.0-pyhd8ed1ab_0.conda @@ -951,7 +951,7 @@ environments: - conda: https://conda.anaconda.org/conda-forge/linux-64/cffi-1.17.1-py312h35888ee_1.conda - conda: https://conda.anaconda.org/conda-forge/noarch/charset-normalizer-3.4.3-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/click-8.3.0-pyh707e725_0.conda - - conda: https://conda.anaconda.org/conda-forge/noarch/conda-forge-metadata-0.11.0-pyhd8ed1ab_1.conda + - conda: https://conda.anaconda.org/conda-forge/noarch/conda-forge-metadata-0.12.0-pyhcf101f3_1.conda - conda: https://conda.anaconda.org/conda-forge/noarch/conda-oci-mirror-0.2.3-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/conda-package-handling-2.4.0-pyh7900ff3_2.conda - conda: https://conda.anaconda.org/conda-forge/noarch/conda-package-streaming-0.12.0-pyhd8ed1ab_0.conda @@ -1131,7 +1131,7 @@ environments: - conda: https://conda.anaconda.org/conda-forge/linux-aarch64/cffi-1.17.1-py312h2fc7fbd_1.conda - conda: https://conda.anaconda.org/conda-forge/noarch/charset-normalizer-3.4.3-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/click-8.3.0-pyh707e725_0.conda - - conda: https://conda.anaconda.org/conda-forge/noarch/conda-forge-metadata-0.11.0-pyhd8ed1ab_1.conda + - conda: https://conda.anaconda.org/conda-forge/noarch/conda-forge-metadata-0.12.0-pyhcf101f3_1.conda - conda: https://conda.anaconda.org/conda-forge/noarch/conda-oci-mirror-0.2.3-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/conda-package-handling-2.4.0-pyh7900ff3_2.conda - conda: https://conda.anaconda.org/conda-forge/noarch/conda-package-streaming-0.12.0-pyhd8ed1ab_0.conda @@ -1310,7 +1310,7 @@ environments: - conda: https://conda.anaconda.org/conda-forge/osx-64/cffi-1.17.1-py312hc05cdf7_1.conda - conda: https://conda.anaconda.org/conda-forge/noarch/charset-normalizer-3.4.3-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/click-8.3.0-pyh707e725_0.conda - - conda: https://conda.anaconda.org/conda-forge/noarch/conda-forge-metadata-0.11.0-pyhd8ed1ab_1.conda + - conda: https://conda.anaconda.org/conda-forge/noarch/conda-forge-metadata-0.12.0-pyhcf101f3_1.conda - conda: https://conda.anaconda.org/conda-forge/noarch/conda-oci-mirror-0.2.3-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/conda-package-handling-2.4.0-pyh7900ff3_2.conda - conda: https://conda.anaconda.org/conda-forge/noarch/conda-package-streaming-0.12.0-pyhd8ed1ab_0.conda @@ -1480,7 +1480,7 @@ environments: - conda: https://conda.anaconda.org/conda-forge/osx-arm64/cffi-1.17.1-py312h429097b_1.conda - conda: https://conda.anaconda.org/conda-forge/noarch/charset-normalizer-3.4.3-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/click-8.3.0-pyh707e725_0.conda - - conda: https://conda.anaconda.org/conda-forge/noarch/conda-forge-metadata-0.11.0-pyhd8ed1ab_1.conda + - conda: https://conda.anaconda.org/conda-forge/noarch/conda-forge-metadata-0.12.0-pyhcf101f3_1.conda - conda: https://conda.anaconda.org/conda-forge/noarch/conda-oci-mirror-0.2.3-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/conda-package-handling-2.4.0-pyh7900ff3_2.conda - conda: https://conda.anaconda.org/conda-forge/noarch/conda-package-streaming-0.12.0-pyhd8ed1ab_0.conda @@ -1647,7 +1647,7 @@ environments: - conda: https://conda.anaconda.org/conda-forge/noarch/charset-normalizer-3.4.3-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/click-8.3.0-pyh7428d3b_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/colorama-0.4.6-pyhd8ed1ab_1.conda - - conda: https://conda.anaconda.org/conda-forge/noarch/conda-forge-metadata-0.11.0-pyhd8ed1ab_1.conda + - conda: https://conda.anaconda.org/conda-forge/noarch/conda-forge-metadata-0.12.0-pyhcf101f3_1.conda - conda: https://conda.anaconda.org/conda-forge/noarch/conda-oci-mirror-0.2.3-pyhd8ed1ab_0.conda - conda: https://conda.anaconda.org/conda-forge/noarch/conda-package-handling-2.4.0-pyh7900ff3_2.conda - conda: https://conda.anaconda.org/conda-forge/noarch/conda-package-streaming-0.12.0-pyhd8ed1ab_0.conda @@ -3430,22 +3430,22 @@ packages: license_family: BSD size: 27011 timestamp: 1733218222191 -- conda: https://conda.anaconda.org/conda-forge/noarch/conda-forge-metadata-0.11.0-pyhd8ed1ab_1.conda - sha256: 9fd9249f3f1e0c10c3fbfab670a430d689a7b8c51152bf9df782b0c9cfb2b062 - md5: 27564bdfec4272e6f69927d9baf4ae2e +- conda: https://conda.anaconda.org/conda-forge/noarch/conda-forge-metadata-0.12.0-pyhcf101f3_1.conda + sha256: 30aef73a42204366a228c4d5707210c08d194f3d0486c63f80832ff197546fe9 + md5: f4e97cdb52b448c4c82913ef9d674e42 depends: - - beautifulsoup4 - - conda-oci-mirror - - conda-package-streaming + - python >=3.10 - deprecated - - python >=3.9 - requests - ruamel.yaml - typing-extensions + - beautifulsoup4 + - conda-oci-mirror + - conda-package-streaming >=0.12.0 + - python license: BSD-3-Clause - license_family: BSD - size: 18070 - timestamp: 1734958795750 + size: 20330 + timestamp: 1762721496115 - conda: https://conda.anaconda.org/conda-forge/noarch/conda-oci-mirror-0.2.3-pyhd8ed1ab_0.conda sha256: 64e9684a38d97cc8eb7779c14d857452efe99b47e0fcc61b7b6924fa771489a2 md5: 63b4145496b4e71345ee569c4fa6c450 From 7e1272f356717812997c9f8bde37d4acecdc750e Mon Sep 17 00:00:00 2001 From: Pavel Zwerschke Date: Sun, 9 Nov 2025 22:31:29 +0100 Subject: [PATCH 3/6] fix --- pyproject.toml | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index ebe16c4..2b8585c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -22,7 +22,7 @@ dependencies = [ "typing-extensions>=4.12.2,<5", "zstandard>=0.23.0,<0.24", "py-rattler>=0.7.0,<0.8", - "conda-forge-metadata>=0.11.0,<0.12", + "conda-forge-metadata>=0.12.0,<0.13", "conda-package-streaming>=0.12.0,<0.13", "conda-oci-mirror>=0.2.3,<0.3", "streamlit>=1.44.0,<2", diff --git a/requirements.txt b/requirements.txt index 441c982..ee161fe 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ # this file is auto-generated, please make changes in pixi.toml instead -conda-forge-metadata==0.11.0 +conda-forge-metadata==0.12.0 conda-oci-mirror==0.2.3 conda-package-streaming==0.12.0 pip==25.2 From 96190aa62d013e50f5ffca2050faac61ddb715f9 Mon Sep 17 00:00:00 2001 From: Pavel Zwerschke Date: Sun, 9 Nov 2025 22:33:29 +0100 Subject: [PATCH 4/6] fix --- .github/scripts/check-deps.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/check-deps.sh b/.github/scripts/check-deps.sh index 2605df4..ab95ff9 100755 --- a/.github/scripts/check-deps.sh +++ b/.github/scripts/check-deps.sh @@ -13,7 +13,7 @@ while read -r dependency; do echo "${dependency} not found in pyproject.toml" contains_dependency_all=false fi -done < <(yq -r '.dependencies | to_entries | .[] | select(.key != "python") | "\(.key)\(.value)"' pixi.toml) +done < <(yq -r '.dependencies | to_entries | .[] | select(.key != "python" && .key != "pip") | "\(.key)\(.value)"' pixi.toml) if [[ $contains_dependency_all == "false" ]]; then exit 1 From 0b5f257203b3c2b5f351fa02ac4d6497cc871ead Mon Sep 17 00:00:00 2001 From: Pavel Zwerschke Date: Sun, 9 Nov 2025 22:37:42 +0100 Subject: [PATCH 5/6] fix --- .github/scripts/check-deps.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/check-deps.sh b/.github/scripts/check-deps.sh index ab95ff9..9dfcba5 100755 --- a/.github/scripts/check-deps.sh +++ b/.github/scripts/check-deps.sh @@ -13,7 +13,7 @@ while read -r dependency; do echo "${dependency} not found in pyproject.toml" contains_dependency_all=false fi -done < <(yq -r '.dependencies | to_entries | .[] | select(.key != "python" && .key != "pip") | "\(.key)\(.value)"' pixi.toml) +done < <(yq -r '.dependencies | to_entries | .[] | select(.key != "python") | select(.key != "pip") | "\(.key)\(.value)"' pixi.toml) if [[ $contains_dependency_all == "false" ]]; then exit 1 From 95355f7232afbe98bdc0e7b31da0ecd4cfcca294 Mon Sep 17 00:00:00 2001 From: Pavel Zwerschke Date: Sun, 9 Nov 2025 22:38:28 +0100 Subject: [PATCH 6/6] add gitattributes --- .gitattributes | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..ba44862 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +pixi.lock merge=binary linguist-language=YAML linguist-generated=true