Merge branch 'main' into fix/issue_5529

conda · Jan 25, 2025 · 9e420e0 · 9e420e0
2 parents f7d5093 + cf35214
commit 9e420e0
Show file tree

Hide file tree

Showing 34 changed files with 326 additions and 193 deletions.
diff --git a/.authors.yml b/.authors.yml
@@ -1121,7 +1121,7 @@
   alternate_emails:
   - [email protected]
   - [email protected]
-  num_commits: 27
+  num_commits: 29
   first_commit: 2019-10-17 23:05:16
   github: beckermr
 - name: Jinzhe Zeng
@@ -1202,7 +1202,7 @@
   alternate_emails:
   - [email protected]
 - name: Ken Odegard
-  num_commits: 229
+  num_commits: 232
   email: [email protected]
   first_commit: 2020-09-08 19:53:41
   github: kenodegard
@@ -1225,7 +1225,7 @@
   first_commit: 2020-11-19 10:46:41
 - name: Jannis Leidel
   email: [email protected]
-  num_commits: 34
+  num_commits: 35
   github: jezdez
   first_commit: 2020-11-19 10:46:41
 - name: Christof Kaufmann
@@ -1240,7 +1240,7 @@
   github: pre-commit-ci[bot]
   aliases:
   - pre-commit-ci[bot]
-  num_commits: 95
+  num_commits: 100
   first_commit: 2021-11-20 01:47:17
 - name: Jacob Walls
   email: [email protected]
@@ -1262,7 +1262,7 @@
   alternate_emails:
   - [email protected]
   - [email protected]
-  num_commits: 66
+  num_commits: 68
   first_commit: 2022-01-17 18:09:22
 - name: Uwe L. Korn
   email: [email protected]
@@ -1310,7 +1310,7 @@
 - name: dependabot[bot]
   email: 49699333+dependabot[bot]@users.noreply.github.com
   github: dependabot[bot]
-  num_commits: 37
+  num_commits: 38
   first_commit: 2022-05-31 04:34:40
 - name: Serhii Kupriienko
   email: [email protected]
@@ -1327,7 +1327,7 @@
 - name: Jaime Rodríguez-Guerra
   email: [email protected]
   github: jaimergp
-  num_commits: 20
+  num_commits: 23
   first_commit: 2022-11-02 19:34:51
 - name: Dave Clements
   email: [email protected]
@@ -1356,7 +1356,7 @@
   github: xileF1337
 - name: T Coxon
   email: [email protected]
-  num_commits: 1
+  num_commits: 2
   first_commit: 2023-02-24 01:34:03
   github: tttc3
 - name: Peet Whittaker
@@ -1466,11 +1466,30 @@
   github: zklaus
 - name: Daniel Ching
   email: [email protected]
-  num_commits: 1
+  alternate_emails:
+  - [email protected]
+  num_commits: 2
   first_commit: 2024-06-07 11:14:31
   github: carterbox
 - name: Cornelius Roemer
   email: [email protected]
   github: corneliusroemer
   num_commits: 1
   first_commit: 2024-11-26 11:16:47
+- name: Tony Kelman
+  email: [email protected]
+  github: tkelman
+  num_commits: 1
+  first_commit: 2025-01-08 09:50:24
+- name: Yoann Cédric Pradat
+  email: [email protected]
+  github: ypradat
+  num_commits: 1
+  first_commit: 2024-12-09 17:52:40
+- name: Mahe Iram Khan
+  email: [email protected]
+  github: ForgottenProgramme
+  num_commits: 1
+  first_commit: 2025-01-13 18:15:05
+  alternate_emails:
+  - [email protected]
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -111,7 +111,7 @@ jobs:
         run: echo "HASH=${{ runner.os }}-${{ runner.arch }}-Py${{ matrix.python-version }}-${{ matrix.conda-version }}-${{ matrix.test-type }}-$(date -u "+%Y%m")" >> $GITHUB_ENV
 
       - name: Cache Conda
