Skip to content

Commit

Permalink
Merge pull request #447 from FaustinCarter/release-3.2.1
Browse files Browse the repository at this point in the history
Release 3.2.1
  • Loading branch information
mcg1969 committed Mar 31, 2021
2 parents 4499421 + fb60a6b commit 16598df
Show file tree
Hide file tree
Showing 4 changed files with 172 additions and 24 deletions.
110 changes: 100 additions & 10 deletions .authors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
- msarahan@continuum.io
aliases:
- Mike Sarahan
num_commits: 22
num_commits: 38
first_commit: 2015-09-04 21:31:08
- name: Jonathan J. Helmus
email: jjhelmus@gmail.com
Expand All @@ -31,7 +31,7 @@
github: megies
- name: Thomas Holder
email: thomas.holder@schrodinger.com
num_commits: 3
num_commits: 4
first_commit: 2018-07-25 06:07:20
github: speleo3
- name: Sophia Castellarin
Expand Down Expand Up @@ -69,9 +69,13 @@
- ilan@continuum.io
num_commits: 351
first_commit: 2016-02-12 00:50:29
- name: jlstevens
- name: Jean-Luc Stevens
email: jlstevens@ed.ac.uk
num_commits: 1
alternate_emails:
- jlrstevens@gmail.com
aliases:
- jlstevens
num_commits: 2
first_commit: 2016-12-13 15:56:37
github: jlstevens
- name: bkreider
Expand All @@ -85,7 +89,11 @@
github: nehaljwani
- name: Wolfgang Ulmer
email: wulmer@web.de
num_commits: 1
alternate_emails:
- wolfgang.Ulmer@de.bosch.com
aliases:
- Ulmer Wolfgang (CR/AEE3)
num_commits: 2
first_commit: 2017-01-18 15:21:20
github: wulmer
- name: Martin Durant
Expand Down Expand Up @@ -139,11 +147,93 @@
- name: Michael C. Grant
email: mgrant@anaconda.com
alternate_emails:
- mcg@cvxr.com
- mcg@cvxr.com
num_commits: 56
first_commit: 2016-06-13 12:15:26
github: schrodinger
- name: Forrest Waters
email: forrestwaters65@gmail.com
alternate_emails:
- fwaters@0609.local
- person@example.com
- fwaters@anaconda.com

- fwaters@0609.local
- person@example.com
- fwaters@anaconda.com
num_commits: 9
first_commit: 2019-09-16 12:40:55
github: forrestwaters
- name: Gabriel Reis
email: gabrielcnr@gmail.com
num_commits: 1
first_commit: 2020-10-15 10:54:33
github: gabrielcnr
- name: Chris Burr
email: christopher.burr@cern.ch
num_commits: 7
first_commit: 2020-08-31 13:41:03
- name: Mariana Meireles
email: marian.meireles@gmail.com
num_commits: 1
first_commit: 2020-09-02 02:28:26
github: marimeireles
- name: astaric
email: anze.staric@gmail.com
num_commits: 1
first_commit: 2019-08-28 05:42:13
- name: Angela Gloyna
email: angela.gloyna@gmail.com
num_commits: 8
first_commit: 2020-05-04 20:34:58
- name: Eric Prestat
email: eric.prestat@gmail.com
num_commits: 19
first_commit: 2019-09-20 04:38:09
github: ericpre
- name: Phil Elson
email: philip.elson@cern.ch
num_commits: 2
first_commit: 2020-08-11 01:55:00
github: pelson
- name: Mark Harfouche
email: mark.harfouche@gmail.com
num_commits: 6
first_commit: 2020-08-29 16:45:08
github: hmaarrfk
- name: Rachel Rigdon
email: rrigdon@anaconda.com
alternate_emails:
- 45607889+rrigdon@users.noreply.github.com
num_commits: 2
github: rrigdon
aliases:
- rrigdon
first_commit: 2019-11-25 08:20:28
- name: Anthony Scopatz
email: scopatz@gmail.com
num_commits: 7
first_commit: 2020-05-19 09:30:54
github: scopatz
- name: Pradipta Ghosh
email: pradghos@in.ibm.com
num_commits: 1
first_commit: 2020-06-19 08:33:22
github: pradghos
- name: Faustin Carter
email: faustin.carter@gmail.com
alternate_emails:
- fwcarter@hrl.com
num_commits: 7
first_commit: 2020-10-21 10:45:10
github: FaustinCarter
- name: Connor Martin
email: connormartin7@gmail.com
num_commits: 1
first_commit: 2021-03-24 12:38:03
- name: Isuru Fernando
email: isuruf@gmail.com
num_commits: 20
first_commit: 2020-02-08 00:55:25
github: isuruf
- name: Tom Hören
email: horen.tom@gmail.com
num_commits: 1
first_commit: 2020-07-19 09:44:03
github: nerohmot
26 changes: 22 additions & 4 deletions .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -11,28 +11,46 @@

