Commit 2222267b authored by Andreas Tille's avatar Andreas Tille
Browse files

New upstream version 3.18.11

parent 52e60d50
Loading
Loading
Loading
Loading
+169 −21
Original line number Diff line number Diff line
@@ -5,20 +5,20 @@
  - msarahan@continuum.io
  aliases:
  - Mike Sarahan
  num_commits: 66
  num_commits: 145
  first_commit: 2015-09-04 21:31:08
- name: Jonathan J. Helmus
  email: jjhelmus@gmail.com
  aliases:
  - Jonathan Helmus
  num_commits: 30
  num_commits: 52
  first_commit: 2014-06-09 17:25:05
  github: jjhelmus
- name: Isuru Fernando
  email: isuruf@gmail.com
  alternate_emails:
  - isuru.11@cse.mrt.ac.lk
  num_commits: 16
  num_commits: 28
  first_commit: 2017-06-16 15:14:34
  github: isuruf
- name: Dan Blanchard
@@ -41,7 +41,7 @@
  email: teake.nutma@gmail.com
  alternate_emails:
  - t.a.nutma@rug.nl
  num_commits: 8
  num_commits: 9
  first_commit: 2018-08-16 10:53:19
  github: teake
- name: Phil Elson
@@ -180,7 +180,7 @@
  email: marius.v.niekerk@gmail.com
  alternate_emails:
  - mvanniekerk@flatiron.com
  num_commits: 2
  num_commits: 6
  first_commit: 2018-02-22 13:07:33
  github: mariusvniekerk
- name: Travis Oliphant
@@ -232,7 +232,7 @@
  github: hajs
- name: Christoph Buchner
  email: bilderbuchi@users.noreply.github.com
  num_commits: 2
  num_commits: 6
  first_commit: 2018-03-22 14:11:45
  github: bilderbuchi
- name: iainsgillis
@@ -344,7 +344,7 @@
  github: ClinicalGraphics
- name: John Blischak
  email: jdblischak@gmail.com
  num_commits: 8
  num_commits: 9
  first_commit: 2017-08-11 13:23:55
  github: jdblischak
- name: Floris Bruynooghe
@@ -414,7 +414,7 @@
- name: Ray Donnelly
  email: mingw.android@gmail.com
  github: mingwandroid
  num_commits: 308
  num_commits: 415
  first_commit: 2016-03-06 18:52:51
- name: Paul Madden
  email: maddenp@colorado.edu
@@ -423,7 +423,7 @@
  github: maddenp
- name: Tim Snyder
  email: snyder.tim@gmail.com
  num_commits: 8
  num_commits: 9
  first_commit: 2017-04-28 11:08:14
  github: timsnyder
- name: dlovell
@@ -446,7 +446,7 @@
  first_commit: 2014-05-19 21:15:57
- name: neok-m4700
  email: neok-m4700@users.noreply.github.com
  num_commits: 7
  num_commits: 8
  first_commit: 2017-06-13 18:05:51
- name: Rolando (Max) Espinoza
  email: me@rmax.io
@@ -464,9 +464,11 @@
  github: gdementen
- name: Tadeu Manoel
  email: tadeu@esss.com.br
  num_commits: 3
  num_commits: 4
  first_commit: 2016-02-18 14:33:53
  github: ESSS
  alternate_emails:
  - tadeu@users.noreply.github.com
- name: Robert Coop
  email: coopster@gmail.com
  github: RobertCoop
@@ -563,7 +565,7 @@
  first_commit: 2015-08-30 06:44:37
- name: Marcel Bargull
  email: marcel.bargull@udo.edu
  num_commits: 18
  num_commits: 21
  first_commit: 2016-09-26 11:45:54
  github: mbargull
- name: Philip R. Kensche
@@ -617,7 +619,7 @@
  github: yannpaul
- name: Tom Davidson
  email: tjd@alum.mit.edu
  num_commits: 2
  num_commits: 4
  first_commit: 2018-07-04 16:44:19
  github: tjd2002
- name: Thomas Kluyver
@@ -651,9 +653,11 @@
  first_commit: 2016-07-05 14:53:35
