From 3e73b0defb443b7f0e2d9a508772ce6b9b71c82e Mon Sep 17 00:00:00 2001 From: "Matthew R. Becker" Date: Fri, 26 Apr 2024 14:12:08 -0500 Subject: [PATCH 1/6] ENH add missing packages to removals --- recipe/gen_patch_json.py | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/recipe/gen_patch_json.py b/recipe/gen_patch_json.py index bcd06d61b..26baa84d8 100644 --- a/recipe/gen_patch_json.py +++ b/recipe/gen_patch_json.py @@ -42,7 +42,25 @@ ) REMOVALS = { - "noarch": ("sendgrid-5.3.0-py_0.tar.bz2",), + "noarch": ( + "sendgrid-5.3.0-py_0.tar.bz2", + "boto3-stubs-lite-1.26.89-pyhd8ed1ab_0.conda", + "ca-policy-lcg-1.119-hd8ed1ab_0.conda", + "cfn-lint-0.74.2-pyhd8ed1ab_0.conda", + "conda-forge-pinning-2023.06.08.10.36.51-hd8ed1ab_0.conda", + "conda-forge-repodata-patches-20230516.19.05.39-hd8ed1ab_0.conda", + "ffmpeg-progress-yield-0.7.6-pyhd8ed1ab_0.conda", + "idds-doma-1.3.0-pyhd8ed1ab_0.conda", + "pandera-core-0.14.3-pyhd8ed1ab_0.conda", + "pandera-pyspark-0.14.3-hd8ed1ab_0.conda", + "perl-extutils-makemaker-7.68-pl5321hd8ed1ab_0.conda", + "pyhanko-0.17.2-pyhd8ed1ab_0.conda", + "python-flatbuffers-23.3.3-pyhd8ed1ab_0.conda", + "strawberry-graphql-with-asgi-0.162.0-pyhd8ed1ab_0.conda", + ), + "linux-aarch64": ( + "awscli-1.29.39-py38he37f277_0.conda", + ), "linux-64": ( "airflow-with-gcp_api-1.9.0-1.tar.bz2", "airflow-with-gcp_api-1.9.0-2.tar.bz2", @@ -197,6 +215,7 @@ "nlopt-2.4.2-0.tar.bz2", "pygpu-0.6.5-0.tar.bz2", "pytest-regressions-1.0.1-0.tar.bz2", + "libgz-sim8-8.1.0-h86fce40_0.conda", ), } From 9e2cd6d27bdece741b0aafbe54dce7ba49d960c6 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Fri, 26 Apr 2024 19:17:14 +0000 Subject: [PATCH 2/6] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- recipe/gen_patch_json.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/recipe/gen_patch_json.py b/recipe/gen_patch_json.py index 26baa84d8..4cf58165e 100644 --- a/recipe/gen_patch_json.py +++ b/recipe/gen_patch_json.py @@ -58,9 +58,7 @@ "python-flatbuffers-23.3.3-pyhd8ed1ab_0.conda", "strawberry-graphql-with-asgi-0.162.0-pyhd8ed1ab_0.conda", ), - "linux-aarch64": ( - "awscli-1.29.39-py38he37f277_0.conda", - ), + "linux-aarch64": ("awscli-1.29.39-py38he37f277_0.conda",), "linux-64": ( "airflow-with-gcp_api-1.9.0-1.tar.bz2", "airflow-with-gcp_api-1.9.0-2.tar.bz2", From 82ad10adcacce230eb708d0f53fd917d6a73d692 Mon Sep 17 00:00:00 2001 From: "Matthew R. Becker" Date: Fri, 26 Apr 2024 14:35:33 -0500 Subject: [PATCH 3/6] DOC add comments on removals --- recipe/gen_patch_json.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/recipe/gen_patch_json.py b/recipe/gen_patch_json.py index 4cf58165e..5a37e3c97 100644 --- a/recipe/gen_patch_json.py +++ b/recipe/gen_patch_json.py @@ -43,6 +43,7 @@ REMOVALS = { "noarch": ( + # the removals starting here are failed uploads "sendgrid-5.3.0-py_0.tar.bz2", "boto3-stubs-lite-1.26.89-pyhd8ed1ab_0.conda", "ca-policy-lcg-1.119-hd8ed1ab_0.conda", @@ -57,8 +58,11 @@ "pyhanko-0.17.2-pyhd8ed1ab_0.conda", "python-flatbuffers-23.3.3-pyhd8ed1ab_0.conda", "strawberry-graphql-with-asgi-0.162.0-pyhd8ed1ab_0.conda", + # end of removals for failed uploads + ), + "linux-aarch64": ( + "awscli-1.29.39-py38he37f277_0.conda", # failed upload ), - "linux-aarch64": ("awscli-1.29.39-py38he37f277_0.conda",), "linux-64": ( "airflow-with-gcp_api-1.9.0-1.tar.bz2", "airflow-with-gcp_api-1.9.0-2.tar.bz2", @@ -213,7 +217,7 @@ "nlopt-2.4.2-0.tar.bz2", "pygpu-0.6.5-0.tar.bz2", "pytest-regressions-1.0.1-0.tar.bz2", - "libgz-sim8-8.1.0-h86fce40_0.conda", + "libgz-sim8-8.1.0-h86fce40_0.conda", # failed upload ), } From 24ff948fae8ea32eec478a3e3984c9d51d59c37e Mon Sep 17 00:00:00 2001 From: "Matthew R. Becker" Date: Fri, 26 Apr 2024 14:36:14 -0500 Subject: [PATCH 4/6] BUG commented on wrong line --- recipe/gen_patch_json.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/gen_patch_json.py b/recipe/gen_patch_json.py index 5a37e3c97..00678b74f 100644 --- a/recipe/gen_patch_json.py +++ b/recipe/gen_patch_json.py @@ -43,8 +43,8 @@ REMOVALS = { "noarch": ( - # the removals starting here are failed uploads "sendgrid-5.3.0-py_0.tar.bz2", + # the removals starting here are failed uploads "boto3-stubs-lite-1.26.89-pyhd8ed1ab_0.conda", "ca-policy-lcg-1.119-hd8ed1ab_0.conda", "cfn-lint-0.74.2-pyhd8ed1ab_0.conda", From 527566a64e8f4fe6883a3ee3a17f00dfeb96b3ef Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Fri, 26 Apr 2024 19:39:28 +0000 Subject: [PATCH 5/6] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- recipe/gen_patch_json.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/recipe/gen_patch_json.py b/recipe/gen_patch_json.py index 00678b74f..c9df95295 100644 --- a/recipe/gen_patch_json.py +++ b/recipe/gen_patch_json.py @@ -60,9 +60,7 @@ "strawberry-graphql-with-asgi-0.162.0-pyhd8ed1ab_0.conda", # end of removals for failed uploads ), - "linux-aarch64": ( - "awscli-1.29.39-py38he37f277_0.conda", # failed upload - ), + "linux-aarch64": ("awscli-1.29.39-py38he37f277_0.conda",), # failed upload "linux-64": ( "airflow-with-gcp_api-1.9.0-1.tar.bz2", "airflow-with-gcp_api-1.9.0-2.tar.bz2", From 565203a19994aebec35ed5fef46f40044b150eac Mon Sep 17 00:00:00 2001 From: jakirkham Date: Fri, 26 Apr 2024 13:31:20 -0700 Subject: [PATCH 6/6] Use block comments for all failed uploads --- recipe/gen_patch_json.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/recipe/gen_patch_json.py b/recipe/gen_patch_json.py index c9df95295..90fdbe8c4 100644 --- a/recipe/gen_patch_json.py +++ b/recipe/gen_patch_json.py @@ -60,7 +60,11 @@ "strawberry-graphql-with-asgi-0.162.0-pyhd8ed1ab_0.conda", # end of removals for failed uploads ), - "linux-aarch64": ("awscli-1.29.39-py38he37f277_0.conda",), # failed upload + "linux-aarch64": ( + # the removals starting here are failed uploads + "awscli-1.29.39-py38he37f277_0.conda", + # end of removals for failed uploads + ), "linux-64": ( "airflow-with-gcp_api-1.9.0-1.tar.bz2", "airflow-with-gcp_api-1.9.0-2.tar.bz2", @@ -215,7 +219,9 @@ "nlopt-2.4.2-0.tar.bz2", "pygpu-0.6.5-0.tar.bz2", "pytest-regressions-1.0.1-0.tar.bz2", - "libgz-sim8-8.1.0-h86fce40_0.conda", # failed upload + # the removals starting here are failed uploads + "libgz-sim8-8.1.0-h86fce40_0.conda", + # end of removals for failed uploads ), }