Merge branch 'main' of github.com:conda-forge/conda-smithy into pydan…

…tic-schema-cf-yaml

.authors.yml

@@ -27,7 +27,7 @@
   aliases:
   - John Kirkham
   - jakirkham
-  num_commits: 24
+  num_commits: 25
   first_commit: 2016-03-17 21:05:53
   github: jakirkham
 - name: Daniel Bast
@@ -182,7 +182,7 @@
   email: marcel.bargull@udo.edu
   alternate_emails:
   - mbargull@users.noreply.github.com
-  num_commits: 26
+  num_commits: 30
   first_commit: 2018-07-30 05:17:51
   github: mbargull
 - name: xoviat
@@ -393,7 +393,7 @@
   github: shadowwalkersb
 - name: Matthew R. Becker
   email: becker.mr@gmail.com
-  num_commits: 156
+  num_commits: 163
   first_commit: 2020-01-07 17:44:33
   github: beckermr
   alternate_emails:
@@ -476,7 +476,7 @@
   github: jwillemsen
 - name: Jaime Rodríguez-Guerra
   email: jaimergp@users.noreply.github.com
-  num_commits: 126
+  num_commits: 132
   first_commit: 2020-11-01 14:18:08
   github: jaimergp
 - name: Bastian Zimmermann
@@ -517,7 +517,7 @@
   github: bkpoon
 - name: Matthias Diener
   email: mdiener@illinois.edu
-  num_commits: 6
+  num_commits: 7
   first_commit: 2021-09-27 17:26:18
   github: matthiasdiener
 - name: Matthew W. Thompson
@@ -537,7 +537,7 @@
   github: nehaljwani
 - name: H. Vetinari
   email: h.vetinari@gmx.com
-  num_commits: 18
+  num_commits: 19
   first_commit: 2021-11-14 02:53:10
 - name: Benjamin Tovar
   email: btovar@nd.edu
@@ -575,7 +575,7 @@
   github: mikemhenry
 - name: Bela Stoyan
   email: bela.stoyan@gmail.com
-  num_commits: 8
+  num_commits: 11
   first_commit: 2023-09-19 09:24:51
   github: '0xbe7a'
 - name: Klaus Zimmermann
@@ -585,7 +585,7 @@
   github: zklaus
 - name: pre-commit-ci[bot]
   email: 66853113+pre-commit-ci[bot]@users.noreply.github.com
-  num_commits: 9
+  num_commits: 11
   first_commit: 2023-10-30 15:49:50
   github: carterbox
 - name: Amit Kumar
@@ -600,3 +600,8 @@
   email: david.hirschfeld@stanwell.com
   num_commits: 4
   first_commit: 2020-10-24 23:53:21
+- name: Antonio S. Cofiño
+  email: cofinoa@gmail.com
+  num_commits: 7
+  first_commit: 2024-01-08 15:21:06
+  github: cofinoa

.mailmap

@@ -26,18 +26,18 @@ shadow_walker <shadowwalkersb@gmail.com>
 Michael Sarahan <msarahan@gmail.com> Mike Sarahan <msarahan@gmail.com>
 Min RK <benjaminrk@gmail.com>
 Marcel Bargull <marcel.bargull@udo.edu> Marcel Bargull <mbargull@users.noreply.github.com>
+John Kirkham <jakirkham@gmail.com> John Kirkham <kirkhamj@janelia.hhmi.org>
+John Kirkham <jakirkham@gmail.com> jakirkham <kirkhamj@janelia.hhmi.org>
 Mark Harfouche <mark.harfouche@gmail.com>
 Leo Fang <leofang@bnl.gov> Leo Fang <leo80042@gmail.com>
 Leo Fang <leofang@bnl.gov> Leo Fang <leof@nvidia.com>
 Hadrien Mary <hadrien.mary@gmail.com> Hadrien Mary <hadim@users.noreply.github.com>
 Ryan Volz <rvolz@mit.edu> Ryan Volz <ryan.volz@gmail.com>