-        uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
+        uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
         with:
           path: ~/conda_pkgs_dir
           key: cache-${{ env.HASH }}
@@ -151,13 +151,13 @@ jobs:
           -m "${{ env.PYTEST_MARKER }}"
 
       - name: Upload Coverage
-        uses: codecov/codecov-action@015f24e6818733317a2da2edd6290ab26238649a # v5.0.7
+        uses: codecov/codecov-action@1e68e06f1dbfde0e4cefc87efeba9e4643565303 # v5.1.2
         with:
           flags: ${{ runner.os }},${{ runner.arch }},${{ matrix.python-version }},${{ matrix.test-type }}
 
       - name: Upload Test Results
         if: '!cancelled()'
-        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.0
+        uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.4.0
         with:
           name: test-results-${{ env.HASH }}
           path: |
@@ -191,7 +191,7 @@ jobs:
         run: echo "HASH=${{ runner.os }}-${{ runner.arch }}-Py${{ matrix.python-version }}-benchmark-$(date -u "+%Y%m")" >> $GITHUB_ENV
 
       - name: Cache Conda
-        uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
+        uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
         with:
           path: ~/conda_pkgs_dir
           key: cache-${{ env.HASH }}
@@ -269,7 +269,7 @@ jobs:
         run: echo "HASH=${{ runner.os }}-${{ runner.arch }}-Py${{ matrix.python-version }}-${{ matrix.conda-version }}-${{ matrix.test-type }}-$(date -u "+%Y%m")" >> $GITHUB_ENV
 
       - name: Cache Conda
-        uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
+        uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
         with:
           # Use faster GNU tar for all runners
           enableCrossOsArchive: true
@@ -319,13 +319,13 @@ jobs:
           -m "${{ env.PYTEST_MARKER }}"
 
       - name: Upload Coverage
-        uses: codecov/codecov-action@015f24e6818733317a2da2edd6290ab26238649a # v5.0.7
+        uses: codecov/codecov-action@1e68e06f1dbfde0e4cefc87efeba9e4643565303 # v5.1.2
         with:
           flags: ${{ runner.os }},${{ runner.arch }},${{ matrix.python-version }},${{ matrix.test-type }}
 
       - name: Upload Test Results
         if: '!cancelled()'
-        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.0
+        uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.4.0
         with:
           name: test-results-${{ env.HASH }}
           path: |
@@ -375,7 +375,7 @@ jobs:
         run: echo "HASH=${{ runner.os }}-${{ runner.arch }}-Py${{ matrix.python-version }}-${{ matrix.conda-version }}-${{ matrix.test-type }}-$(date -u "+%Y%m")" >> $GITHUB_ENV
 
       - name: Cache Conda
-        uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
+        uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
         with:
           path: |
             ~/conda_pkgs_dir
@@ -437,13 +437,13 @@ jobs:
           CONDA_BUILD_SYSROOT: ${{ env.MACOSX_SDK_ROOT }}
 
       - name: Upload Coverage
-        uses: codecov/codecov-action@015f24e6818733317a2da2edd6290ab26238649a # v5.0.7
+        uses: codecov/codecov-action@1e68e06f1dbfde0e4cefc87efeba9e4643565303 # v5.1.2
         with:
           flags: ${{ runner.os }},${{ runner.arch }},${{ matrix.python-version }},${{ matrix.test-type }}
 
       - name: Upload Test Results
         if: '!cancelled()'
-        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.0
+        uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.4.0
         with:
           name: test-results-${{ env.HASH }}
           path: |
@@ -469,7 +469,7 @@ jobs:
 
       - name: Upload Combined Test Results
         # provides one downloadable archive of all matrix run test results for further analysis
-        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.0
+        uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.4.0
         with:
           name: test-results-${{ github.sha }}-all
           path: test-results-*

diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml
@@ -80,7 +80,7 @@ jobs:
       - if: github.event.comment.body != '@conda-bot render'
         id: create
         # no-op if no commits were made
