remove astropy-helpers

Author: adrn

.gitignore

@@ -62,6 +62,7 @@ sdist
 develop-eggs
 .installed.cfg
 distribute-*.tar.gz
+pip-wheel-metadata/
 
 # Other
 .*.swp

.readthedocs.yml

@@ -0,0 +1,15 @@
+version: 2
+
+build:
+  image: latest
+
+python:
+  version: 3.7
+  install:
+    - method: pip
+      path: .
+      extra_requirements:
+        - docs
+        - all
+
+formats: []

.travis.yml

@@ -1,7 +1,8 @@
-language: c
+language: python
 
-# Setting sudo to false opts in to Travis-CI container-based builds.
-sudo: false
+# We need a full clone to make sure setuptools_scm works properly
+git:
+    depth: false
 
 os:
     - linux
@@ -16,8 +17,6 @@ addons:
             - libgsl0-dev
 
 
-stage: Comprehensive tests
-
 stages:
    # Do the style check and a single test job, don't proceed if it fails
    - name: Initial tests
@@ -30,99 +29,135 @@ stages:
 
 env:
     global:
+
         # The following versions are the 'default' for tests, unless
-        # overidden underneath. They are defined here in order to save having
+        # overridden underneath. They are defined here in order to save having
         # to repeat them for all configurations.
-        - PYTHON_VERSION=3.7
-        - MAIN_CMD='python setup.py'
-        - NUMPY_VERSION=stable
-        - ASTROPY_VERSION=stable
-        - SETUP_CMD='test'
-        - CONDA_DEPENDENCIES='cython scipy matplotlib pyyaml h5py sympy numexpr'
-        - CONDA_DEPENDENCIES_DOC="${CONDA_DEPENDENCIES} jinja2 ipython jupyter notebook ipykernel"
-        - PIP_DEPENDENCIES=''
-        - PIP_DEPENDENCIES_DOC="${PIP_DEPENDENCIES} nbsphinx tqdm sphinx-astropy"
-        - CONDA_CHANNELS='astropy-ci-extras astropy'
-
-        # If there are matplotlib or other GUI tests, uncomment the following
-        # line to use the X virtual framebuffer.
-        - SETUP_XVFB=True
 
-        # If you want to ignore certain flake8 errors, you can list them
-        # in FLAKE8_OPT, for example:
-        # - FLAKE8_OPT='--ignore=E501'
-        - FLAKE8_OPT=''
+        # The following three variables are for tox. TOXENV is a standard
+        # variable that tox uses to determine the environment to run,
+        # TOXARGS are arguments passed to tox, and TOXPOSARGS are arguments
+        # that tox passes through to the {posargs} indicator in tox.ini.
+        # The latter can be used for example to pass arguments to pytest.
+        - TOXENV='test'
+        - TOXARGS='-v'
+        - TOXPOSARGS=''
+
+        # The following is needed to avoid issues if e.g. Matplotlib tries
+        # to open a GUI window.
+        - SETUP_XVFB=True
 
 matrix:
 
     # Don't wait for allowed failures
     fast_finish: true
 
     include:
-        # Make sure that egg_info works without dependencies
-        - stage: Initial tests
-          env: PYTHON_VERSION=3.7 SETUP_CMD='egg_info'
 
         # Try MacOS X, usually enough only to run from cron as hardly there are
-        # issues that are not picked up by a linux worker
+        # issues that are not picked up by a linux worker. We set language to
+        # 'c' since 'python' doesn't work on non-Linux platforms.
         - os: osx
+          language: c
+          name: Python 3.7 with required dependencies
           stage: Cron tests
-          env: SETUP_CMD='test' EVENT_TYPE='cron'
+          env: PYTHON_VERSION=3.7 TOXENV=py37-test
 
-        # Do a coverage test.
+        # Do a regular build on Linux with Python 3.8, with cov
+        # For Linux we use language: python to avoid using conda.
         - os: linux
+          python: 3.8
+          name: Python 3.8 with required dependencies and measure coverage
           stage: Initial tests
-          env: SETUP_CMD='test --coverage'
+          env: TOXENV=py38-test-cov
+
+        # Check for sphinx doc build warnings
+        - os: linux
+          python: 3.8
+          name: Documentation build
+          stage: Comprehensive tests
+          env: TOXENV=build_docs
 
