aboutsummaryrefslogtreecommitdiff
path: root/reproduce/software/bibtex
diff options
context:
space:
mode:
authorMohammad Akhlaghi <mohammad@akhlaghi.org>2020-06-03 21:03:00 +0100
committerMohammad Akhlaghi <mohammad@akhlaghi.org>2020-06-03 21:03:00 +0100
commitd85dfdf8d7b0f2769d824fd4994eccec55db963a (patch)
tree93afba26310a300fe834ed5a74258ba0353fc862 /reproduce/software/bibtex
parentfc9bdf8d3793ffdb4168ca5c5c7ed97bbd5ab036 (diff)
parenta69f2ce5624b0b683b793a2f4cb68c7023458f15 (diff)
Imported recent updated in Maneage, minor conflict fixed
The minor conflict was with 'reproduce/software/make/high-level.mk', and in particular because we implemented the fix to Maneage's Task #15664 in this project first. After it was moved to the main Maneage branch some minor stylistic corrections were done to it, thus causing the conflict. To resolve the conflict, I simply imported the full Maneage version of the file with this command: git checkout maneage -- reproduce/software/make/high-level.mk The other conflicts were due to the deleted files (that were resolved as described in 'README-hacking.md') and the LaTeX files that I had told '.gitattributes' to ignore from the Maneage branch.
Diffstat (limited to 'reproduce/software/bibtex')
-rw-r--r--reproduce/software/bibtex/corner.tex2
-rw-r--r--reproduce/software/bibtex/galsim.tex2
-rw-r--r--reproduce/software/bibtex/healpix.tex7
-rw-r--r--reproduce/software/bibtex/matplotlib.tex4
-rw-r--r--reproduce/software/bibtex/missfits.tex4
-rw-r--r--reproduce/software/bibtex/mpi4py.tex2
-rw-r--r--reproduce/software/bibtex/sympy.tex3
7 files changed, 12 insertions, 12 deletions
diff --git a/reproduce/software/bibtex/corner.tex b/reproduce/software/bibtex/corner.tex
index b55c157..c4359d1 100644
--- a/reproduce/software/bibtex/corner.tex
+++ b/reproduce/software/bibtex/corner.tex
@@ -8,7 +8,7 @@
@ARTICLE{corner,
author = {{Foreman-Mackey}, Daniel},
title = "{corner.py: Scatterplot matrices in Python}",
- journal = {The Journal of Open Source Software},
+ journal = {JOSS},
year = "2016",
month = "Jun",
volume = {1},
diff --git a/reproduce/software/bibtex/galsim.tex b/reproduce/software/bibtex/galsim.tex
index 0efa048..b9d0b08 100644
--- a/reproduce/software/bibtex/galsim.tex
+++ b/reproduce/software/bibtex/galsim.tex
@@ -12,7 +12,7 @@
{Dietrich}, J.~P. and {Armstrong}, R. and {Melchior}, P. and
{Gill}, M.~S.~S.},
title = "{GALSIM: The modular galaxy image simulation toolkit}",
- journal = {Astronomy and Computing},
+ journal = {Astron.Comput.},
keywords = {Methods: data analysis, Techniques: image processing, Gravitational lensing, Cosmology: observations, Astrophysics - Instrumentation and Methods for Astrophysics, Astrophysics - Cosmology and Nongalactic Astrophysics, 85-04},
year = "2015",
month = "Apr",
diff --git a/reproduce/software/bibtex/healpix.tex b/reproduce/software/bibtex/healpix.tex
index b9089be..bae1acb 100644
--- a/reproduce/software/bibtex/healpix.tex
+++ b/reproduce/software/bibtex/healpix.tex
@@ -1,3 +1,10 @@
+%% Copyright (C) 2019-2020 Mohammad Akhlaghi <mohammad@akhlaghi.org>
+%%
+%% Copying and distribution of this file, with or without modification,
+%% are permitted in any medium without royalty provided the copyright
+%% notice and this notice are preserved. This file is offered as-is,
+%% without any warranty.
+
@ARTICLE{healpix,
author = {{G{\'o}rski}, K.~M. and {Hivon}, E. and {Banday}, A.~J. and {Wand
elt}, B.~D. and {Hansen}, F.~K. and {Reinecke}, M. and {Bartelmann}, M.},
diff --git a/reproduce/software/bibtex/matplotlib.tex b/reproduce/software/bibtex/matplotlib.tex
index 9ad7f1a..a76a41f 100644
--- a/reproduce/software/bibtex/matplotlib.tex
+++ b/reproduce/software/bibtex/matplotlib.tex
@@ -12,10 +12,6 @@
Volume = {9},
Number = {3},
Pages = {90},
- abstract = {Matplotlib is a 2D graphics package used for Python
- for application development, interactive scripting, and
- publication-quality image generation across user
- interfaces and operating systems.},
publisher = {IEEE COMPUTER SOC},
doi = {10.1109/MCSE.2007.55},
year = 2007
diff --git a/reproduce/software/bibtex/missfits.tex b/reproduce/software/bibtex/missfits.tex
index 85a1645..bdb2879 100644
--- a/reproduce/software/bibtex/missfits.tex
+++ b/reproduce/software/bibtex/missfits.tex
@@ -8,11 +8,11 @@
@ARTICLE{missfits,
author = {{Marmo}, C. and {Bertin}, E.},
title = "{MissFITS and WeightWatcher: Two Optimised Tools for Managing FITS Data.}",
- journal = {Astronomical Data Analysis Software and Systems XVII},
+ journal = {ASPC},
year = 2008,
volume = {394},
series = {Astronomical Society of the Pacific Conference Series},
pages = {619},
adsurl = {https://ui.adsabs.harvard.edu/abs/2008ASPC..394..619M},
adsnote = {Provided by the SAO/NASA Astrophysics Data System}
-} \ No newline at end of file
+}
diff --git a/reproduce/software/bibtex/mpi4py.tex b/reproduce/software/bibtex/mpi4py.tex
index dde77f0..a72d529 100644
--- a/reproduce/software/bibtex/mpi4py.tex
+++ b/reproduce/software/bibtex/mpi4py.tex
@@ -9,7 +9,7 @@
author = {{Dalcin}, L.~D. and {Paz}, R.~R. and {Kler}, P.~A. and {Cosimo}, A.
},
title = "{Parallel distributed computing using Python}",
- journal = {Advances in Water Resources},
+ journal = {AdvWatRes},
year = 2011,
month = sep,
volume = 34,
diff --git a/reproduce/software/bibtex/sympy.tex b/reproduce/software/bibtex/sympy.tex
index e1a1e37..fd4da56 100644
--- a/reproduce/software/bibtex/sympy.tex
+++ b/reproduce/software/bibtex/sympy.tex
@@ -11,9 +11,6 @@
year = 2017,
month = jan,
keywords = {Python, Computer algebra system, Symbolics},
- abstract = {
- SymPy is an open source computer algebra system written in pure Python. It is built with a focus on extensibility and ease of use, through both interactive and programmatic applications. These characteristics have led SymPy to become a popular symbolic library for the scientific Python ecosystem. This paper presents the architecture of SymPy, a description of its features, and a discussion of select submodules. The supplementary material provide additional examples and further outline details of the architecture and features of SymPy.
- },
volume = 3,
pages = {103},
journal = {PeerJ CompSci},