-        uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f # v7.0.5
+        uses: peter-evans/create-pull-request@67ccf781d68cd99b580ae25a5c18a1cc84ffff1f # v7.0.6
         with:
           push-to-fork: ${{ env.FORK }}
           token: ${{ secrets.SYNC_TOKEN }}

diff --git a/.mailmap b/.mailmap
@@ -69,7 +69,7 @@ Dan Blanchard <[email protected]> Dan Blanchard <[email protected]>
 Dan Blanchard <[email protected]> Dan Blanchard <[email protected]>
 Dan Lovell <[email protected]> dlovell <[email protected]>
 Daniel Bast <[email protected]>
-Daniel Ching <[email protected]>
+Daniel Ching <[email protected]> Daniel Ching <[email protected]>
 Daniel Damiani <[email protected]>
 Daniel Holth <[email protected]>
 Daniel Petry <[email protected]> danpetry <[email protected]>
@@ -159,6 +159,7 @@ Lennart Fricke <[email protected]>
 Levi Naden <[email protected]>
 Lori Burns <[email protected]>
 Lukas Schrangl <[email protected]>
+Mahe Iram Khan <[email protected]> Mahe Iram Khan <[email protected]>
 Mandeep Bhutani <[email protected]> mandeep <[email protected]>
 Mandeep Bhutani <[email protected]> mandeep <[email protected]>
 Mandeep Bhutani <[email protected]> Mandeep Bhutani <[email protected]>
@@ -270,6 +271,7 @@ Todd Tomashek <[email protected]> todd.m.tomashek <todd.m.tomashek@intel
 Tom Davidson <[email protected]>
 Tom Pollard <[email protected]>
 Tom Schoonjans <[email protected]>
+Tony Kelman <[email protected]>
 Toon Verstraelen <[email protected]>
 Travis Hathaway <[email protected]>
 Travis Oliphant <[email protected]> Travis E. Oliphant <[email protected]>
@@ -285,6 +287,7 @@ Wolf Vollprecht <[email protected]>
 Wolfgang Ulmer <[email protected]>
 Yann <[email protected]>
 Yannik Tausch <[email protected]>
+Yoann Cédric Pradat <[email protected]>
 Yoav Ram <[email protected]>
 Yu Feng <[email protected]>
 Zane Dufour <[email protected]> zdog234 <[email protected]>

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -58,7 +58,7 @@ repos:
       # auto format Python codes within docstrings
       - id: blacken-docs
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.8.3
+    rev: v0.8.6
     hooks:
       # lint & attempt to correct failures (e.g. pyupgrade)
       - id: ruff

diff --git a/.readthedocs.yml b/.readthedocs.yml
@@ -1,5 +1,8 @@
 version: 2
 
+sphinx:
+  configuration: docs/source/conf.py
+
 build:
   os: ubuntu-22.04
   tools:

diff --git a/AUTHORS.md b/AUTHORS.md
@@ -138,6 +138,7 @@ Authors are sorted alphabetically.
 * Levi Naden
 * Lori Burns
 * Lukas Schrangl
+* Mahe Iram Khan
 * Mandeep Bhutani
 * Marcel Bargull
 * Marcelo Duarte Trevisani
@@ -227,6 +228,7 @@ Authors are sorted alphabetically.
 * Tom Davidson
 * Tom Pollard
 * Tom Schoonjans
+* Tony Kelman
 * Toon Verstraelen
 * Travis Hathaway
 * Travis Oliphant
@@ -242,6 +244,7 @@ Authors are sorted alphabetically.
 * Wolfgang Ulmer
 * Yann
 * Yannik Tausch
