From 2321bf2d6ceadb57eb46c549fd8f65ee817666bd Mon Sep 17 00:00:00 2001 From: Jo Bovy Date: Tue, 26 Sep 2017 14:02:10 -0400 Subject: [PATCH 1/4] Add new paper [ci skip] --- doc/source/index.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/source/index.rst b/doc/source/index.rst index af8f131cb..7f03afea1 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -216,6 +216,8 @@ The following is a list of publications using ``galpy``; please let me (bovy at Uses ``galpy`` to compute orbital parameters for stars in the AMBRE sample of high-resolution spectra and uses these orbital parameters to aid in the comparison between the data and chemical-evolution models. #. *Detailed chemical abundance analysis of the thick disk star cluster Gaia 1*, Andreas Koch, Terese T. Hansen, & Andrea Kunder (2017; `arXiv/1709.04022 `_): Employs ``galpy.orbit`` integration to compute the orbits of four red-giant members of the *Gaia 1* Milky Way star cluster, finding that the orbits of these stars are similar to those of the oldest stars in the Milky Way's disk. +#. *Proper motions in the VVV Survey: Results for more than 15 million stars across NGC 6544*, R. Contreras Ramos, M. Zoccali, F. Rojas, A. Rojas-Arriagada, M. Gárate, P. Huijse, F. Gran, M. Soto, A.A.R. Valcarce, P. A. Estévez, & D. Minniti (2017; `arXiv/1709.07919 `_): + Uses ``galpy.orbit`` integration in ``MWPotential2014`` to calculate the orbit of NGC 6544, a Milky-Way globular cluster, using a newly determined proper motion, finding that it is likely a halo globular cluster based on its orbit. Indices and tables ================== From 52fe45c0c6f6ebefd7c4874de77bb320a77ae6aa Mon Sep 17 00:00:00 2001 From: Jo Bovy Date: Tue, 26 Sep 2017 16:23:24 -0400 Subject: [PATCH 2/4] Only import seaborn at all when using seaborn-bovy-defaults in config; avoids surprise at seeing the seaborn style when not using seaborn-bovy-defaults (see #296) --- doc/source/installation.rst | 2 +- galpy/util/bovy_plot.py | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/source/installation.rst b/doc/source/installation.rst index 73d59e3ca..931a5c82e 100644 --- a/doc/source/installation.rst +++ b/doc/source/installation.rst @@ -189,7 +189,7 @@ of configuration variables. This configuration file is parsed using `__. It is currently used to set a default set of distance and velocity scales (``ro`` and ``vo`` throughout galpy) for conversion between physical -and internal galpy units, to decide whether to change the seaborn plotting defaults, to specify whether output from functions or +and internal galpy units, to decide whether to use seaborn plotting with galpy's defaults (which affects *all* plotting after importing ``galpy.util.bovy_plot``), to specify whether output from functions or methods should be given as an `astropy Quantity `__ with units as much as possible or not, and whether or not to use diff --git a/galpy/util/bovy_plot.py b/galpy/util/bovy_plot.py index 9d73a3a1b..403d61af8 100644 --- a/galpy/util/bovy_plot.py +++ b/galpy/util/bovy_plot.py @@ -60,11 +60,11 @@ from matplotlib.transforms import Affine2D, Bbox, IdentityTransform from mpl_toolkits.mplot3d import Axes3D from galpy.util.config import __config__ -try: - import seaborn as sns -except: pass -else: - if __config__.getboolean('plot','seaborn-bovy-defaults'): +if __config__.getboolean('plot','seaborn-bovy-defaults'): + try: + import seaborn as sns + except: pass + else: sns.set_style('ticks', {'xtick.direction': u'in', 'ytick.direction': u'in', From 3748f75a6b667b866f3fa55795fcd691a7bac866 Mon Sep 17 00:00:00 2001 From: Jo Bovy Date: Wed, 4 Oct 2017 22:57:19 -0400 Subject: [PATCH 3/4] Add new paper, fix pub info of some recent papers [ci skip] --- doc/source/index.rst | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/doc/source/index.rst b/doc/source/index.rst index 7f03afea1..1ac79cc1c 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -212,12 +212,14 @@ The following is a list of publications using ``galpy``; please let me (bovy at Uses ``galpy.orbit`` integration in a custom Milky-Way-like potential built from ``galpy.potential`` models to investigate the orbits of hypervelocity-star candidates in *Gaia* DR1. #. *GalRotpy: an educational tool to understand and parametrize the rotation curve and gravitational potential of disk-like galaxies*, Andrés Granados, Lady-J. Henao-O., Santiago Vanegas, & Leonardo Castañeda (2017; `arXiv/1705.01665 `_): These authors build an interactive tool to decompose observed rotation curves into bulge, disk (Miyamoto-Nagai or exponential), and NFW halo components on top of ``galpy.potential`` routines. -#. *The AMBRE Project: formation and evolution of the Milky Way disc*, V. Grisoni, E. Spitoni, F. Matteucci, A. Recio-Blanco, P. de Laverny, M. Hayden, S. Mikolaitis, & C. C. Worley (2017; `arXiv/1706.02614 `_): +#. *The AMBRE Project: formation and evolution of the Milky Way disc*, V. Grisoni, E. Spitoni, F. Matteucci, A. Recio-Blanco, P. de Laverny, M. Hayden, S. Mikolaitis, & C. C. Worley (2017) *Mon. Not. Roy. Astron. Soc.*, in press (`arXiv/1706.02614 `_): Uses ``galpy`` to compute orbital parameters for stars in the AMBRE sample of high-resolution spectra and uses these orbital parameters to aid in the comparison between the data and chemical-evolution models. -#. *Detailed chemical abundance analysis of the thick disk star cluster Gaia 1*, Andreas Koch, Terese T. Hansen, & Andrea Kunder (2017; `arXiv/1709.04022 `_): +#. *Detailed chemical abundance analysis of the thick disk star cluster Gaia 1*, Andreas Koch, Terese T. Hansen, & Andrea Kunder (2017) *Astron. & Astrophys.*, in press (`arXiv/1709.04022 `_): Employs ``galpy.orbit`` integration to compute the orbits of four red-giant members of the *Gaia 1* Milky Way star cluster, finding that the orbits of these stars are similar to those of the oldest stars in the Milky Way's disk. -#. *Proper motions in the VVV Survey: Results for more than 15 million stars across NGC 6544*, R. Contreras Ramos, M. Zoccali, F. Rojas, A. Rojas-Arriagada, M. Gárate, P. Huijse, F. Gran, M. Soto, A.A.R. Valcarce, P. A. Estévez, & D. Minniti (2017; `arXiv/1709.07919 `_): +#. *Proper motions in the VVV Survey: Results for more than 15 million stars across NGC 6544*, R. Contreras Ramos, M. Zoccali, F. Rojas, A. Rojas-Arriagada, M. Gárate, P. Huijse, F. Gran, M. Soto, A.A.R. Valcarce, P. A. Estévez, & D. Minniti (2017) *Astron. & Astrophys.*, in press (`arXiv/1709.07919 `_): Uses ``galpy.orbit`` integration in ``MWPotential2014`` to calculate the orbit of NGC 6544, a Milky-Way globular cluster, using a newly determined proper motion, finding that it is likely a halo globular cluster based on its orbit. +#. *How to make a mature accreting magnetar*, A. P. Igoshev & S. B. Popov (2017) *Mon. Not. Roy. Astron. Soc.*, in press (`arXiv/1709.10385 `_): + Employs ``galpy.orbit`` integration of the magnetar candidate 4U 0114+65 in the potential model from `Irrgang et al. (2013) `__ to aid in the determination of its likely age. Indices and tables ================== From eccd128cbdf280c23dab8c1d587e9b0c83dd35da Mon Sep 17 00:00:00 2001 From: Jo Bovy Date: Wed, 4 Oct 2017 23:14:01 -0400 Subject: [PATCH 4/4] Increment version tag to dev of 1.3 (to make it clear that this version is substantially different from the 1.2 release) --- doc/source/conf.py | 4 ++-- galpy/__init__.py | 2 +- setup.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/source/conf.py b/doc/source/conf.py index 0a09e320b..dc91b5687 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -45,9 +45,9 @@ # built documents. # # The short X.Y version. -version = '1.2' +version = '1.3' # The full version, including alpha/beta/rc tags. -release = '1.2' +release = '1.3.dev' on_rtd = os.environ.get('READTHEDOCS', None) == 'True' if on_rtd: version= 'v'+version diff --git a/galpy/__init__.py b/galpy/__init__.py index b2a95f902..988e51f6a 100644 --- a/galpy/__init__.py +++ b/galpy/__init__.py @@ -1 +1 @@ -__version__ = "1.2" +__version__ = "1.3.dev" diff --git a/setup.py b/setup.py index ef27865d2..d3115da46 100644 --- a/setup.py +++ b/setup.py @@ -264,7 +264,7 @@ actionAngleTorus_c_incl= False setup(name='galpy', - version='1.2', + version='1.3.dev', description='Galactic Dynamics in python', author='Jo Bovy', author_email='bovy@astro.utoronto.ca',