Merge pull request #744 from conda-forge/beckermr-patch-1

fix: synchronize file permissions too
conda-forge · Oct 26, 2024 · 4cecb26 · 4cecb26
2 parents 4e7ac84 + 3ff197d
commit 4cecb26
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 34 deletions.
diff --git a/conda-lock.yml b/conda-lock.yml
@@ -3,7 +3,7 @@ metadata:
     - url: conda-forge
       used_env_vars: []
   content_hash:
-    linux-64: fa7229d393f0a193e717b47342e3b9a54a4c3ee63e70108bc28a007bf242b8e0
+    linux-64: 73fd1c3685ce88f9cc1b13e8a84e3af980d3dd9f63089380cdb94a209ac61bc0
   platforms:
     - linux-64
   sources:
@@ -223,15 +223,15 @@ package:
       python-dateutil: '>=2.1,<3.0.0'
       urllib3: '>=1.25.4,!=2.2.0,<3'
     hash:
-      md5: ae55b7ce2de371afaf6dcbcb8d5da48a
-      sha256: 3bfb57adf894b2bf397b0b5f4eda5f20b6cb3ae8ffd587cc4474b71538e5c2ae
+      md5: e6a1cbe67d52fe1d90fa8bb624d42954
+      sha256: a7b7bee71e07c7a06a86d85fcdaec47503cce48107506f529acf707b17ca091d
     manager: conda
     name: botocore
     optional: false
     platform: linux-64
     url:
-      https://conda.anaconda.org/conda-forge/noarch/botocore-1.35.47-pyge310_1234567_0.conda
-    version: 1.35.47
+      https://conda.anaconda.org/conda-forge/noarch/botocore-1.35.49-pyge310_1234567_0.conda
+    version: 1.35.49
   - category: main
     dependencies:
       __glibc: '>=2.17,<3.0.a0'
@@ -609,15 +609,15 @@ package:
       pyyaml: ''
       rattler-build-conda-compat: '>=0.0.2,<2.0.0a0'
     hash:
-      md5: d7870c6b5a6b6d2013ccfc2add8a2913
-      sha256: 084e80ed69c0b1082b8820766199965c4bdea969994cb547afa3bb464b1f7c09
+      md5: b8ee0bb4e2b91216e2eb0e24a8649e8b
+      sha256: 205f69bc11700cd5ca3640a4dff2ad2f3f8a080cefb42efba66c8add19eff1e1
     manager: conda
     name: conda-forge-feedstock-ops
     optional: false
     platform: linux-64
     url:
-      https://conda.anaconda.org/conda-forge/noarch/conda-forge-feedstock-ops-0.9.0-pyhd8ed1ab_0.conda
-    version: 0.9.0
+      https://conda.anaconda.org/conda-forge/noarch/conda-forge-feedstock-ops-0.10.0-pyhd8ed1ab_0.conda
+    version: 0.10.0
   - category: main
     dependencies:
       beautifulsoup4: ''
@@ -641,15 +641,15 @@ package:
   - category: main
     dependencies: {}
     hash:
-      md5: 704845383fc49182fca2188fd996ab8c
-      sha256: 2eeaec452f5f5c2f96599a938fc0b3eb52b7d49d800ac505e3dc81d1ea7eeb2f
+      md5: 8da1420437a8fb5722142b39fdd603c3
+      sha256: e4934f58c69b3115609e2d83be4c46202ab359b85cacfe8bf230780b9b22aaa9
     manager: conda
     name: conda-forge-pinning
     optional: false
     platform: linux-64
     url:
-      https://conda.anaconda.org/conda-forge/noarch/conda-forge-pinning-2024.10.24.19.16.23-hd8ed1ab_0.conda
-    version: 2024.10.24.19.16.23
+      https://conda.anaconda.org/conda-forge/noarch/conda-forge-pinning-2024.10.25.18.47.03-hd8ed1ab_0.conda
+    version: 2024.10.25.18.47.03
   - category: main
     dependencies:
       attrs: ''
@@ -3374,15 +3374,15 @@ package:
       python: '>=3.11,<3.12.0a0'
       python_abi: 3.11.*
     hash:
-      md5: 8b746f1e8fc1cd8f7ce67ad694d7530b
-      sha256: dda8211015c82fd3f9f54a1e0b58826b02800426480fb3ab4f9ce7fdd2d8ef98
+      md5: 0ffc1f53106a38f059b151c465891ed3
+      sha256: 2ac3f1ed6e6a2a0c67a3922f4b5faf382855ad02cc0c85c5d56291c7a94296d0
     manager: conda
     name: psutil
     optional: false
     platform: linux-64
     url:
-      https://conda.anaconda.org/conda-forge/linux-64/psutil-6.0.0-py311h9ecbd09_2.conda
-    version: 6.0.0
+      https://conda.anaconda.org/conda-forge/linux-64/psutil-6.1.0-py311h9ecbd09_0.conda
+    version: 6.1.0
   - category: main
     dependencies:
       __glibc: '>=2.17,<3.0.a0'