- name: Michael C. Grant
  email: mcg@cvxr.com
  num_commits: 9
  num_commits: 15
  first_commit: 2016-03-08 17:42:53
  github: mcg1969
  alternate_emails:
  - mgrant@anaconda.com
- name: Casey Clements
  email: casey.clements@continuum.io
  num_commits: 5
@@ -681,7 +685,7 @@
  github: yoavram
- name: Nehal J Wani
  email: nehaljw.kkd1@gmail.com
  num_commits: 20
  num_commits: 32
  first_commit: 2017-06-25 06:04:10
  github: nehaljwani
- name: John Kirkham
@@ -697,7 +701,7 @@
- name: Anthony Scopatz
  email: scopatz@gmail.com
  github: scopatz
  num_commits: 23
  num_commits: 26
  first_commit: 2014-10-26 14:04:48
- name: Martin Bergtholdt
  email: martin.bergtholdt@philips.com
@@ -740,7 +744,7 @@
  github: gqmelo
- name: soapy1
  email: scastellarin@anaconda.com
  num_commits: 1
  num_commits: 17
  first_commit: 2018-10-22 16:40:33
  github: soapy1
- name: Yu Feng
@@ -750,7 +754,7 @@
  github: rainwoodman
- name: Stuart Berg
  email: bergs@janelia.hhmi.org
  num_commits: 47
  num_commits: 48
  first_commit: 2015-09-13 14:49:05
  github: stuarteberg
- name: Richard Frank
@@ -798,7 +802,7 @@
  github: dougalsutherland
- name: James Sexton
  email: TwistedLadder@gmail.com
  num_commits: 21
  num_commits: 25
  first_commit: 2017-07-28 16:39:11
  github: Bezier89
- name: Amir MOHAMMADI
@@ -888,11 +892,155 @@
  first_commit: 2019-01-26 13:17:33
- name: Rachel
  email: rrigdon@anaconda.com
  num_commits: 1
  num_commits: 77
  first_commit: 2019-01-24 14:12:19
  github: rrigdon
- name: Rachel Rigdon
  email: 45607889+rrigdon@users.noreply.github.com
  num_commits: 6
  num_commits: 35
  first_commit: 2019-01-24 15:12:09
  github: rrigdon
- name: Zane Dufour
  email: zane.dufour@gmail.com
  github: zdog234
  aliases:
  - zdog234
  num_commits: 2
  first_commit: 2019-02-28 08:50:28
- name: Chris Hogan
  email: c096h800@gmail.com
  num_commits: 5
  first_commit: 2019-01-31 13:02:27
  github: ChristopherHogan
- name: Gabriel Reis
  email: gabriel.reis@gazprom-mt.com
  num_commits: 1
  first_commit: 2019-02-19 09:26:21
  github: gabrielcnr
- name: Julian Rüth
  email: julian.rueth@fsfe.org
  num_commits: 8
  first_commit: 2019-04-26 11:13:44
  github: saraedum
- name: satoshi
  email: satoshi.yagi@yahoo.com
  num_commits: 1
  first_commit: 2019-05-07 12:38:29
  github: satoshi
- name: Uilian Ries
  email: uilianries@gmail.com
  num_commits: 1
  first_commit: 2019-03-05 08:37:58
  github: uilianries
- name: Jayaramchandar Pazhanikumar
  email: jayaramchandar@gmail.com
  num_commits: 1
  first_commit: 2019-02-23 00:44:12
  github: theultimate1
- name: Kai Tietz
  email: ktietz@anaconda.com
  num_commits: 5
  first_commit: 2019-04-04 02:38:29
  github: katietz
  alternate_emails:
  - 47363620+katietz@users.noreply.github.com
- name: Toon Verstraelen
  email: Toon.Verstraelen@UGent.be
  num_commits: 4
  first_commit: 2019-03-22 08:45:40
  github: tovrstra
- name: Shaun Walbridge
  email: shaun.walbridge@gmail.com
  num_commits: 1
  first_commit: 2019-01-30 00:47:29
  github: scw
