Merge pull request #55 from weaverba137/remove-helpers

[WIP] Remove astropy-helpers

.gitignore

@@ -51,9 +51,11 @@ sdist
 develop-eggs
 .installed.cfg
 distribute-*.tar.gz
+pip-wheel-metadata
 
 # Other
 .cache
+.tmp
 .tox
 .*.sw[op]
 *~

.readthedocs.yml

@@ -0,0 +1,14 @@
+# See https://docs.readthedocs.io/en/latest/yaml-config.html
+version: 2
+
+build:
+    image: latest
+
+python:
+    version: 3.7
+    install:
+        - method: pip
+          path: .
+          extra_requirements:
+                - docs
+                - all

.travis.yml

@@ -6,6 +6,11 @@ language: c
 os:
     - linux
 
+# Disable cloning with --depth=50 (the default).  This should grab the tags
+# needed for setuptools_scm to work.
+git:
+    depth: false
+
 # The apt packages below are needed for sphinx builds. A full list of packages
 # that can be included can be found here:
 #
@@ -15,6 +20,7 @@ addons:
     apt:
         packages:
             - graphviz
+            - tzdata
 
 
 stage: Comprehensive tests
@@ -34,23 +40,25 @@ env:
         # The following versions are the 'default' for tests, unless
         # overridden underneath. They are defined here in order to save having
         # to repeat them for all configurations.
-        - PYTHON_VERSION=3.7
-        - NUMPY_VERSION=stable
-        - ASTROPY_VERSION=stable
-        - MAIN_CMD='python setup.py'
-        - SETUP_CMD='test'
-        - EVENT_TYPE='pull_request push'
-
+        # - PYTHON_VERSION=3.7
+        # - NUMPY_VERSION=stable
+        # - ASTROPY_VERSION=stable
+        # - MAIN_CMD='python setup.py'
+        # - SETUP_CMD='test'
+        # - EVENT_TYPE='pull_request push'
+        - TOXENV=''
+        - TOXARGS=''
+        - TOXPOSARGS=''
 
         # For this package-template, we include examples of Cython modules,
         # so Cython is required for testing. If your package does not include
         # Cython code, you can set CONDA_DEPENDENCIES=''
-        - CONDA_DEPENDENCIES='scipy matplotlib pytest-mock'
-        - CONDA_DEPENDENCIES_DOC='scipy matplotlib sphinx-astropy'
+        # - CONDA_DEPENDENCIES='tox setuptools_scm scipy matplotlib pytest-mock'
+        # - CONDA_DEPENDENCIES_DOC='tox setuptools_scm scipy matplotlib sphinx-astropy'
 
         # List other runtime dependencies for the package that are available as
         # pip packages here.
-        - PIP_DEPENDENCIES=''
+        # - PIP_DEPENDENCIES=''
 
         # Conda packages for affiliated packages are hosted in channel
         # "astropy" while builds for astropy LTS with recent numpy versions
@@ -66,71 +74,127 @@ env:
         # If you want to ignore certain flake8 errors, you can list them
         # in FLAKE8_OPT, for example:
         # - FLAKE8_OPT='--ignore=E501'
-        - FLAKE8_OPT=''
+        # - FLAKE8_OPT=''
 
 matrix:
 
     # Don't wait for allowed failures
     fast_finish: true
 
     include:
+        - os: linux
+          language: python
+          stage: Initial tests
+          python: 3.8
+          env: TOXENV='test'
+
         # Make sure that egg_info works without dependencies
-        - stage: Initial tests
-          env: PYTHON_VERSION=3.7 SETUP_CMD='egg_info'
+        # - 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
         - os: osx
           stage: Cron tests
-          env: SETUP_CMD='test' EVENT_TYPE='cron'
+          python: 3.7
+          env: TOXENV='test'
+
+        - os: windows
+          stage: Cron tests
+          python: 3.7
+          env: TOXENV='test'
 
         # Do a coverage test.
         - os: linux
+          language: python
           stage: Initial tests
-          env: SETUP_CMD='test --coverage'
+          python: 3.7
+          env: TOXENV='coverage'
 
         # Check for sphinx doc build warnings - we do this first because it
         # may run for a long time
         - os: linux
-          env: SETUP_CMD='build_docs -w'
-               CONDA_DEPENDENCIES=$CONDA_DEPENDENCIES_DOC
+          language: python
+          python: 3.7
+          env: TOXENV='build_docs'
 
         # Now try Astropy dev with the latest Python and LTS with and 3.x.
+        # - os: linux
+        #   env: ASTROPY_VERSION=development
+        #        EVENT_TYPE='pull_request push cron'
         - os: linux
-          env: ASTROPY_VERSION=development
+          language: python
+          python: 3.7
+          env: TOXENV='test-dev'
                EVENT_TYPE='pull_request push cron'
+
         - os: linux
-          env: PYTHON_VERSION=3.6 ASTROPY_VERSION=lts NUMPY_VERSION=1.14 PYTEST_VERSION='<3.7'
+          language: python
+          python: 3.6
+          env: TOXENV='astropy2'
+        # - os: linux
+        #   env: PYTHON_VERSION=3.6 ASTROPY_VERSION=2.0.16 NUMPY_VERSION=1.14 PYTEST_VERSION='<3.7'
 
         # 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
