Skip to content

Commit

Permalink
Merge branch 'main' into safter_build_locally
Browse files Browse the repository at this point in the history
  • Loading branch information
hmaarrfk committed Aug 12, 2024
2 parents 245e380 + 5dafc25 commit 1d486e6
Show file tree
Hide file tree
Showing 95 changed files with 11,432 additions and 2,310 deletions.
92 changes: 74 additions & 18 deletions .authors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
aliases:
- John Kirkham
- jakirkham
num_commits: 23
num_commits: 31
first_commit: 2016-03-17 21:05:53
github: jakirkham
- name: Daniel Bast
Expand Down Expand Up @@ -72,7 +72,7 @@
first_commit: 2018-11-21 04:54:55
- name: John Blischak
email: jdblischak@gmail.com
num_commits: 5
num_commits: 7
first_commit: 2017-11-06 16:48:18
github: jdblischak
- name: roryk
Expand Down Expand Up @@ -119,7 +119,7 @@
first_commit: 2019-02-17 13:35:45
- name: Min RK
email: benjaminrk@gmail.com
num_commits: 30
num_commits: 34
first_commit: 2016-09-15 09:07:34
github: minrk
- name: Phil Elson
Expand Down Expand Up @@ -182,7 +182,7 @@
email: marcel.bargull@udo.edu
alternate_emails:
- mbargull@users.noreply.github.com
num_commits: 25
num_commits: 34
first_commit: 2018-07-30 05:17:51
github: mbargull
- name: xoviat
Expand All @@ -196,7 +196,7 @@
first_commit: 2017-02-12 15:31:00
- name: Nicholas Bollweg
email: nick.bollweg@gmail.com
num_commits: 8
num_commits: 11
first_commit: 2019-05-20 20:03:12
github: bollwyvl
- name: Leopold Talirz
Expand Down Expand Up @@ -236,7 +236,7 @@
email: uwe.korn@quantco.com
alternate_emails:
- xhochy@users.noreply.github.com
num_commits: 41
num_commits: 45
first_commit: 2019-06-27 08:26:49
github: xhochy
- name: C.A.M. Gerlach
Expand All @@ -247,7 +247,7 @@
email: isuru.11@cse.mrt.ac.lk
alternate_emails:
- isuruf@gmail.com
num_commits: 555
num_commits: 664
first_commit: 2017-01-08 22:03:03
github: isuruf
- name: Julian Rüth
Expand Down Expand Up @@ -329,7 +329,7 @@
github: sodre
- name: Mark Harfouche
email: mark.harfouche@gmail.com
num_commits: 23
num_commits: 25
first_commit: 2018-06-12 01:15:09
github: hmaarrfk
- name: Dougal J. Sutherland
Expand Down Expand Up @@ -393,7 +393,7 @@
github: shadowwalkersb
- name: Matthew R. Becker
email: becker.mr@gmail.com
num_commits: 154
num_commits: 256
first_commit: 2020-01-07 17:44:33
github: beckermr
alternate_emails:
Expand Down Expand Up @@ -476,19 +476,19 @@
github: jwillemsen
- name: Jaime Rodríguez-Guerra
email: jaimergp@users.noreply.github.com
num_commits: 126
num_commits: 188
first_commit: 2020-11-01 14:18:08
github: jaimergp
- name: Bastian Zimmermann
email: 10774221+BastianZim@users.noreply.github.com
aliases:
- BastianZim
num_commits: 18
num_commits: 28
first_commit: 2021-01-27 15:01:39
github: BastianZim
- name: Wolf Vollprecht
email: w.vollprecht@gmail.com
num_commits: 6
num_commits: 55
first_commit: 2021-01-19 04:39:35
github: wolfv
- name: Hugo Slepicka
Expand Down Expand Up @@ -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
Expand All @@ -537,7 +537,7 @@
github: nehaljwani
- name: H. Vetinari
email: h.vetinari@gmx.com
num_commits: 18
num_commits: 53
first_commit: 2021-11-14 02:53:10
- name: Benjamin Tovar
email: btovar@nd.edu
Expand All @@ -546,7 +546,9 @@
github: btovar
- name: Mervin Fansler
email: mmfansler@gmail.com
num_commits: 3
alternate_emails:
- fanslerm@mskcc.org
num_commits: 5
first_commit: 2022-02-19 13:45:48
github: mfansler
- name: Sylvain Corlay
Expand All @@ -556,7 +558,7 @@
github: SylvainCorlay
- name: Daniel Ching
email: carterbox@users.noreply.github.com
num_commits: 13
num_commits: 15
first_commit: 2022-05-11 16:57:15
github: carterbox
- name: conda-forge-admin
Expand All @@ -575,7 +577,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
Expand All @@ -585,7 +587,7 @@
github: zklaus
- name: pre-commit-ci[bot]
email: 66853113+pre-commit-ci[bot]@users.noreply.github.com
num_commits: 7
num_commits: 22
first_commit: 2023-10-30 15:49:50
github: carterbox
- name: Amit Kumar
Expand All @@ -596,3 +598,57 @@
email: jannis@leidel.info
num_commits: 3
first_commit: 2023-11-10 10:24:04
- name: David Hirschfeld
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
- name: vinicius douglas cerutti
email: vinivdc2009@hotmail.com
github: viniciusdc
alternate_emails:
- 51954708+viniciusdc@users.noreply.github.com
aliases:
- Vinicius D. Cerutti
- viniciusdc
num_commits: 15
first_commit: 2023-08-03 14:24:14
- name: Yannik Tausch
email: yannik.tausch@quantco.com
num_commits: 17
first_commit: 2024-03-25 05:59:00
github: ytausch
- name: dependabot[bot]
email: 49699333+dependabot[bot]@users.noreply.github.com
num_commits: 2
first_commit: 2024-05-21 04:47:22
- name: nichmor
email: nmorkotilo@gmail.com
num_commits: 126
first_commit: 2024-03-21 10:10:04
github: nichmor
- name: Jan Lehnarsdt
email: jan@apache.org
num_commits: 10
first_commit: 2024-06-20 05:03:27
github: neighbourhoodie
- name: Finn Womack
email: finnwomack@microsoft.com
alternate_emails:
- flan313@gmail.com
num_commits: 4
first_commit: 2024-06-18 21:03:43
github: finnagin
- name: Vincenzo Eduardo Padulano
email: v.e.padulano@gmail.com
num_commits: 1
first_commit: 2024-06-24 02:38:13
- name: Matt Fisher
email: mfisher87@gmail.com
num_commits: 3
first_commit: 2024-06-30 13:54:12
github: mfisher87
3 changes: 3 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
b05b906895b1ae82b31f3a3014e2c4603668cd96
15060eea2bc943c0b10d3658ff178a2f5fd04d34
a5cea13caa66aa1068631795da95c6bd54acc1aa
1 change: 1 addition & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ Below are a few things we ask you kindly to self-check before getting a review.
-->
Checklist
* [ ] Added a ``news`` entry
* [ ] Regenerated schema JSON if schema altered (`python conda_smithy/schema.py`)

