Skip to content

Commit

Permalink
Merge pull request #1806 from conda-forge/without-all
Browse files Browse the repository at this point in the history
Merge release 3.29.0
  • Loading branch information
isuruf authored Nov 21, 2023
2 parents d7dcdc2 + 6417374 commit f7e68c1
Show file tree
Hide file tree
Showing 12 changed files with 49 additions and 197 deletions.
12 changes: 8 additions & 4 deletions .authors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@
email: [email protected]
alternate_emails:
- [email protected]
num_commits: 532
num_commits: 553
first_commit: 2017-01-08 22:03:03
github: isuruf
- name: Julian Rüth
Expand Down Expand Up @@ -476,14 +476,14 @@
github: jwillemsen
- name: Jaime Rodríguez-Guerra
email: [email protected]
num_commits: 125
num_commits: 126
first_commit: 2020-11-01 14:18:08
github: jaimergp
- name: Bastian Zimmermann
email: [email protected]
aliases:
- BastianZim
num_commits: 9
num_commits: 18
first_commit: 2021-01-27 15:01:39
github: BastianZim
- name: Wolf Vollprecht
Expand Down Expand Up @@ -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: [email protected]
num_commits: 35
first_commit: 2023-08-05 09:06:04
- name: Jannis Leidel
email: [email protected]
num_commits: 3
first_commit: 2023-11-10 10:24:04
5 changes: 3 additions & 2 deletions .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ Mark Harfouche <[email protected]>
Johnny Willemsen <[email protected]>
Chris Burr <[email protected]> Chris Burr <[email protected]>
Julian Rüth <[email protected]>
Bastian Zimmermann <[email protected]> BastianZim <[email protected]>
H. Vetinari <[email protected]>
John Kirkham <[email protected]> John Kirkham <[email protected]>
John Kirkham <[email protected]> jakirkham <[email protected]>
Expand All @@ -53,12 +54,12 @@ Jason Furmanek <[email protected]>
Patrick Sodré <[email protected]>
C.A.M. Gerlach <[email protected]>
refraction-ray <[email protected]>
Bastian Zimmermann <[email protected]> BastianZim <[email protected]>
Nicholas Bollweg <[email protected]>
Leopold Talirz <[email protected]>
Tom Pollard <[email protected]>
Bela Stoyan <[email protected]>
Gonzalo Pena-Castellanos <[email protected]>
pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Carlo <[email protected]> Carlo <[email protected]>
Matthew Craig <[email protected]> Matt Craig <[email protected]>
Peter Williams <[email protected]>
Expand All @@ -85,7 +86,7 @@ Florian Rathgeber <[email protected]>
Bruno Oliveira <[email protected]>
Tony Kelman <[email protected]>
Mervin Fansler <[email protected]>
pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Jannis Leidel <[email protected]>
Guilherme Quentel Melo <[email protected]>
santi <[email protected]>
buijennifer <[email protected]>
Expand Down
5 changes: 3 additions & 2 deletions AUTHORS.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
35 changes: 35 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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-<ci> 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
====================

Expand Down
24 changes: 0 additions & 24 deletions news/ci_register.rst

This file was deleted.

26 changes: 0 additions & 26 deletions news/cirun.rst

This file was deleted.

23 changes: 0 additions & 23 deletions news/cirun_id.rst

This file was deleted.

23 changes: 0 additions & 23 deletions news/fix-name.rst

This file was deleted.

24 changes: 0 additions & 24 deletions news/maint_staged.rst

This file was deleted.

23 changes: 0 additions & 23 deletions news/pygithub.rst

This file was deleted.

23 changes: 0 additions & 23 deletions news/tests_locally.rst

This file was deleted.

23 changes: 0 additions & 23 deletions news/upload_gha.rst

This file was deleted.

0 comments on commit f7e68c1

Please sign in to comment.