Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge 3.27.x back into main #5017

Merged
merged 2 commits into from
Sep 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 31 additions & 9 deletions .authors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1199,7 +1199,7 @@
alternate_emails:
- [email protected]
- name: Ken Odegard
num_commits: 130
num_commits: 133
email: [email protected]
first_commit: 2020-09-08 19:53:41
github: kenodegard
Expand All @@ -1222,7 +1222,7 @@
first_commit: 2020-11-19 10:46:41
- name: Jannis Leidel
email: [email protected]
num_commits: 27
num_commits: 30
github: jezdez
first_commit: 2020-11-19 10:46:41
- name: Christof Kaufmann
Expand All @@ -1237,7 +1237,7 @@
github: pre-commit-ci[bot]
aliases:
- pre-commit-ci[bot]
num_commits: 48
num_commits: 52
first_commit: 2021-11-20 01:47:17
- name: Jacob Walls
email: [email protected]
Expand All @@ -1248,7 +1248,7 @@
github: beeankha
alternate_emails:
- [email protected]
num_commits: 19
num_commits: 20
first_commit: 2022-01-19 16:40:06
- name: Conda Bot
email: [email protected]
Expand All @@ -1259,7 +1259,7 @@
alternate_emails:
- [email protected]
- [email protected]
num_commits: 35
num_commits: 38
first_commit: 2022-01-17 18:09:22
- name: Uwe L. Korn
email: [email protected]
Expand Down Expand Up @@ -1294,8 +1294,10 @@
first_commit: 2022-04-18 12:03:05
- name: Jürgen Gmach
email: [email protected]
alternate_emails:
- [email protected]
github: jugmac00
num_commits: 2
num_commits: 3
first_commit: 2022-05-31 07:52:17
- name: Katherine Kinnaman
email: [email protected]
Expand All @@ -1305,7 +1307,7 @@
- name: dependabot[bot]
email: 49699333+dependabot[bot]@users.noreply.github.com
github: dependabot[bot]
num_commits: 3
num_commits: 4
first_commit: 2022-05-31 04:34:40
- name: Serhii Kupriienko
email: [email protected]
Expand All @@ -1322,7 +1324,7 @@
- name: Jaime Rodríguez-Guerra
email: [email protected]
github: jaimergp
num_commits: 3
num_commits: 4
first_commit: 2022-11-02 19:34:51
- name: Dave Clements
email: [email protected]
Expand Down Expand Up @@ -1369,7 +1371,7 @@
aliases:
- Ryan
github: ryanskeith
num_commits: 3
num_commits: 5
first_commit: 2023-03-22 03:11:02
- name: Rishabh Singh
email: [email protected]
Expand All @@ -1393,3 +1395,23 @@
github: josegonzalez
num_commits: 1
first_commit: 2023-06-14 16:02:40
- name: Jack Olivieri
email: [email protected]
github: boldorider4
num_commits: 1
first_commit: 2023-08-30 10:32:34
- name: Wolf Vollprecht
email: [email protected]
github: wolfv
num_commits: 1
first_commit: 2023-09-22 07:01:49
- name: Dave Karetnyk
email: [email protected]
github: DaveKaretnyk
num_commits: 1
first_commit: 2023-09-16 05:21:09
- name: Shaun Walbridge
email: [email protected]
github: scdub
num_commits: 2
first_commit: 2023-08-18 02:53:28
6 changes: 5 additions & 1 deletion .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ Daniel Holth <[email protected]>
Darren Dale <[email protected]>
Dave Clements <[email protected]>
Dave Hirschfeld <[email protected]> David Hirschfeld <[email protected]>
Dave Karetnyk <[email protected]>
David Froger <[email protected]>
David Li <[email protected]>
Derek Ludwig <[email protected]>
Expand Down Expand Up @@ -107,6 +108,7 @@ Ilan Schnell <[email protected]> Ilan Schnell <[email protected]
Ilan Schnell <[email protected]> Ilan Schnell <[email protected]>
Isuru Fernando <[email protected]> Isuru Fernando <[email protected]>
Ivan Kalev <[email protected]> ikalev <[email protected]>
Jack Olivieri <[email protected]>
Jacob Walls <[email protected]>
Jaime Rodríguez-Guerra <[email protected]>
James Abbott <[email protected]>
Expand Down Expand Up @@ -136,7 +138,7 @@ Joseph Hunkeler <[email protected]>
Juan Lasheras <[email protected]> jlas <[email protected]>
Julian Rüth <[email protected]>
Julien Schueller <[email protected]>
Jürgen Gmach <[email protected]>
Jürgen Gmach <[email protected]> Jürgen Gmach <[email protected]>
Jędrzej Nowak <[email protected]> Jedrzej Nowak <[email protected]>
Kai Tietz <[email protected]> Kai Tietz <[email protected]>
Kale Franz <[email protected]> Kale Franz <[email protected]>
Expand Down Expand Up @@ -230,6 +232,7 @@ Sean Yen <[email protected]> seanyen <[email protected]>
Sergio Oller <[email protected]>
Serhii Kupriienko <[email protected]>
Shaun Walbridge <[email protected]>
Shaun Walbridge <[email protected]>
Siu Kwan Lam <[email protected]>
Sophia Castellarin <[email protected]> sophia <[email protected]>
Sophia Castellarin <[email protected]> sophia <[email protected]>
Expand Down Expand Up @@ -267,6 +270,7 @@ Uwe L. Korn <[email protected]>
Vlad Frolov <[email protected]>
Wes Turner <[email protected]>
Wim Glenn <[email protected]> wim glenn <[email protected]>
Wolf Vollprecht <[email protected]>
Wolfgang Ulmer <[email protected]>
Yann <[email protected]>
Yoav Ram <[email protected]>
Expand Down
4 changes: 4 additions & 0 deletions AUTHORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ Authors are sorted alphabetically.
* Darren Dale
* Dave Clements
* Dave Hirschfeld
* Dave Karetnyk
* David Froger
* David Li
* Derek Ludwig
Expand Down Expand Up @@ -89,6 +90,7 @@ Authors are sorted alphabetically.
* Ilan Schnell
* Isuru Fernando
* Ivan Kalev
* Jack Olivieri
* Jacob Walls
* Jaime Rodríguez-Guerra
* James Abbott
Expand Down Expand Up @@ -193,6 +195,7 @@ Authors are sorted alphabetically.
* Sergio Oller
* Serhii Kupriienko
* Shaun Walbridge
* Shaun Walbridge
* Siu Kwan Lam
* Sophia Castellarin
* Sophian Guidara
Expand Down Expand Up @@ -226,6 +229,7 @@ Authors are sorted alphabetically.
* Vlad Frolov
* Wes Turner
* Wim Glenn
* Wolf Vollprecht
* Wolfgang Ulmer
* Yann
* Yoav Ram
Expand Down
40 changes: 40 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,45 @@
[//]: # (current developments)

## 3.27.0 (2023-09-26)

### Enhancements

* Remove `glob2` dependency. As of Python 3.5, the '**', operator was available to `glob` when using `recursive=True`. Builtin glob is also much faster. (#5005)
* Handle `emscripten-wasm32` and `wasi-wasm32` platforms. (#4813)

### Bug fixes

* Delay imports in conda command plugin until the command is used, avoiding import-time side effects. (#4949)

### Deprecations

* When templating new recipes from a PyPI package, the build script `{{ PYTHON }} -m pip install . -vv` is deprecated in favor of `{{ PYTHON }} -m pip install . -vv --no-deps --no-build-isolation`. (#4960)

### Docs

* Document `~=` (compatibility release) match spec. (#4553)
* Clarify that the `build` prefix is activated _after_ the `host` prefix. (#4942)
* Add explanation that conda-build should be run from the base environment. (#4995)

### Contributors

* @beeankha
* @conda-bot
* @dholth
* @DaveKaretnyk made their first contribution in https://github.com/conda/conda-build/pull/5004
* @boldorider4 made their first contribution in https://github.com/conda/conda-build/pull/4960
* @jaimergp
* @jezdez
* @jugmac00
* @kenodegard
* @ryanskeith
* @scdub made their first contribution in https://github.com/conda/conda-build/pull/4965
* @wolfv made their first contribution in https://github.com/conda/conda-build/pull/4813
* @dependabot[bot]
* @pre-commit-ci[bot]



## 3.26.1 (2023-08-17)

### Bug fixes
Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ $ conda info
$ conda install -n base conda-build
```


## Building Your Own Packages

You can easily build your own packages for `conda`, and upload them to
Expand Down
3 changes: 0 additions & 3 deletions news/4553-document-compatibility-release-operator

This file was deleted.

3 changes: 0 additions & 3 deletions news/4792-remove-glob2

This file was deleted.

19 changes: 0 additions & 19 deletions news/4813-wasm-platforms

This file was deleted.

19 changes: 0 additions & 19 deletions news/4942-docs-prefix-activation

This file was deleted.

20 changes: 0 additions & 20 deletions news/4956-improve-command-plugin

This file was deleted.

19 changes: 0 additions & 19 deletions news/4960-conform-to-recipe-standards

This file was deleted.

19 changes: 0 additions & 19 deletions news/4995-run-conda-build-in-base-env

This file was deleted.

Loading