<!--
Please note any issues this fixes using [closing keywords]( https://help.github.com/articles/closing-issues-using-keywords/ ):
Expand Down
10 changes: 10 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
version: 2
updates:
- package-ecosystem: "github-actions"
directory: ".github/workflows/"
schedule:
interval: "monthly"
groups:
github-actions:
patterns:
- '*'
15 changes: 15 additions & 0 deletions .github/workflows/_proxy-file-for-dependabot-tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# This file is just a parsable YAML that collects all the actions used by
# conda_smithy/templates/github-actions.yml.tmpl. It's here so dependabot
# can pick it up and then we can test whether the actions are up-to-date in
# the template.
on:
workflow_dispatch:

jobs:
inventory:
runs-on: ubuntu-latest
if: false
steps:
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
- uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4
- uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
4 changes: 2 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
with:
fetch-depth: 0
- name: Set up Conda env
uses: mamba-org/setup-micromamba@2b72821d5ad7f6da3c003a3684ce341bf187b46f
uses: mamba-org/setup-micromamba@f8b8a1e23a26f60a44c853292711bacfd3eac822
with:
environment-file: environment.yml
cache-environment: true
Expand All @@ -40,7 +40,7 @@ jobs:
- name: test versions
run: |
pip uninstall conda-smithy --yes
[[ $(python setup.py --version) != "0.0.0" ]] || exit 1
[[ $(python -m setuptools_scm) != "0.0.0" ]] || exit 1
rm -rf dist/*
python -m build --sdist
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,4 @@ nppBackup/
.mypy_cache/

conda_smithy/_version.py
.pixi/*
43 changes: 27 additions & 16 deletions .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -13,80 +13,89 @@ Isuru Fernando <isuru.11@cse.mrt.ac.lk> Isuru Fernando <isuruf@gmail.com>
Matthew R. Becker <becker.mr@gmail.com> Matthew R Becker <beckermr@users.noreply.github.com>
Matthew R. Becker <becker.mr@gmail.com> beckermr <beckermr@users.noreply.github.com>
Jaime Rodríguez-Guerra <jaimergp@users.noreply.github.com>
nichmor <nmorkotilo@gmail.com>
Christopher J. Wright <cjwright4242gh@gmail.com> christopher <cjwright4242@gmail.com>
Christopher J. Wright <cjwright4242gh@gmail.com> Christopher J. 'CJ' Wright <cjwright4242@gmail.com>
Anthony Scopatz <scopatz@gmail.com>
Phil Elson <pelson.pub@gmail.com> pelson <pelson.pub@gmail.com>
Wolf Vollprecht <w.vollprecht@gmail.com>
H. Vetinari <h.vetinari@gmx.com>
Uwe L. Korn <uwe.korn@quantco.com> Uwe L. Korn <xhochy@users.noreply.github.com>
Filipe Fernandes <ocefpaf@gmail.com> Filipe <ocefpaf@gmail.com>
Filipe Fernandes <ocefpaf@gmail.com> ocefpaf <ocefpaf@gmail.com>
Uwe L. Korn <uwe.korn@quantco.com> Uwe L. Korn <xhochy@users.noreply.github.com>
Dougal J. Sutherland <dougal@gmail.com>
Amit Kumar <dtu.amit@gmail.com>
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>
shadow_walker <shadowwalkersb@gmail.com>
John Kirkham <jakirkham@gmail.com> John Kirkham <kirkhamj@janelia.hhmi.org>
John Kirkham <jakirkham@gmail.com> jakirkham <kirkhamj@janelia.hhmi.org>
Michael Sarahan <msarahan@gmail.com> Mike Sarahan <msarahan@gmail.com>
Bastian Zimmermann <10774221+BastianZim@users.noreply.github.com> BastianZim <10774221+BastianZim@users.noreply.github.com>
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>
Mark Harfouche <mark.harfouche@gmail.com>
Johnny Willemsen <jwillemsen@remedy.nl>
pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.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>
Yannik Tausch <yannik.tausch@quantco.com>
Daniel Bast <2790401+dbast@users.noreply.github.com>
Billy K. Poon <bkpoon@lbl.gov>
Daniel Ching <carterbox@users.noreply.github.com>
vinicius douglas cerutti <vinivdc2009@hotmail.com> Vinicius D. Cerutti <51954708+viniciusdc@users.noreply.github.com>
vinicius douglas cerutti <vinivdc2009@hotmail.com> viniciusdc <51954708+viniciusdc@users.noreply.github.com>
Tim Snyder <snyder.tim@gmail.com>
Mike Henry <11765982+mikemhenry@users.noreply.github.com>
Eric Dill <edill@anaconda.com> Eric Dill <edill@bnl.gov>
Eric Dill <edill@anaconda.com> Eric Dill <thedizzle@gmail.com>
Natasha Pavlovikj <npavlovikj2@unl.edu>
Daniel Ching <carterbox@users.noreply.github.com>
Maksim Rakitin <mrakitin@bnl.gov> Maksim Rakitin <mrakitin@users.noreply.github.com>
Jan Schulz <jasc@gmx.net>
Nicholas Bollweg <nick.bollweg@gmail.com>
Josh Reichardt <josh.reichardt@gmail.com>
Bela Stoyan <bela.stoyan@gmail.com>
Justin Calamari <justin.calamari@gmail.com>
Jason Furmanek <furmanek@us.ibm.com>
Patrick Sodré <psodre@gmail.com>
Jan Lehnarsdt <jan@apache.org>
C.A.M. Gerlach <widenetservices@gmail.com>
refraction-ray <kcanamgal@foxmail.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>
pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
John Blischak <jdblischak@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>
Marius van Niekerk <marius.v.niekerk@gmail.com> Marius Van Niekerk <marius.vanniekerk@maxpoint.com>
Marius van Niekerk <marius.v.niekerk@gmail.com> Marius Van Niekerk <mvanniekerk@flatiron.com>
Johannes Köster <johannes.koester@tu-dortmund.de>
Philippe Blain <levraiphilippeblain@gmail.com>
Mervin Fansler <mmfansler@gmail.com> Mervin Fansler <fanslerm@mskcc.org>
Matt McCormick <matt.mccormick@kitware.com>
Jan Janßen <janssen@mpie.de> Jan Janßen <jan-janssen@users.noreply.github.com>
xoviat <xoviat@users.noreply.github.com>
Elmar Pruesse <epruesse@users.noreply.github.com>
Patrick Sodré <sodre@sodre.co>
David Hirschfeld <david.hirschfeld@stanwell.com>
Finn Womack <finnwomack@microsoft.com> Finn Womack <flan313@gmail.com>
Josh Barnes <joshuacookebarnes@gmail.com>
Tobias Megies <megies@users.noreply.github.com>
Jonathan Helmus <jjhelmus@gmail.com>
Duncan Macleod <duncan.macleod@ligo.org>
Florian Rathgeber <florian.rathgeber@gmail.com>
Bruno Oliveira <nicoddemus@gmail.com>
Tony Kelman <tony@kelman.net>
Mervin Fansler <mmfansler@gmail.com>
Jannis Leidel <jannis@leidel.info>
Matt Fisher <mfisher87@gmail.com>
Guilherme Quentel Melo <gqmelo@gmail.com>
santi <sdvillal@gmail.com>
buijennifer <bui.jennifert@gmail.com>
Expand All @@ -106,6 +115,7 @@ Ben Mares <15216687+maresb@users.noreply.github.com>
Matthew W. Thompson <mattwthompson@protonmail.com>
conda-forge-admin <pelson.pub+conda-forge@gmail.com>
Klaus Zimmermann <klaus.zimmermann@smhi.se>
dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
lorenz <looooo@users.noreply.github.com>
Tom Augspurger <tom.augspurger88@gmail.com>
Ryan May <rmay31@gmail.com>
Expand All @@ -130,3 +140,4 @@ Nehal J Wani <nehaljw.kkd1@gmail.com>
Benjamin Tovar <btovar@nd.edu>
Sylvain Corlay <sylvain.corlay@gmail.com>
Brandon Andersen <31670449+bandersen23@users.noreply.github.com>
Vincenzo Eduardo Padulano <v.e.padulano@gmail.com>
Loading

0 comments on commit 1d486e6

Please sign in to comment.