diff --git a/.authors.yml b/.authors.yml index 6e2000a89..43821e5a3 100644 --- a/.authors.yml +++ b/.authors.yml @@ -247,7 +247,7 @@ email: isuru.11@cse.mrt.ac.lk alternate_emails: - isuruf@gmail.com - num_commits: 532 + num_commits: 553 first_commit: 2017-01-08 22:03:03 github: isuruf - name: Julian Rüth @@ -476,14 +476,14 @@ github: jwillemsen - name: Jaime Rodríguez-Guerra email: jaimergp@users.noreply.github.com - num_commits: 125 + num_commits: 126 first_commit: 2020-11-01 14:18:08 github: jaimergp - name: Bastian Zimmermann email: 10774221+BastianZim@users.noreply.github.com aliases: - BastianZim - num_commits: 9 + num_commits: 18 first_commit: 2021-01-27 15:01:39 github: BastianZim - name: Wolf Vollprecht @@ -585,10 +585,14 @@ github: zklaus - name: pre-commit-ci[bot] email: 66853113+pre-commit-ci[bot]@users.noreply.github.com - num_commits: 3 + num_commits: 7 first_commit: 2023-10-30 15:49:50 github: carterbox - name: Amit Kumar email: dtu.amit@gmail.com num_commits: 35 first_commit: 2023-08-05 09:06:04 +- name: Jannis Leidel + email: jannis@leidel.info + num_commits: 3 + first_commit: 2023-11-10 10:24:04 diff --git a/.mailmap b/.mailmap index c05c58fd0..5858a8ad4 100644 --- a/.mailmap +++ b/.mailmap @@ -34,6 +34,7 @@ Mark Harfouche Johnny Willemsen Chris Burr Chris Burr Julian Rüth +Bastian Zimmermann <10774221+BastianZim@users.noreply.github.com> BastianZim <10774221+BastianZim@users.noreply.github.com> H. Vetinari John Kirkham John Kirkham John Kirkham jakirkham @@ -53,12 +54,12 @@ Jason Furmanek Patrick Sodré C.A.M. Gerlach refraction-ray -Bastian Zimmermann <10774221+BastianZim@users.noreply.github.com> BastianZim <10774221+BastianZim@users.noreply.github.com> Nicholas Bollweg Leopold Talirz Tom Pollard Bela Stoyan Gonzalo Pena-Castellanos +pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Carlo Carlo Matthew Craig Matt Craig Peter Williams @@ -85,7 +86,7 @@ Florian Rathgeber Bruno Oliveira Tony Kelman Mervin Fansler -pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> +Jannis Leidel Guilherme Quentel Melo santi buijennifer diff --git a/AUTHORS.rst b/AUTHORS.rst index 60d56944d..f1bb32694 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -22,6 +22,7 @@ Authors are sorted by number of commits. * Johnny Willemsen * Chris Burr * Julian Rüth +* Bastian Zimmermann * H. Vetinari * John Kirkham * Daniel Bast @@ -39,12 +40,12 @@ Authors are sorted by number of commits. * Patrick Sodré * C.A.M. Gerlach * refraction-ray -* Bastian Zimmermann * Nicholas Bollweg * Leopold Talirz * Tom Pollard * Bela Stoyan * Gonzalo Pena-Castellanos +* pre-commit-ci[bot] * Carlo * Matthew Craig * Peter Williams @@ -68,7 +69,7 @@ Authors are sorted by number of commits. * Bruno Oliveira * Tony Kelman * Mervin Fansler -* pre-commit-ci[bot] +* Jannis Leidel * Guilherme Quentel Melo * santi * buijennifer diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 1c57fa1fc..39b69fc1f 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -4,6 +4,41 @@ conda-smithy Change Log .. current developments +v3.29.0 +==================== + +**Added:** + +* Added an --without-all option to ci-register/register-feedstock-token to disable all CI + and --with- would selectively enable the CI service (#1793, #1796). +* Added a lint to check that staged-recipes maintainers have + commented on the PR that they are willing to maintain the recipe. (#1792) + +**Changed:** + +* Require pygithub>=2 as github actions secrets need that version. (#1797) +* When upload_on_branch is set, GHA is triggered only for that branch (#1687). + +**Fixed:** + +* The team name for cirun was fixed. Previously the team name passed had + -feedstock in it and also did not support teams as maintainers. + For teams like conda-forge/r, if they are added to a feedstock after + Cirun is configured, the feedstock needs to be reconfigured (#1794). +* Fixed getting cirun installation id for non conda-forge orgs (#1795). +* Fix name of anaconda.org in README template, to prevent confusion with anaconda.cloud (#1798). +* Skip running some tests locally when GH_TOKEN is not set (#1797). + +**Authors:** + +* Isuru Fernando +* Jaime Rodríguez-Guerra +* Bastian Zimmermann +* pre-commit-ci[bot] +* Jannis Leidel + + + v3.28.0 ==================== diff --git a/news/ci_register.rst b/news/ci_register.rst deleted file mode 100644 index a7b3f3bbf..000000000 --- a/news/ci_register.rst +++ /dev/null @@ -1,24 +0,0 @@ -**Added:** - -* Added an --without-all option to ci-register/register-feedstock-token to disable all CI - and --with- would selectively enable the CI service (#1793, #1796). - -**Changed:** - -* - -**Deprecated:** - -* - -**Removed:** - -* - -**Fixed:** - -* - -**Security:** - -* diff --git a/news/cirun.rst b/news/cirun.rst deleted file mode 100644 index 6fc64953e..000000000 --- a/news/cirun.rst +++ /dev/null @@ -1,26 +0,0 @@ -**Added:** - -* - -**Changed:** - -* - -**Deprecated:** - -* - -**Removed:** - -* - -**Fixed:** - -* The team name for cirun was fixed. Previously the team name passed had - -feedstock in it and also did not support teams as maintainers. - For teams like conda-forge/r, if they are added to a feedstock after - Cirun is configured, the feedstock needs to be reconfigured (#1794). - -**Security:** - -* diff --git a/news/cirun_id.rst b/news/cirun_id.rst deleted file mode 100644 index 787a68d0e..000000000 --- a/news/cirun_id.rst +++ /dev/null @@ -1,23 +0,0 @@ -**Added:** - -* - -**Changed:** - -* - -**Deprecated:** - -* - -**Removed:** - -* - -**Fixed:** - -* Fixed getting cirun installation id for non conda-forge orgs (#1795). - -**Security:** - -* diff --git a/news/fix-name.rst b/news/fix-name.rst deleted file mode 100644 index 97e08af6d..000000000 --- a/news/fix-name.rst +++ /dev/null @@ -1,23 +0,0 @@ -**Added:** - -* - -**Changed:** - -* - -**Deprecated:** - -* - -**Removed:** - -* - -**Fixed:** - -* Fix name of anaconda.org in README template, to prevent confusion with anaconda.cloud (#1798). - -**Security:** - -* diff --git a/news/maint_staged.rst b/news/maint_staged.rst deleted file mode 100644 index 638845013..000000000 --- a/news/maint_staged.rst +++ /dev/null @@ -1,24 +0,0 @@ -**Added:** - -* Added a lint to check that staged-recipes maintainers have - commented on the PR that they are willing to maintain the recipe. (#1792) - -**Changed:** - -* - -**Deprecated:** - -* - -**Removed:** - -* - -**Fixed:** - -* - -**Security:** - -* diff --git a/news/pygithub.rst b/news/pygithub.rst deleted file mode 100644 index 36eb66f0e..000000000 --- a/news/pygithub.rst +++ /dev/null @@ -1,23 +0,0 @@ -**Added:** - -* - -**Changed:** - -* Require pygithub>=2 as github actions secrets need that version. (#1797) - -**Deprecated:** - -* - -**Removed:** - -* - -**Fixed:** - -* - -**Security:** - -* diff --git a/news/tests_locally.rst b/news/tests_locally.rst deleted file mode 100644 index 0e43413a8..000000000 --- a/news/tests_locally.rst +++ /dev/null @@ -1,23 +0,0 @@ -**Added:** - -* - -**Changed:** - -* - -**Deprecated:** - -* - -**Removed:** - -* - -**Fixed:** - -* Skip running some tests locally when GH_TOKEN is not set (#1797). - -**Security:** - -* diff --git a/news/upload_gha.rst b/news/upload_gha.rst deleted file mode 100644 index 2caa45a55..000000000 --- a/news/upload_gha.rst +++ /dev/null @@ -1,23 +0,0 @@ -**Added:** - -* - -**Changed:** - -* When upload_on_branch is set, GHA is triggered only for that branch (#1687). - -**Deprecated:** - -* - -**Removed:** - -* - -**Fixed:** - -* - -**Security:** - -*