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

Add .mailmap #894

Merged
merged 2 commits into from
Dec 12, 2018
Merged

Add .mailmap #894

merged 2 commits into from
Dec 12, 2018

Conversation

maxnoe
Copy link
Member

@maxnoe maxnoe commented Dec 12, 2018

This fixes git shortlog to only show people once, which we could use to fix the AUTHORS file.

One name is still missing and not nicely formatted:

     6  bultako <jer@iaa.es>

Shortlog no looks like this:

$ git shortlog -sen
  1443  Karl Kosack <karl.kosack@cea.fr>
   283  Jason Watson <jason.jw@live.co.uk>
   265  Daniel Parsons <dparsons@lfs2.mpi-hd.mpg.de>
   235  Jean Jacquemier <jacquem@lapp.in2p3.fr>
   200  Tino Michael <tino.michael@cea.fr>
   120  Maximilian Nöthe <maximilian.noethe@tu-dortmund.de>
    76  Alison Mitchell <alison.mitchell@mpi-hd.mpg.de>
    58  Christoph Deil <Deil.Christoph@gmail.com>
    52  Justus Zorn <justus.zorn@desy.de>
    47  Dominik Neise <neised@phys.ethz.ch>
    34  Samuel Timothy Spencer <sojourner92@gmail.com>
    29  Raquel de los Reyes <reyes@mpi-hd.mpg.de>
    20  Kai Brügge <kai.bruegge@tu-dortmund.de>
    16  Michele Mastropietro <michele.mastropietro@gmail.com>
    13  Jeremie DECOCK <jd.jdhp@gmail.com>
    12  Wrijupan Bhattacharyya <wrijupan.bhattacharyya@desy.de>
    11  Francesco Visconti <france.visconti@gmail.com>
    10  Abelardo Moralejo Olaizola <moralejo@ifae.es>
     9  Markus Gaug <markusgaug@gmail.com>
     9  tialis <goldstein2034@hotmail.com>
     6  Paolo Cumani <pcumani@ifae.es>
     6  bultako <jer@iaa.es>
     5  Ruben Lopez-Coto <rlopezcoto@gmail.com>
     4  Tristan Carel <tristan.carel@lapp.in2p3.fr>
     3  Daniel Nieto <nieto@gae.ucm.es>
     3  Franca Cassol <32127708+FrancaCassol@users.noreply.github.com>
     3  Jose Enrique Ruiz <jer@iaa.es>
     3  Michael Punch <michael.punch@lnu.se>
     3  Miguel Nievas <miguelnievas@ucm.es>
     3  Orel Gueta <orel.gueta@desy.de>
     3  Tarek Hassan <goldstein2034@gmail.com>
     3  Thomas Vuillaume <thomas.vuillaume@lapp.in2p3.fr>
     2  Cyril Alispach <23462345+calispac@users.noreply.github.com>
     2  Julien Lefaucheur <jjlk@users.noreply.github.com>
     2  Lukas Nickel <lukas.nickel@tu-dortmund.de>
     2  Thomas Armstrong <thomas.armstrong@physics.ox.ac.uk>
     2  Thomas Gasparetto <thomas.gasparetto@ts.infn.it>
     1  David Landriu <landriu@sappcm22.extra.cea.fr>
     1  Gernot Maier <gernot.maier@desy.de>
     1  Konstantin Pfrang <konstantin.pfrang@desy.de>
     1  Lab Saha <lab.saha@gmail.com>
     1  Mireia Nievas-Rosillo <mireianievas@users.noreply.github.com>
     1  Pierre Aubert <aubertp7@gmail.com>

@maxnoe
Copy link
Member Author

maxnoe commented Dec 12, 2018

@cta-observatory/cta-devs please check you mail adresses and names

kosack
kosack previously approved these changes Dec 12, 2018
@codecov
Copy link

codecov bot commented Dec 12, 2018

Codecov Report

Merging #894 into master will decrease coverage by <.01%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #894      +/-   ##
==========================================
- Coverage   73.97%   73.96%   -0.01%     
==========================================
  Files         213      213              
  Lines       12286    12287       +1     
==========================================
  Hits         9088     9088              
- Misses       3198     3199       +1
Impacted Files Coverage Δ
ctapipe/instrument/subarray.py 78.18% <0%> (-0.72%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update fad39f0...15464c2. Read the comment docs.

@dneise dneise merged commit 2f77e24 into cta-observatory:master Dec 12, 2018
watsonjj added a commit to watsonjj/ctapipe that referenced this pull request Jan 7, 2019
* master: (22 commits)
  Remove all hillas_paramters but version 5, fixes cta-observatory#866  (cta-observatory#904)
  Fix docstring of EventSeeker, fixes cta-observatory#768 (cta-observatory#914)
  Do not set autodownload, fixes doc build (cta-observatory#910)
  Import bokeh.palletes correctly, fixes cta-observatory#911 (cta-observatory#912)
  Fix SST-1M to be DC and not SC. Solves cta-observatory#905 (cta-observatory#908)
  Fix a few test warnings (cta-observatory#902)
  Updates of NectarCam and LSTCam real data eventsource class (cta-observatory#812)
  Implemented FACT image cleaning (cta-observatory#862)
  remove `config=None, tool=None` in some tests (cta-observatory#897)
  Remove flow submodule (got moved to its own package) (cta-observatory#893)
  Cleaning the ctapipe folder. this has been empty for 3 years. (cta-observatory#892)
  Additional metadata from pyhessio, similar to cta-observatory#655 (cta-observatory#895)
  add scikit-learn to install_requires (cta-observatory#877)
  Add .mailmap (cta-observatory#894)
  Fix subarray peek. No more warnings. (cta-observatory#841)
  SimTelEventSource using pyeventio (cta-observatory#864)
  Use sparse neighbor matrix (cta-observatory#826)
  Add test how it should be (cta-observatory#842)
  fix errordef > 0. (cta-observatory#839)
  Fix warning about already closed hessio file (cta-observatory#834)
  ...

# Conflicts:
#	ctapipe/analysis/camera/chargeresolution.py
#	ctapipe/tools/extract_charge_resolution.py
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants