From 0ad05620b6267b2159d39d1f3eb2dbddf8f6b425 Mon Sep 17 00:00:00 2001 From: jaimergp Date: Fri, 14 Apr 2023 18:16:25 +0200 Subject: [PATCH 1/2] use conda-forge-metadata for feedstock outputs --- conda-requirements.txt | 1 + conda_forge_webservices/feedstock_outputs.py | 9 +-------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/conda-requirements.txt b/conda-requirements.txt index 0a45513c2..d59b708d6 100644 --- a/conda-requirements.txt +++ b/conda-requirements.txt @@ -3,6 +3,7 @@ black cachetools conda conda-build +conda-forge-metadata conda-forge-pinning conda-smithy>=3.7.6 # this pin is for bot automerge and maint. team bug fixes cryptography>=39 diff --git a/conda_forge_webservices/feedstock_outputs.py b/conda_forge_webservices/feedstock_outputs.py index ded862185..438a2afa1 100644 --- a/conda_forge_webservices/feedstock_outputs.py +++ b/conda_forge_webservices/feedstock_outputs.py @@ -15,6 +15,7 @@ from binstar_client.utils import get_server_api from binstar_client import BinstarError +from conda_forge_metadata.feedstock_outputs import sharded_path as _get_sharded_path import binstar_client.errors from .utils import parse_conda_pkg @@ -26,14 +27,6 @@ PROD = "conda-forge" -def _get_sharded_path(output): - chars = [c for c in output if c.isalnum()] - while len(chars) < 3: - chars.append("z") - - return os.path.join("outputs", chars[0], chars[1], chars[2], output + ".json") - - def is_valid_feedstock_token(user, project, feedstock_token, provider=None): gh_token = get_app_token_for_webservices_only() r = requests.get( From f47a003fd905f5743188d13d8cdb0db36bc37ce3 Mon Sep 17 00:00:00 2001 From: jaimergp Date: Thu, 4 May 2023 20:30:17 +0200 Subject: [PATCH 2/2] Update conda-requirements.txt --- conda-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda-requirements.txt b/conda-requirements.txt index d59b708d6..50941a148 100644 --- a/conda-requirements.txt +++ b/conda-requirements.txt @@ -3,7 +3,7 @@ black cachetools conda conda-build -conda-forge-metadata +conda-forge-metadata>=0.4.1 conda-forge-pinning conda-smithy>=3.7.6 # this pin is for bot automerge and maint. team bug fixes cryptography>=39