+        #   stage: Cron tests
+        #   env: ASTROPY_VERSION=development NUMPY_VERSION=development
+        #        EVENT_TYPE='cron'
+
         - os: linux
+          language: python
           stage: Cron tests
-          env: ASTROPY_VERSION=development NUMPY_VERSION=development
+          python: 3.7
+          env: TOXENV='test-all-dev'
                EVENT_TYPE='cron'
 
         # Try all 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: PYTHON_VERSION=3.6 NUMPY_VERSION=1.16
+        # - os: linux
+        #   env: NUMPY_VERSION=1.16
+
+        - os: linux
+          language: python
+          python: 3.5
+          env: TOXENV='test-numpy116'
+
         - os: linux
-          env: PYTHON_VERSION=3.6 NUMPY_VERSION=1.16
+          language: python
+          python: 3.6
+          env: TOXENV='test-numpy116'
+
+        - os: linux
+          language: python
+          python: 3.7
+          env: TOXENV='test-numpy117'
+
         - os: linux
-          env: NUMPY_VERSION=1.16
+          language: python
+          python: 3.7
+          env: TOXENV='test-numpy118'
 
         # Do a PEP8 test with flake8
         - os: linux
+          language: python
           stage: Initial tests
-          env: MAIN_CMD='flake8 pydl --count --show-source --statistics $FLAKE8_OPT' SETUP_CMD=''
+          python: 3.7
+          env: TOXENV='codestyle'
 
     allow_failures:
         # Do a PEP8 test with flake8
         # (do allow to fail unless your code completely compliant)
         - os: linux
+          language: python
           stage: Initial tests
-          env: MAIN_CMD='flake8 pydl --count --show-source --statistics $FLAKE8_OPT' SETUP_CMD=''
+          python: 3.7
+          env: TOXENV='codestyle'
 
 install:
 
@@ -145,8 +209,14 @@ install:
     # in how to install a package, in which case you can have additional
     # commands in the install: section below.
 
-    - git clone --depth 1 git://github.com/astropy/ci-helpers.git
-    - source ci-helpers/travis/setup_conda.sh
+    - if [[ ${TRAVIS_OS_NAME} == 'osx' || ${TRAVIS_OS_NAME} == 'windows' ]]; then
+        git clone --depth 1 git://github.com/astropy/ci-helpers.git;
+        source ci-helpers/travis/setup_conda.sh;
+      fi
+
+    - pip install --upgrade pip
+    - pip install --upgrade tox
+    - if [[ ${TOXENV} == 'coverage' ]]; then pip install coveralls; fi
 
     # As described above, using ci-helpers, you should be able to set up an
     # environment with dependencies installed using conda and pip, but in some
@@ -158,9 +228,9 @@ install:
     # other dependencies.
 
 script:
-   - $MAIN_CMD $SETUP_CMD
+   - tox -e ${TOXENV} ${TOXARGS} -- ${TOXPOSARGS}
 
 after_success:
     # If coveralls.io is set up for this package, uncomment the line below.
     # The coveragerc file may be customized as needed for your package.
-    - if [[ $SETUP_CMD == *coverage* ]]; then coveralls --rcfile='pydl/tests/coveragerc'; fi
+    - if [[ ${TOXENV} == 'coverage' ]]; then coveralls --rcfile='pydl/tests/coveragerc'; fi

licenses/LICENSE.rst → LICENSE.rst

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2018, Benjamin Alan Weaver <baweaver@lbl.gov>
+Copyright (c) 2010-2020, Benjamin Alan Weaver <baweaver@lbl.gov>
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

MANIFEST.in

@@ -1,39 +1,21 @@
 include README.rst
+include LICENSE.rst
 # include CHANGES.rst
 
-include ah_bootstrap.py
+include pyproject.toml
 include setup.cfg
 include pydl/tests/coveragerc
 
-recursive-include pydl *.pyx *.c *.pxd
+# recursive-include pydl *.pyx *.c *.pxd
 recursive-include docs *
-recursive-include licenses *
-recursive-include cextern *
-recursive-include scripts *
+recursive-include pydl/*/data/* *
+recursive-include pydl/tests/t *
+recursive-include pydl/*/tests/t *
+# recursive-include cextern *
+# recursive-include scripts *
 
 prune build
 prune docs/_build
 prune docs/api
 
-
-# the next few stanzas are for astropy_helpers.  It's derived from the
-# astropy_helpers/MANIFEST.in, but requires additional includes for the actual
-# package directory and egg-info.
-
-include astropy_helpers/README.rst
-include astropy_helpers/CHANGES.rst
-include astropy_helpers/LICENSE.rst
-recursive-include astropy_helpers/licenses *
-
-include astropy_helpers/ah_bootstrap.py
-
-recursive-include astropy_helpers/astropy_helpers *.py *.pyx *.c *.h *.rst
-recursive-include astropy_helpers/astropy_helpers.egg-info *
-# include the sphinx stuff with "*" because there are css/html/rst/etc.
-recursive-include astropy_helpers/astropy_helpers/sphinx *
-
-prune astropy_helpers/build
-prune astropy_helpers/astropy_helpers/tests
-
-
 global-exclude *.pyc *.o