- name: Christopher Burr
  email: christopher.burr@cern.ch
  num_commits: 5
  first_commit: 2019-02-10 12:42:33
  github: chrisburr
  aliases:
  - Chris Burr
  alternate_emails:
  - chrisburr@users.noreply.github.com
- name: Harun Reşit Zafer
  email: harunzafer@gmail.com
  num_commits: 2
  first_commit: 2019-02-25 12:33:19
  github: hrzafer
- name: spalmrot-tic
  email: steve.palmroth@tudor.com
  num_commits: 1
  first_commit: 2019-03-19 15:29:25
  github: spalmrot-tic
- name: John Kirkham
  email: jakirkham@gmail.com
  num_commits: 9
  first_commit: 2019-06-06 14:26:02
  github: jakirkham
- name: Daniel Bast
  email: 2790401+dbast@users.noreply.github.com
  num_commits: 5
  first_commit: 2019-06-07 02:44:13
  github: dbast
- name: Duncan Macleod
  email: duncan.macleod@ligo.org
  num_commits: 3
  first_commit: 2019-06-13 08:07:25
  github: duncanmmacleod
- name: Chris Osborn
  email: csosborn@users.noreply.github.com
  num_commits: 1
  first_commit: 2019-06-21 14:22:46
  github: csosborn
- name: Oleksandr Pavlyk
  email: oleksandr.pavlyk@intel.com
  num_commits: 1
  first_commit: 2019-07-01 11:31:19
  github: oleksandr-pavlyk
- name: Daniel Damiani
  email: ddamiani@slac.stanford.edu
  num_commits: 2
  first_commit: 2019-07-15 18:19:26
  github: ddamiani
- name: Marcelo Duarte Trevisani
  email: marceloduartetrevisani@gmail.com
  num_commits: 62
  first_commit: 2019-07-19 10:00:00
  github: marcelotrevisani
  alternate_emails:
  - marcelotrevisani@users.noreply.github.com
- name: Bruno P. Kinoshita
  email: kinow@users.noreply.github.com
  num_commits: 1
  first_commit: 2019-10-08 04:56:12
- name: Alex Ford
  email: a.sewall.ford@gmail.com
  num_commits: 10
  first_commit: 2019-09-20 19:35:25
  github: asford
- name: seanyen
  email: seanyen@microsoft.com
  num_commits: 1
  first_commit: 2019-10-15 20:24:20
  github: seanyen
- name: AndrewAnnex
  email: ama6fy@virginia.edu
  num_commits: 1
  first_commit: 2019-10-15 16:14:54
  github: AndrewAnnex
- name: Amir Mohammadi
  email: 5738695+183amir@users.noreply.github.com
  num_commits: 1
  first_commit: 2019-10-28 10:43:48
  github: 183amir
- name: Matthew R Becker
  email: becker.mr@gmail.com
  num_commits: 2
  first_commit: 2019-10-17 23:05:16
  github: beckermr
- name: Jinzhe Zeng
  email: jinzhe.zeng@rutgers.edu
  num_commits: 1
  first_commit: 2019-10-19 00:36:16
  github: njzjz
+2 −2
Original line number Diff line number Diff line
@@ -21,8 +21,8 @@ engine:
## The envvars param is an environment variable list
env:
  - PYTHON_VERSION=2.7
  - PYTHON_VERSION=3.4
  - PYTHON_VERSION=3.5
  - PYTHON_VERSION=3.6
  - PYTHON_VERSION=3.7

#===============================================================================
# Script options
+0 −1
Original line number Diff line number Diff line
[run]
include=conda_build/*
parallel=True
omit=conda_build/skeletons/_example_skeleton.py
 No newline at end of file

.editorconfig

0 → 100644
+9 −0
Original line number Diff line number Diff line
# EditorConfig is awesome: http://EditorConfig.org

# top-most EditorConfig file
root = true

# Unix-style newlines with a newline ending every file
[*]
end_of_line = lf
insert_final_newline = true
+1 −0
Original line number Diff line number Diff line
conda_build/_version.py export-subst
* text=auto eol=lf
Loading