+* Yoann Cédric Pradat
 * Yoav Ram
 * Yu Feng
 * Zane Dufour

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,56 @@
 [//]: # (current developments)
 
+## 25.1.1 (2025-01-14)
+
+### Deprecations
+
+* Remove `conda_build.exceptions.UnableToParseMissingJinja2`. (#5587)
+* Remove `conda_build.index.get_build_index(locking)`. (#5587)
+* Remove `conda_build.index.get_build_index(timeout)`. (#5587)
+
+### Contributors
+
+* @kenodegard
+
+
+
+## 25.1.0 (2025-01-13)
+
+### Enhancements
+
+* Add SHA224, SHA384 and SHA512 support for validating downloaded sources. (#4793)
+* Add new hashing methods (`content_sha256`, `content_sha384`, `content_sha512`) to calculate the
+  checksum of the extracted contents of the downloaded source artifacts. (#4821 via #5277)
+* Make `.conda` the new default package format. `.tar.bz2` files can still be generated with `--package-format=1` and/or `conda_build.pkg_format: 1` in your `.condarc` file. (#5183 via #5527)
+* Add compatibility for LIEF=0.15. (#5564 via #5565)
+
+### Bug fixes
+
+* Verify all source hashes when multiple are defined (not just the first one). (#4793)
+* Fix a bug where some ``CondaBuildUserError`` exceptions that were formally ``SystemExit`` exceptions
+  were not being caught properly. (#5538)
+* Fix a bug where bad match specs from intermediate parsing results would cause parsing to fail. (#5555)
+* Fix `KeyError` when an inconsistent `build.pkg_type` value is specified in `meta.yaml`. (#5560)
+
+### Other
+
+* Demote logging message about glob finding no matches from error to warning (#5472)
+
+### Contributors
+
+* @conda-bot
+* @carterbox
+* @jaimergp
+* @ForgottenProgramme
+* @beckermr
+* @tttc3
+* @tkelman made their first contribution in https://github.com/conda/conda-build/pull/5565
+* @ypradat made their first contribution in https://github.com/conda/conda-build/pull/5560
+* @dependabot[bot]
+* @pre-commit-ci[bot]
+
+
+
 ## 24.11.2 (2024-11-26)
 
 ### Bug fixes

diff --git a/RELEASE.md b/RELEASE.md
@@ -143,7 +143,7 @@ Currently, there are only 2 activities we use rever for, (1) aggregating the aut
 
     ```bash
     (rever) $ git clone [email protected]:/conda-build.git
-    (rever) $ cd conda
+    (rever) $ cd conda-build
     ```
 
 2. Fetch the latest changes from the remote and checkout the release branch created a week ago:

diff --git a/conda_build/exceptions.py b/conda_build/exceptions.py
@@ -4,8 +4,6 @@
 
 from conda import CondaError
 
-from .deprecations import deprecated
-
 SEPARATOR = "-" * 70
 
 indent = lambda s: textwrap.fill(textwrap.dedent(s))
@@ -46,22 +44,6 @@ def indented_exception(self):
         return f"Error Message:\n--> {indent(orig)}\n\n"
 
 
-@deprecated("24.11", "25.1")
-class UnableToParseMissingJinja2(UnableToParse):
-    def error_body(self):
-        return "\n".join(
-            [
-                super().error_body(),
-                indent(
-                    """\
-                It appears you are missing jinja2.  Please install that
-                package, then attempt to build.
-            """
-                ),
-            ]
-        )
-
-
 class MissingDependency(CondaBuildException):
     pass
 

diff --git a/conda_build/index.py b/conda_build/index.py
@@ -14,7 +14,6 @@
 from conda_index.index import update_index as _update_index
 
 from . import utils
-from .deprecations import deprecated
 from .utils import (
     get_logger,
 )
@@ -45,8 +44,6 @@ def Index(channels: tuple[str | Channel, ...] = (), *args, **kwargs) -> dict:  #
 # os.environ['CONDA_ADD_ANACONDA_TOKEN'] = "false"
 
 
-@deprecated.argument("24.11", "25.1", "locking")
-@deprecated.argument("24.11", "25.1", "timeout")
 def get_build_index(
     subdir,
     bldpkgs_dir,