Merge branch 'main' into py312

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.9.1.dev0
+current_version = 1.9.2.dev0
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\.(?P<release>[a-z]+)(?P<dev>\d+))?
 serialize =
 	{major}.{minor}.{patch}.{release}{dev}

.github/workflows/build.yml

@@ -213,7 +213,7 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
         allow-prereleases: true

.github/workflows/build_pyodide_wheels.yml

@@ -36,10 +36,10 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: 3.10.2
-      - uses: mymindstorm/setup-emsdk@v12
+      - uses: mymindstorm/setup-emsdk@v13
         with:
           version: 3.1.14
       - run: pip install pyodide-build==0.21.0
@@ -70,7 +70,7 @@ jobs:
         run: |
           GALPY_VERSION="$(awk '/^current_version/{print $NF}' .bumpversion.cfg)"
           for f in dist/*$GALPY_VERSION*; do sudo mv -i -- "$f" "${f//$GALPY_VERSION/latest}"; done
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: galpy-wheel-pyodide
           path: dist/*.whl

.github/workflows/build_windows.yml

@@ -179,7 +179,7 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
     # Cache both conda and pip, conda done by setup-micromamba

.github/workflows/stale.yml

@@ -12,7 +12,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v8
+      - uses: actions/stale@v9
         with:
           stale-issue-message: 'This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. If the issue has been resolved since the last activity, please close the issue. Thank you for your contributions.'
           stale-pr-message: 'This PR has been automatically marked as stale because it has not had recent activity. Please close the PR if it is no longer relevant. If no further activity occurs, the PR may be closed. Thank you for your contributions.'

.github/workflows/wheels.yml

@@ -98,7 +98,7 @@ jobs:
           CIBW_REPAIR_WHEEL_COMMAND_MACOS: >
             DYLD_LIBRARY_PATH=$REPAIR_LIBRARY_PATH delocate-listdeps {wheel} &&
             DYLD_LIBRARY_PATH=$REPAIR_LIBRARY_PATH delocate-wheel -v --require-archs {delocate_archs} -w {dest_dir} {wheel}
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.python }}-${{ matrix.buildplat[1] }}_${{ matrix.buildplat[2] }}
           path: ./wheelhouse/*.whl
@@ -111,7 +111,7 @@ jobs:
       - uses: actions/checkout@v4
       # Setup python
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: 3.x
       # Install the GSL (necessary to properly include the C files)
@@ -121,7 +121,7 @@ jobs:
         run: |
           pip install build
           python -m build --sdist
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: sdist
           path: ./dist/*.tar.gz
@@ -136,7 +136,7 @@ jobs:
       - run: |
           mkdir tmp_wheelhouse
           mkdir wheelhouse
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           path: tmp_wheelhouse/
       - run: find tmp_wheelhouse/ -mindepth 2 -type f -exec mv -i '{}' wheelhouse/ ';'
@@ -156,7 +156,7 @@ jobs:
       - run: |
           mkdir tmp_wheelhouse
           mkdir wheelhouse
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           path: tmp_wheelhouse/
       - run: find tmp_wheelhouse/ -mindepth 2 -type f -exec mv -i '{}' wheelhouse/ ';'

.pre-commit-config.yaml

@@ -4,15 +4,15 @@ ci:
 
 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v4.4.0
+  rev: v4.5.0
   hooks:
   - id: trailing-whitespace
   - id: end-of-file-fixer
   - id: check-shebang-scripts-are-executable
   - id: check-executables-have-shebangs
   - id: check-yaml
 - repo: https://github.com/asottile/pyupgrade
-  rev: v3.14.0
+  rev: v3.15.0
   hooks:
   - id: pyupgrade
     args: [--py38-plus]
@@ -21,7 +21,7 @@ repos:
   hooks:
   - id: rst-backticks
 - repo: https://github.com/hadialqattan/pycln
-  rev: v2.2.2
+  rev: v2.4.0
   hooks:
     - id: pycln
 - repo: https://github.com/PyCQA/isort
@@ -36,6 +36,6 @@ repos:
       args: ["-L", "thisE,thise,mye,tE,te,hist,ro,sav,ccompiler,aas",
       "-x","doc/source/_static/try-galpy.js"]
 - repo: https://github.com/psf/black
-  rev: 23.9.1
+  rev: 23.11.0
   hooks:
     - id: black

CITATION.cff

@@ -5,7 +5,7 @@ authors:
   given-names: "Jo"
   orcid: "https://orcid.org/0000-0001-6855-442X"
 title: "galpy"
-version: 1.9.1.dev0
+version: 1.9.2.dev0
 url: "https://github.com/jobovy/galpy"
 preferred-citation:
   type: article

HISTORY.txt

@@ -1,10 +1,16 @@
-v1.9.1 (expected around 2023-11-01)
+v1.9.2 (expected around 2024-03-01)
+===================
+
+
+v1.9.1 (2023-11-06)
 ===================
 
 - Allow vector inputs of solar parameters to Orbit initialization: ro, zo, vo,
   and solarmotion (#595). Useful when sampling over the uncertainty in the solar
   parameters.
 
+- Converted all docstrings to numpy-style format with the help of GitHub Copilot.
+
 v1.9.0 (2023-07-02)
 ===================
 

doc/source/conf.py

@@ -29,6 +29,7 @@
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
 extensions = [
     "sphinx.ext.autodoc",
+    "sphinx.ext.napoleon",
     "sphinx.ext.mathjax",
     "sphinx.ext.ifconfig",
     "sphinx.ext.linkcode",
@@ -115,7 +116,7 @@ def linkcode_resolve(domain, info):
 # built documents.
 #
 # The short X.Y version.
-version = "1.9.1.dev0"
+version = "1.9.2.dev0"
 # The full version, including alpha/beta/rc tags.
 release = version
 on_rtd = os.environ.get("READTHEDOCS", None) == "True"

doc/source/reference/config.rst

@@ -4,7 +4,7 @@ galpy.util.config
 Configuration module
 
 .. toctree::
-   :maxdepth: 2
+   :maxdepth: 1
 
    setro <configsetro.rst>
    setvo <configsetvo.rst>

doc/source/reference/coords.rst

@@ -8,7 +8,7 @@ Various coordinate transformation routines with fairly
 self-explanatory names:
 
 .. toctree::
-   :maxdepth: 2
+   :maxdepth: 1
 
    cov_dvrpmllbb_to_vxyz <coordscovdvrpmllbbtovxyz.rst>
    cov_galcenrect_to_galcencyl <coordscovgalcenrectgalcencyl.rst>

doc/source/reference/plot.rst

@@ -7,7 +7,7 @@ galpy.util.plot
 Various plotting routines:
 
 .. toctree::
-   :maxdepth: 2
+   :maxdepth: 1
 
    dens2d <plotdens2d.rst>
    end_print <plotendprint.rst>

doc/source/reference/potentialellipsoidal.rst

@@ -1,3 +1,5 @@
+:orphan:
+
 .. _ellipsoidal:
 
 Ellipsoidal potentials

doc/source/reference/potentialspherical.rst

@@ -1,3 +1,5 @@
+:orphan:
+
 .. _sphericalpot:
 
 Spherical potentials

galpy/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "1.9.1.dev0"
+__version__ = "1.9.2.dev0"
 # Check whether a new version is available
 import datetime
 import http.client