-        # Check for sphinx doc build warnings - we do this first because it
-        # may run for a long time
+        # Now try Astropy dev with the latest Python
         - os: linux
-          env: SETUP_CMD='install build_docs -w'
-               CONDA_DEPENDENCIES=$CONDA_DEPENDENCIES_DOC
-               PIP_DEPENDENCIES=$PIP_DEPENDENCIES_DOC
+          python: 3.8
+          name: Python 3.8 with developer version of astropy
+          stage: Comprehensive tests
+          env: TOXENV=py38-test-devdeps
 
-        # Now try Astropy dev with the latest Python and LTS with and 3.x.
+        # And with an older Python, Astropy LTS, and the oldest supported Numpy
         - os: linux
-          env: ASTROPY_VERSION=development
-               EVENT_TYPE='pull_request push cron'
+          python: 3.6
+          name: Python 3.6 astropy LTS and Numpy 1.16
+          stage: Comprehensive tests
+          env: TOXENV=py36-test-astropylts-numpy116
 
         # Add a job that runs from cron only and tests against astropy dev and
         # numpy dev to give a change for early discovery of issues and feedback
         # for both developer teams.
         - os: linux
+          python: 3.8
+          name: Python 3.8 latest developer version of key dependencies
           stage: Cron tests
-          env: ASTROPY_VERSION=development NUMPY_VERSION=development
-               EVENT_TYPE='cron'
+          env: TOXENV=py38-test-devdeps
 
-        - os: linux
-          env: PYTHON_VERSION=3.6
+        # Try on Windows.
+        - os: windows
+          language: c
+          name: Python 3.8 with required dependencies
+          stage: Comprehensive tests
+          env: PYTHON_VERSION=3.8 TOXENV=py38-test
+
+        # Try other python versions and Numpy versions. Since we can assume that
+        # the Numpy developers have taken care of testing Numpy with different
+        # versions of Python, we can vary Python and Numpy versions at the same
+        # time.
 
         - os: linux
-          env: SETUP_CMD='build --nogsl test'
+          python: 3.7
+          name: Python 3.7 with astropy 3.0 and Numpy 1.17
+          stage: Comprehensive tests
+          env: TOXENV=py37-test-astropy30-numpy117
 
+        # Do a code style check
         - os: linux
-          env: CONDA_DEPENDENCIES+=" galpy"
+          python: 3.8
+          name: Code style checks
+          stage: Initial tests
+          env: TOXENV=codestyle
 
-        # Do a PEP8 test with flake8
-        # - os: linux
-        #   stage: Initial tests
-        #   env: MAIN_CMD='flake8 gala --count --show-source --statistics $FLAKE8_OPT' SETUP_CMD=''
+        # Try installing without gsl:
+        - os: osx
+          language: c
+          name: Python 3.7 with required dependencies, without GSL
+          stage: Comprehensive tests
+          env: PYTHON_VERSION=3.7 TOXENV=py37-test GALA_NOGSL=1
 
     allow_failures:
         # Do a PEP8 test with flake8
         # (do allow to fail unless your code completely compliant)
-        - os: linux
-          stage: Initial tests
-          env: MAIN_CMD='flake8 gala --count --show-source --statistics $FLAKE8_OPT' SETUP_CMD=''
+        # - os: linux
+        #   python: 3.8
+        #   name: Code style checks
+        #   stage: Initial tests
+        #   env: TOXENV=codestyle
 
 install:
-    - git clone --depth 1 git://github.com/astropy/ci-helpers.git
-    - source ci-helpers/travis/setup_conda.sh
+
+    # We now use the ci-helpers package to set up our Python environment
+    # on Windows and MacOS X but we don't set up any other dependencies,
+    # instead using tox to do this. See https://github.com/astropy/ci-helpers
+    # for more information about ci-helpers.
+
+    - if [[ $TRAVIS_OS_NAME != linux ]]; then
+        git clone --depth 1 git://github.com/astropy/ci-helpers.git;
+        source ci-helpers/travis/setup_conda.sh;
+      fi
 
 script:
-   - $MAIN_CMD $SETUP_CMD
+    - pip install tox
+    - tox $TOXARGS -- $TOXPOSARGS
 
 after_success:
-    - if [[ $SETUP_CMD == 'test --coverage' ]]; then
-        coveralls --rcfile='gala/tests/coveragerc';
-      fi
+    pip install coveralls
+    coveralls

MANIFEST.in

@@ -1,9 +1,8 @@
 include README.rst
 include CHANGES.rst
 include LICENSE
+include pyproject.toml
 
-include ez_setup.py
-include ah_bootstrap.py
 include setup.cfg
 
 recursive-include *.pyx *.c *.pxd
@@ -16,8 +15,4 @@ prune build
 prune docs/_build
 prune docs/api
 
-recursive-include astropy_helpers *
-exclude astropy_helpers/.git
-exclude astropy_helpers/.gitignore
-
 global-exclude *.pyc *.o

docs/conf.py

@@ -169,19 +169,6 @@
 
 ## -- Options for the edit_on_github extension ----------------------------------------
 
-if eval(setup_cfg.get('edit_on_github')):
-    extensions += ['astropy_helpers.sphinx.ext.edit_on_github']
-
-    versionmod = __import__(setup_cfg['package_name'] + '.version')
-    edit_on_github_project = setup_cfg['github_project']
-    if versionmod.version.release:
-        edit_on_github_branch = "v" + versionmod.version.version
-    else:
-        edit_on_github_branch = "master"
-
-    edit_on_github_source_root = ""
-    edit_on_github_doc_root = "docs"
-
 # show inherited members for classes
 automodsumm_inherited_members = True
 

docs/examples/Milky-Way-model.ipynb

@@ -71,7 +71,7 @@
    "outputs": [],
    "source": [
     "icrs = coord.SkyCoord(ra=coord.Angle('17h 20m 12.4s'), \n",
-    "                      dec=coord.Angle('+57\u00b0 54\u2032 55\u2033'),\n",
+    "                      dec=coord.Angle('+57° 54′ 55″'),\n",
     "                      distance=76*u.kpc,\n",
     "                      pm_ra_cosdec=0.0569*u.mas/u.yr,\n",
     "                      pm_dec=-0.1673*u.mas/u.yr,\n",
@@ -316,15 +316,15 @@
     "axes[1].hist(apos.to_value(u.kpc), bins='auto')\n",
     "axes[1].set_xlabel('apocenter [kpc]')\n",
     "\n",
-    "axes[2].hist(eccs, bins='auto')\n",
+    "axes[2].hist(eccs.value, bins='auto')\n",
     "axes[2].set_xlabel('eccentricity');"
    ]
   }
  ],
  "metadata": {
   "anaconda-cloud": {},
   "kernelspec": {
-   "display_name": "Python [default]",
+   "display_name": "Python 3",
    "language": "python",
    "name": "python3"
   },
@@ -338,9 +338,22 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.6.8"
+   "version": "3.7.6"
+  },
+  "toc": {
+   "base_numbering": 1,
+   "nav_menu": {},
+   "number_sections": true,
+   "sideBar": true,
+   "skip_h1_title": false,
+   "title_cell": "Table of Contents",
+   "title_sidebar": "Contents",
+   "toc_cell": false,
+   "toc_position": {},
+   "toc_section_display": true,
+   "toc_window_display": false
   }
  },
  "nbformat": 4,
  "nbformat_minor": 2
-}
+}

gala/_astropy_init.py

@@ -1,26 +1,18 @@
 # Licensed under a 3-clause BSD style license - see LICENSE.rst
 
-__all__ = ['__version__', '__githash__']
+__all__ = ['__version__']
 
 # this indicates whether or not we are in the package's setup.py
 try:
     _ASTROPY_SETUP_
 except NameError:
-    from sys import version_info
-    if version_info[0] >= 3:
-        import builtins
-    else:
-        import __builtin__ as builtins
+    import builtins
     builtins._ASTROPY_SETUP_ = False
 
 try:
     from .version import version as __version__
 except ImportError:
     __version__ = ''
-try:
-    from .version import githash as __githash__
-except ImportError:
-    __githash__ = ''
 
 
 if not _ASTROPY_SETUP_:  # noqa