Ilan Schnell <ilanschnell@gmail.com> Ilan Schnell <ilan@continuum.io>
Nehal J Wani <nehaljw.kkd1@gmail.com>
Michael C. Grant <mgrant@anaconda.com> Michael C. Grant <mcg@cvxr.com>
Ray Donnelly <mingw.android@gmail.com>
Michael Sarahan <msarahan@gmail.com> Mike Sarahan <msarahan@continuum.io>
Isuru Fernando <isuruf@gmail.com>
Eric Prestat <eric.prestat@gmail.com>
Marcel Bargull <marcel.bargull@udo.edu>
Kale Franz <kfranz@continuum.io> Kale Franz <kalefranz@users.noreply.github.com>
Forrest Waters <forrestwaters65@gmail.com> Forrest Waters <fwaters@0609.local>
Forrest Waters <forrestwaters65@gmail.com> Forrest Waters <person@example.com>
Forrest Waters <forrestwaters65@gmail.com> Forrest Waters <fwaters@anaconda.com>
Angela Gloyna <angela.gloyna@gmail.com>
Chris Burr <christopher.burr@cern.ch>
Anthony Scopatz <scopatz@gmail.com>
Faustin Carter <faustin.carter@gmail.com> Faustin Carter <fwcarter@hrl.com>
Mark Harfouche <mark.harfouche@gmail.com>
Martin Durant <martin.durant@utoronto.ca>
Aaron Stevens <bheklilr2@gmail.com>
Michael C. Grant <mcg@cvxr.com>
Eric Dill <thedizzle@gmail.com>
Thomas Holder <thomas.holder@schrodinger.com>
Eric Dill <thedizzle@gmail.com>
Jonathan J. Helmus <jjhelmus@gmail.com> Jonathan Helmus <jjhelmus@gmail.com>
Tobias Megies <megies@geophysik.uni-muenchen.de>
Sophia Castellarin <scastellarin@anaconda.com> soapy1 <scastellarin@anaconda.com>
Matthew Newville <newville@cars.uchicago.edu>
Jean-Luc Stevens <jlstevens@ed.ac.uk> jlstevens <jlrstevens@gmail.com>
Wolfgang Ulmer <wulmer@web.de> Ulmer Wolfgang (CR/AEE3) <wolfgang.Ulmer@de.bosch.com>
Mathew Topper <damm_horse@yahoo.co.uk>
Thomas Antony <tantony@purdue.edu>
Phil Elson <philip.elson@cern.ch>
Rachel Rigdon <rrigdon@anaconda.com> rrigdon <45607889+rrigdon@users.noreply.github.com>
Gonzalo Pena-Castellanos <goanpeca@gmail.com>
y2kbugger <git@y2kbugger.com>
jlstevens <jlstevens@ed.ac.uk>
bkreider <github-bk@drrr.net>
Wolfgang Ulmer <wulmer@web.de>
Ian Henriksen <insertinterestingnamehere@gmail.com>
Travis E. Oliphant <travis@continuum.io>
Thomas Robitaille <thomas.robitaille@gmail.com>
John Kirkham <kirkhamj@janelia.hhmi.org>
Trent Nelson <trent@trent.me>
Gabriel Reis <gabrielcnr@gmail.com>
Mariana Meireles <marian.meireles@gmail.com>
astaric <anze.staric@gmail.com>
Pradipta Ghosh <pradghos@in.ibm.com>
Connor Martin <connormartin7@gmail.com>
Tom Hören <horen.tom@gmail.com>
26 changes: 20 additions & 6 deletions AUTHORS.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,30 +3,44 @@ Authors are sorted by number of commits.