-John Kirkham <jakirkham@gmail.com> John Kirkham <kirkhamj@janelia.hhmi.org>
-John Kirkham <jakirkham@gmail.com> jakirkham <kirkhamj@janelia.hhmi.org>
 Johnny Willemsen <jwillemsen@remedy.nl>
+H. Vetinari <h.vetinari@gmx.com>
 Chris Burr <christopher.burr@cern.ch> Chris Burr <chrisburr@users.noreply.github.com>
 Julian Rüth <julian.rueth@fsfe.org>
 Bastian Zimmermann <10774221+BastianZim@users.noreply.github.com> BastianZim <10774221+BastianZim@users.noreply.github.com>
-H. Vetinari <h.vetinari@gmx.com>
 Daniel Bast <2790401+dbast@users.noreply.github.com>
 Billy K. Poon <bkpoon@lbl.gov>
 Tim Snyder <snyder.tim@gmail.com>
@@ -49,23 +49,24 @@ Daniel Ching <carterbox@users.noreply.github.com>
 Maksim Rakitin <mrakitin@bnl.gov> Maksim Rakitin <mrakitin@users.noreply.github.com>
 Jan Schulz <jasc@gmx.net>
 Josh Reichardt <josh.reichardt@gmail.com>
+Bela Stoyan <bela.stoyan@gmail.com>
+pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 Justin Calamari <justin.calamari@gmail.com>
 Jason Furmanek <furmanek@us.ibm.com>
 Patrick Sodré <psodre@gmail.com>
 C.A.M. Gerlach <widenetservices@gmail.com>
 refraction-ray <kcanamgal@foxmail.com>
-pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
 Nicholas Bollweg <nick.bollweg@gmail.com>
 Leopold Talirz <leopold.talirz@gmail.com>
 Tom Pollard <tom.pollard@codethink.co.uk>
-Bela Stoyan <bela.stoyan@gmail.com>
 Gonzalo Pena-Castellanos <goanpeca@gmail.com>
+Matthias Diener <mdiener@illinois.edu>
+Antonio S. Cofiño <cofinoa@gmail.com>
 Carlo <carlo.dri@gmail.com> Carlo <carlodri@users.noreply.github.com>
 Matthew Craig <mattwcraig@gmail.com> Matt Craig <mattwcraig@gmail.com>
 Peter Williams <peter@newton.cx>
 Joshua L. Adelman <joshua.adelman@gmail.com>
 Wolf Vollprecht <w.vollprecht@gmail.com>
-Matthias Diener <mdiener@illinois.edu>
 John Blischak <jdblischak@gmail.com>
 Marius van Niekerk <marius.v.niekerk@gmail.com> mariusvniekerk <marius.vanniekerk@maxpoint.com>
 Marius van Niekerk <marius.v.niekerk@gmail.com> mariusvniekerk <mvanniekerk@flatiron.com>

.pre-commit-config.yaml

@@ -7,7 +7,7 @@ repos:
     -   id: end-of-file-fixer
     -   id: trailing-whitespace
 -   repo: https://github.com/psf/black
-    rev: 23.12.1
+    rev: 24.1.1
     hooks:
     -   id: black
 

AUTHORS.rst

@@ -15,16 +15,16 @@ Authors are sorted by number of commits.
 * Michael Sarahan
 * Min RK
 * Marcel Bargull
+* John Kirkham
 * Mark Harfouche
 * Leo Fang
 * Hadrien Mary
 * Ryan Volz
-* John Kirkham
 * Johnny Willemsen
+* H. Vetinari
 * Chris Burr
 * Julian Rüth
 * Bastian Zimmermann
-* H. Vetinari
 * Daniel Bast
 * Billy K. Poon
 * Tim Snyder
@@ -35,23 +35,24 @@ Authors are sorted by number of commits.
 * Maksim Rakitin
 * Jan Schulz
 * Josh Reichardt
+* Bela Stoyan
+* pre-commit-ci[bot]
 * Justin Calamari
 * Jason Furmanek
 * Patrick Sodré
 * C.A.M. Gerlach
 * refraction-ray
-* pre-commit-ci[bot]
 * Nicholas Bollweg
 * Leopold Talirz
 * Tom Pollard