@@ -3491,15 +3491,15 @@ package:
       python: '>=3.11,<3.12.0a0'
       python_abi: 3.11.*
     hash:
-      md5: c412a37578bd7d2b0af23ac4961484b5
-      sha256: 1519245e60e9a7a07c3725fa479a5d4005fabd9035d0b9fd64a67644200bc557
+      md5: a7746f79ccba8e47f74a6a48a93f3d18
+      sha256: 36764b41d648fde26a752d4ce0ad87a9567ac38b821e5a81466917e5d1aff9dd
     manager: conda
     name: pycryptodome
     optional: false
     platform: linux-64
     url:
-      https://conda.anaconda.org/conda-forge/linux-64/pycryptodome-3.20.0-py311h35130b2_1.conda
-    version: 3.20.0
+      https://conda.anaconda.org/conda-forge/linux-64/pycryptodome-3.21.0-py311h35130b2_0.conda
+    version: 3.21.0
   - category: main
     dependencies:
       annotated-types: '>=0.6.0'
@@ -3882,15 +3882,15 @@ package:
       python: '>=3.11,<3.12.0a0'
       python_abi: 3.11.*
     hash:
-      md5: b63a07708c1b0619e925c22880f2561d
-      sha256: a75a5ec56c96deee115c61c324d8c4af7c86f935d251b676b6ccea3ef0faac7a
+      md5: 5457225c7ce2cf9bd84ca12a078efde2
+      sha256: 7531a8de06a1c1fcfdb30adefda163d8a3ac66854ac222ef64d4796129a163cb
     manager: conda
     name: rapidfuzz
     optional: false
     platform: linux-64
     url:
-      https://conda.anaconda.org/conda-forge/linux-64/rapidfuzz-3.10.0-py311hfdbb021_0.conda
-    version: 3.10.0
+      https://conda.anaconda.org/conda-forge/linux-64/rapidfuzz-3.10.1-py311hfdbb021_0.conda
+    version: 3.10.1
   - category: main
     dependencies:
       __glibc: '>=2.17,<3.0.a0'
@@ -4045,14 +4045,14 @@ package:
       __glibc: '>=2.17,<3.0.a0'
       libgcc: '>=13'
     hash:
-      md5: 78ecf732e9165aa28abb40699795b796
-      sha256: 18e222e44a28787efcb09449e642bd710ee35bad0c8b551363d4c5b4a460451d
+      md5: d214df5d083a659f75e7cdafd9500383
+      sha256: fd9d568112a6cf6dfa00828a70c730289fa046a86b641899e298c5ed3fd50ca6
     manager: conda
     name: ripgrep
     optional: false
     platform: linux-64
-    url: https://conda.anaconda.org/conda-forge/linux-64/ripgrep-14.1.0-h8fae777_1.conda
-    version: 14.1.0
+    url: https://conda.anaconda.org/conda-forge/linux-64/ripgrep-14.1.1-h8fae777_0.conda
+    version: 14.1.1
   - category: main
     dependencies:
       __glibc: '>=2.17,<3.0.a0'
@@ -4677,14 +4677,14 @@ package:
       libgcc: '>=13'
       libstdcxx: '>=13'
     hash:
-      md5: c4316a4c2b47ae154259fa5caffd53f1
-      sha256: 4f05a61c3c3127ce7e487001215d20f49da0563fa4335462b2f6cc0028bb265b
+      md5: f782367ea486b53fe1fe387c94978d3c
+      sha256: ff3a99a3e9009d38342279e36a3978c1c8be91f5c987417627208efb9a24ef13
     manager: conda
     name: uv
     optional: false
     platform: linux-64
-    url: https://conda.anaconda.org/conda-forge/linux-64/uv-0.4.26-h0f3a69f_0.conda
-    version: 0.4.26
+    url: https://conda.anaconda.org/conda-forge/linux-64/uv-0.4.27-h0f3a69f_0.conda
+    version: 0.4.27
   - category: main
     dependencies:
       distlib: <1,>=0.3.7

diff --git a/conda_forge_webservices/github_actions_integration/__main__.py b/conda_forge_webservices/github_actions_integration/__main__.py
@@ -304,6 +304,7 @@ def main_finalize_task(task_data_dir):
                 feedstock_dir,
                 ignore_dot_git=True,
                 update_git=True,
+                sync_stat_metadata=True,
             )
             subprocess.run(
                 ["git", "add", "."],

diff --git a/environment.yml b/environment.yml
@@ -11,7 +11,7 @@ dependencies:
   - conda-forge-metadata >=0.9.2
   - conda-forge-pinning
   - conda-forge-tick >=2024.9.26
-  - conda-forge-feedstock-ops >=0.9.0
+  - conda-forge-feedstock-ops >=0.10.0  # pin to fix bug in rerender patches
   - conda-smithy >=3.34.1  # this pin is for jinja2 sandboxes
   - cryptography >=39
   - python-dateutil