* Ilan Schnell
* Nehal J Wani
* Michael C. Grant
* Ray Donnelly
* Michael Sarahan
* Isuru Fernando
* Eric Prestat
* Marcel Bargull
* Kale Franz
* Forrest Waters
* Angela Gloyna
* Chris Burr
* Anthony Scopatz
* Faustin Carter
* Mark Harfouche
* Martin Durant
* Aaron Stevens
* Michael C. Grant
* Eric Dill
* Thomas Holder
* Eric Dill
* Jonathan J. Helmus
* Tobias Megies
* Sophia Castellarin
* Matthew Newville
* Jean-Luc Stevens
* Wolfgang Ulmer
* Mathew Topper
* Thomas Antony
* Phil Elson
* Rachel Rigdon
* Gonzalo Pena-Castellanos
* y2kbugger
* jlstevens
* bkreider
* Wolfgang Ulmer
* Ian Henriksen
* Travis E. Oliphant
* Thomas Robitaille
* John Kirkham
* Trent Nelson


* Gabriel Reis
* Mariana Meireles
* astaric
* Pradipta Ghosh
* Connor Martin
* Tom Hören
34 changes: 30 additions & 4 deletions CHANGELOG.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,35 @@
2020-XX-XX X.X.X: (unreleased)
--------------------------------
2020-03-30 3.2.1:
-------------------
* Common:
- Fixed bug in platform selector regex parsing that was incompatible with using jinja-templated env vars and platform selectors on the same line #428
- New option in construct.yaml (`batch_mode`) to make passing the `-b` flag the default option #440
- New option in construct.yaml (`check_path_spaces`) to suppress the "Destination Folder contains spaces" warning on Windows #431
- Duplicate package files found at environment creation during build on Windows now raises a warning rather than crashing #435

* Shell:
- aarch64 installer now properly checks if system is aarch64 #441

* PKG:
- Initialize all shells post-install on OSX #444

* NSIS:
- Support for custom ``nsis_templates`` through the ``nsis_template``
variable.
- change the default prefix for domain user to `%LOCALAPPDATA%` and the option `default_prefix_domain_user` to set its default value #415
- Fix default installation folder all users and add option `default_prefix_all_users` to set its default value #419
- Partial fix for removing menu shortcut of other distributions when uninstalling #420
- Fix a typo in informational message #424
- Support for custom `nsis_templates` through the `nsis_template` variable. #423


2020-11-14 3.2.0:
-------------------
* COMMON:
- `construct.yaml` file now reads environment variables during the Jinja2 parsing stage. Env vars can be included like: `{{ environ["ENV_VAR"] }}` (#413).
- Fixed bug where constructor crashed if a listed spec was in a noarch-only channel (i.e. without a subdir for the specific platform) (#409).
- Avoid adding newly installed environment to the list of global conda environments if conda isn't included in the installer itself. (#372)

* SHELL:
- The user-shell initialisation phase of the installer is no longer included in the install script if there is no conda available in the installed environment.
- The "test" option is only available if conda is installed in the environment. Previously this would fail in this situation.

2020-09-31 3.1.0:
-------------------
Expand Down

0 comments on commit 16598df

Please sign in to comment.