-* Bela Stoyan
 * Gonzalo Pena-Castellanos
+* Matthias Diener
+* Antonio S. Cofiño
 * Carlo
 * Matthew Craig
 * Peter Williams
 * Joshua L. Adelman
 * Wolf Vollprecht
-* Matthias Diener
 * John Blischak
 * Marius van Niekerk
 * Johannes Köster

CHANGELOG.rst

@@ -4,6 +4,58 @@ conda-smithy Change Log
 
 .. current developments
 
+v3.31.1
+====================
+
+**Changed:**
+
+* Do not consider broken releases when checking if local version is up to date. (#1848 via #1849)
+* Added rerendering support for additional mpi variants ``msmpi``, ``mpi_serial``, and ``impi``.
+
+**Fixed:**
+
+* Fixed regression where some variant keys were mismatched during rerendering.
+
+**Authors:**
+
+* Matthew R. Becker
+* Jaime Rodríguez-Guerra
+
+
+
+v3.31.0
+====================
+
+**Added:**
+
+* Smithy now understand the new stdlib jinja function.
+* Complete conda-build load data functions stubs PR #1829
+* `noarch` packages can now include keys from their `conda_build_config.yaml` as selectors in their recipe.
+This allows for building multiple variants of a `noarch` packages, e.g., to use different dependencies depending on the Python version as runtime.
+
+**Changed:**
+
+* Default build tool changed from conda-mambabuild to conda-build again. (#1844)
+* Cleanup ``run_win_build.bat`` ( #1836 )
+
+**Fixed:**
+
+* Resolve warnings in Github Actions workflows by updating to ``actions/checkout@v4``. (#1839)
+* Fix randomly mismatched zipped variant keys. (#1459 and #1782 via #1815)
+
+**Authors:**
+
+* Jaime Rodríguez-Guerra
+* Marcel Bargull
+* John Kirkham
+* H. Vetinari
+* Bela Stoyan
+* pre-commit-ci[bot]
+* Matthias Diener
+* Antonio S. Cofiño
+
+
+
 v3.30.4
 ====================
 

conda_smithy/anaconda_token_rotation.py

@@ -8,6 +8,7 @@
 Note that if you are using appveyor, you will need to push the changes to the
 conda-forge.yml in your feedstock to GitHub.
 """
+
 import os
 import sys
 from contextlib import redirect_stderr, redirect_stdout

conda_smithy/azure_ci_utils.py

@@ -83,10 +83,10 @@ def get_service_endpoint(config: AzureConfig = default_config):
     service_endpoint_client = ServiceEndpointClient(
         base_url=config.instance_base_url, creds=config.credentials
     )
-    endpoints: typing.List[
-        ServiceEndpoint
-    ] = service_endpoint_client.get_service_endpoints(
-        project=config.project_name, type="GitHub"
+    endpoints: typing.List[ServiceEndpoint] = (
+        service_endpoint_client.get_service_endpoints(
+            project=config.project_name, type="GitHub"
+        )
     )
     for service_endpoint in endpoints:
         if service_endpoint.name == config.org_or_user:
@@ -224,9 +224,9 @@ def register_repo(github_org, repo_name, config: AzureConfig = default_config):
     )
 
     # clean up existing builds for the same feedstock if present
-    existing_definitions: typing.List[
-        BuildDefinitionReference
-    ] = bclient.get_definitions(project=config.project_name, name=repo_name)
+    existing_definitions: typing.List[BuildDefinitionReference] = (
+        bclient.get_definitions(project=config.project_name, name=repo_name)
+    )
     if existing_definitions:
         assert len(existing_definitions) == 1
         ed = existing_definitions[0]

conda_smithy/ci_skeleton.py

@@ -5,6 +5,7 @@
 Note that your CI jobs will still execute under your organization, and not be
 added to conda-forge's queue.
 """
+
 import os
 import sys
 

conda_smithy/cirun_utils.py

@@ -1,6 +1,7 @@
 """
 See http://py.cirun.io/api.html for cirun client docs
 """
+
 import os
 from functools import lru_cache
 from typing import List, Dict, Any, Optional