Merge branch 'coveralls_update' into develop

aburrell · Feb 22, 2021 · 3814f9c · 3814f9c
2 parents fbe4e09 + 74650f3
commit 3814f9c
Show file tree

Hide file tree

Showing 21 changed files with 256 additions and 271 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -23,22 +23,21 @@ before_install:
   - python --version
   - uname -a
   - lsb_release -a
-  - pip install numpy
+  - pip install numpy coveralls pytest-cov tox-travis
 
 install:
-  - pip install coveralls pytest-cov coverage codecov
   - python setup.py clean --all build_ext --force --inplace
-  - python setup.py develop
-  - pip install tox-travis
+  - python setup.py install
 
 script:
-  - tox
+  - |
+    if [ $TRAVIS_PYTHON_VERSION == "3.7" ]; then
+        tox -e docs
+    fi
+  - tox -e $TRAVIS_PYTHON_VERSION
+
 after_success:
-  - coverage combine
-  - coverage report
-  - coveralls --merge=extension-coveralls.json []
-  - coveralls
-  - codecov
+  - coveralls --rcfile=setup.cfg
 
 notifications:
   email:

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -11,6 +11,6 @@ include README.rst
 include CODE_OF_CONDUCT.md
 include .zenodo.json
 
-include tox.ini .travis.yml appveyor.yml .codeclimate.yml
+include tox.ini .travis.yml appveyor.yml .codeclimate.yml pyproject.toml
 
 global-exclude *.py[cod~] __pycache__ *.so *.dylib
diff --git a/README.rst b/README.rst
@@ -80,10 +80,9 @@ Badges
     * - docs
       - |docs|
     * - tests
-      - | |travis| |appveyor| |requires|
-        | |coveralls| |codecov|
-        | |landscape|  |codeclimate|
-        | |scrutinizer| |codacy|
+      - | |travis| |appveyor|
+        | |coveralls| |requires|
+        | |codeclimate| |scrutinizer| |codacy|
     * - package
       - | |version| |supported-versions|
         | |wheel| |supported-implementations|
@@ -101,28 +100,21 @@ Badges
     :target: https://ci.appveyor.com/project/aburrell/apexpy
 
 .. |requires| image:: https://requires.io/github/aburrell/apexpy/requirements.svg?branch=master
-    :alt: Requirements Status
-    :target: https://requires.io/github/aburrell/apexpy/requirements/?branch=master
+     :alt: Requirements Status
+     :target: https://requires.io/github/aburrell/apexpy/requirements/?branch=master
 
 .. |coveralls| image:: https://coveralls.io/repos/github/aburrell/apexpy/badge.svg?branch=master
     :alt: Coverage Status
     :target: https://coveralls.io/github/aburrell/apexpy?branch=master
 
-.. |codecov| image:: https://codecov.io/github/aburrell/apexpy/coverage.svg?branch=master
-    :alt: Coverage Status
-    :target: https://codecov.io/github/aburrell/apexpy
-
-.. |landscape| image:: https://landscape.io/github/aburrell/apexpy/master/landscape.svg?style=flat
-    :target: https://landscape.io/github/aburrell/apexpy/master
-    :alt: Code Quality Status
+.. |codacy| image:: https://api.codacy.com/project/badge/Grade/7d4c1a6c60e747ca95cdf97746c39cda
+   :alt: Codacy Badge
+   :target: https://app.codacy.com/gh/aburrell/apexpy?utm_source=github.com&utm_medium=referral&utm_content=aburrell/apexpy&utm_campaign=Badge_Grade
 
-.. |codacy| image:: https://img.shields.io/codacy/af7fdf6be28841f283dfdbc1c01fa82a.svg?style=flat
-    :target: https://www.codacy.com/app/aburrell/apexpy
-    :alt: Codacy Code Quality Status
-
-.. |codeclimate| image:: https://codeclimate.com/github/cmeeren/apexpy/badges/gpa.svg
+.. |codeclimate| image:: https://api.codeclimate.com/v1/badges/da1d972dee790da595f8/maintainability.svg
    :target: https://codeclimate.com/github/aburrell/apexpy
    :alt: CodeClimate Quality Status
+
 .. |version| image:: https://img.shields.io/pypi/v/apexpy.svg?style=flat
     :alt: PyPI Package latest release
     :target: https://pypi.python.org/pypi/apexpy

diff --git a/appveyor.yml b/appveyor.yml
@@ -6,58 +6,58 @@ environment:
     - TESTENV: '2.7-nocover-64'
       PYTHON_VERSION: '2.7'
       MINICONDA_HOME: C:\Miniconda-x64
-      TESTSCRIPT: 'py.test'
+      TESTSCRIPT: 'python -m pytest'
 
     - TESTENV: '2.7-nocover-32'
       PYTHON_VERSION: '2.7'
       MINICONDA_HOME: C:\Miniconda
-      TESTSCRIPT: 'py.test'
+      TESTSCRIPT: 'python -m pytest'
 
     - TESTENV: '3.6-nocover-64'
       PYTHON_VERSION: '3.6'
       MINICONDA_HOME: C:\Miniconda-x64
-      TESTSCRIPT: 'py.test'
+      TESTSCRIPT: 'python -m pytest'
 
     - TESTENV: '3.6-nocover-32'
       PYTHON_VERSION: '3.6'
       MINICONDA_HOME: C:\Miniconda
-      TESTSCRIPT: 'py.test'
+      TESTSCRIPT: 'python -m pytest'
 
     - TESTENV: '3.7-nocover-64'
       PYTHON_VERSION: '3.7'
       MINICONDA_HOME: C:\Miniconda-x64
-      TESTSCRIPT: 'py.test'
+      TESTSCRIPT: 'python -m pytest'
 
     - TESTENV: '3.7-nocover-32'
       PYTHON_VERSION: '3.7'
       MINICONDA_HOME: C:\Miniconda
-      TESTSCRIPT: 'py.test'
+      TESTSCRIPT: 'python -m pytest'
 
     - TESTENV: '3.8-nocover-64'
       PYTHON_VERSION: '3.8'
       MINICONDA_HOME: C:\Miniconda-x64
-      TESTSCRIPT: 'py.test'
+      TESTSCRIPT: 'python -m pytest'
 
     - TESTENV: '3.8-nocover-32'
       PYTHON_VERSION: '3.8'
       MINICONDA_HOME: C:\Miniconda
-      TESTSCRIPT: 'py.test'
+      TESTSCRIPT: 'python -m pytest'
 
     - TESTENV: '3.9-nocover-64'
       PYTHON_VERSION: '3.9'
       MINICONDA_HOME: C:\Miniconda-x64
-      TESTSCRIPT: 'py.test'
+      TESTSCRIPT: 'python -m pytest'
 
     - TESTENV: '3.9-nocover-32'
       PYTHON_VERSION: '3.9'
       MINICONDA_HOME: C:\Miniconda
-      TESTSCRIPT: 'py.test'
+      TESTSCRIPT: 'python -m pytest'
 
     - TESTENV: 'check'
-      PYTHON_VERSION: '2.7'
+      PYTHON_VERSION: '3.7'
       MINICONDA_HOME: 'C:\Miniconda'
       TESTSCRIPT: 'python setup.py check --strict --metadata --restructuredtext && check-manifest && flake8 src tests'
-      INSTALL_EXTRA_DEPS: 'pip install docutils check-manifest flake8 readme pygments'
+      INSTALL_EXTRA_DEPS: 'pip install docutils check-manifest flake8 readme pygments sphinx_rtd_theme'
 
 init:
   - ps: echo $env:TESTENV

diff --git a/ci/bootstrap.py b/ci/bootstrap.py
@@ -42,7 +42,7 @@
     tox_environments = {}
     for (alias, conf) in matrix.from_file(join(base_path, "setup.cfg")).items():
         python = conf["python_versions"]
-        deps = conf["dependencies"]
+        deps = conf["dependencies"] if "dependencies" in conf.keys() else ""
         if "coverage_flags" in conf:
             cover = {"false": False, "true": True}[conf["coverage_flags"].lower()]
         if "environment_variables" in conf:

diff --git a/ci/templates/.travis.yml b/ci/templates/.travis.yml
@@ -21,22 +21,21 @@ before_install:
   - python --version
   - uname -a
   - lsb_release -a
-  - pip install numpy
+  - pip install numpy coveralls pytest-cov tox-travis
 
 install:
-  - pip install coveralls pytest-cov coverage codecov
   - python setup.py clean --all build_ext --force --inplace
-  - python setup.py develop
-  - pip install tox-travis
+  - python setup.py install
 
 script:
-  - tox
+  - |
+    if [ $TRAVIS_PYTHON_VERSION == "3.7" ]; then
+        tox -e docs
+    fi
+  - tox -e $TRAVIS_PYTHON_VERSION
+
 after_success:
-  - coverage combine
-  - coverage report
-  - coveralls --merge=extension-coveralls.json []
-  - coveralls
-  - codecov
+  - coveralls --rcfile=setup.cfg
 
 notifications:
   email:

diff --git a/ci/templates/appveyor.yml b/ci/templates/appveyor.yml
@@ -7,19 +7,19 @@ environment:
     - TESTENV: '{{ env }}-64'
       PYTHON_VERSION: '{{ config.python[-3:] }}'
       MINICONDA_HOME: C:\Miniconda-x64
-      TESTSCRIPT: 'py.test'
+      TESTSCRIPT: 'python -m pytest'
 
     - TESTENV: '{{ env }}-32'
       PYTHON_VERSION: '{{ config.python[-3:] }}'
       MINICONDA_HOME: C:\Miniconda
-      TESTSCRIPT: 'py.test'
+      TESTSCRIPT: 'python -m pytest'
 
 {% endif %}{% endfor %}
     - TESTENV: 'check'
-      PYTHON_VERSION: '2.7'
+      PYTHON_VERSION: '3.7'
       MINICONDA_HOME: 'C:\Miniconda'
       TESTSCRIPT: 'python setup.py check --strict --metadata --restructuredtext && check-manifest && flake8 src tests'
-      INSTALL_EXTRA_DEPS: 'pip install docutils check-manifest flake8 readme pygments'
+      INSTALL_EXTRA_DEPS: 'pip install docutils check-manifest flake8 readme pygments sphinx_rtd_theme'
 
 init:
   - ps: echo $env:TESTENV

diff --git a/ci/templates/tox.ini b/ci/templates/tox.ini
@@ -23,22 +23,11 @@ commands =
     #conda install -q -p {toxworkdir}\{envdir} numpy
     python setup.py clean --all build_ext --force --inplace
 #    python setup.py develop
-    {posargs:py.test -vv --ignore=src --doctest-glob='*.rst'}
-
-[testenv:spell]
-setenv =
-    SPELLCHECK=1
-commands =
-    sphinx-build -b spelling docs dist/docs
-skip_install = true
-usedevelop = true
-deps =
-    -r{toxinidir}/docs/requirements.txt
-    sphinxcontrib-spelling
-    pyenchant
+    python -m pytest {posargs: -vv --ignore=src/fortranapex --doctest-glob='*.rst'}
 
 [testenv:docs]
 deps =
+    sphinx_rtd_theme
     -r{toxinidir}/docs/requirements.txt
 commands =
     sphinx-build {posargs:-E} -b html docs dist/docs
@@ -56,19 +45,21 @@ passenv =
     *
 
 [testenv:check]
-basepython = python3.4
 deps =
     docutils
     check-manifest
     flake8
-    readme
+    numpy
     pygments
+    readme
+    twine
 skip_install = true
 usedevelop = false
 commands =
-    python setup.py check --strict --metadata --restructuredtext
+    python setup.py sdist
     check-manifest {toxinidir}
-    flake8 src tests
+    flake8 --ignore=F401,W503 src tests
+    twine check dist/*
 
 [testenv:coveralls]
 deps =
@@ -78,30 +69,17 @@ usedevelop = false
 commands =
     coverage combine
     coverage report
-    coveralls --merge=extension-coveralls.json []
-
-[testenv:codecov]
-deps =
-    codecov
-skip_install = true
-usedevelop = false
-commands =
-    coverage combine
-    coverage report
-    coverage xml --ignore-errors
-    codecov []
-
+    coveralls --rcfile=setup.cfg --merge=extension-coveralls.json []
 
 [testenv:extension-coveralls]
 deps =
     cpp-coveralls
 skip_install = true
 usedevelop = false
 commands =
-    coveralls --build-root=. --include=src --dump=extension-coveralls.json []
+    coveralls --rcfile=setup.cfg --build-root=. --include=src --dump=extension-coveralls.json []
 
 [testenv:report]
-basepython = python3.4
 deps = coverage
 skip_install = true
 usedevelop = false
@@ -131,7 +109,7 @@ setenv =
 usedevelop = true
 commands =
     python setup.py clean --all build_ext --force --inplace
-    {posargs:py.test --cov --cov-report=term-missing -vv --doctest-glob='*.rst'}
+    python -m pytest {posargs:--cov --cov-report=term-missing -vv --doctest-glob='*.rst'}
 {% endif %}
 {% if config.cover or config.deps %}
 deps =
@@ -144,4 +122,12 @@ deps =
     {{ dep }}
 {% endfor %}
 
+{% if not config.cover %}
+[testenv:{{ config.python[-3:] }}-buildonly-nocover]
+basepython = {env:TOXPYTHON:{{ config.python }}}
+deps =
+skip_install = true
+commands =
+{% endif %}
+
 {% endfor %}
diff --git a/docs/conf.py b/docs/conf.py
@@ -11,10 +11,6 @@
     'sphinx.ext.napoleon',
     'sphinx.ext.extlinks'
 ]
-if os.getenv('SPELLCHECK'):
-    extensions += 'sphinxcontrib.spelling',
-    spelling_show_suggestions = True
-    spelling_lang = 'en_US'
 
 source_suffix = '.rst'
 master_doc = 'index'

diff --git a/docs/installation.rst b/docs/installation.rst
@@ -4,11 +4,12 @@ Installation
 ============
 
 This package requires NumPy, which you can install alone or as a part of SciPy.
-`Some Python distributions <http://www.scipy.org/install.html#scientific-python-distributions>`_
+`Some Python distributions <https://www.scipy.org/install.html>`_
 come with NumPy/SciPy pre-installed. For Python distributions without
 NumPy/SciPy, Windows/Mac users should install
-`pre-compiled binaries of NumPy/SciPy <http://www.scipy.org/scipylib/download.html#official-source-and-binary-releases>`_, and Linux users may have NumPy/SciPy
-available in `their repositories <http://www.scipy.org/scipylib/download.html#third-party-vendor-package-managers>`_.
+`pre-compiled binaries of NumPy/SciPy <https://www.scipy.org/scipylib/download.html#official-source-and-binary-releases>`_, and Linux users may have
+NumPy/SciPy available in
+`their repositories <https://www.scipy.org/scipylib/download.html#third-party-vendor-package-managers>`_.
 
 When you have NumPy, you may use either PyPi or GitHub to install this package.
 
@@ -54,4 +55,4 @@ you may install by::
 
 .. [1] pip is included with Python 2 from v2.7.9 and Python 3 from v3.4.
        If you don't have pip,
-       `get it here <http://pip.readthedocs.org/en/stable/installing/>`_.
+       `get it here <https://pip.pypa.io/en/stable/installing/>`_.
diff --git a/docs/reference/fortranapex.rst b/docs/reference/fortranapex.rst
@@ -1,9 +1,13 @@
 apexpy.fortranapex
 ==================
 
-This module is the interface to the apex Fortran library by Emmert et al. [2010] [1]_. The interface is not documented. Use :class:`apexpy.Apex` for all conversions and calculations. You can find some documentation of the actual Fortran library in the source file `apexsh.f90 <https://github.com/cmeeren/apexpy/blob/master/src/fortranapex/apexsh.f90>`_.
+This module is the interface to the apex Fortran library by
+Emmert et al. [2010] [1]_. The interface is not documented.
+Use :class:`apexpy.Apex` for all conversions and calculations. You can find
+some documentation of the actual Fortran library in the source file
+`apexsh.f90 <https://github.com/aburrell/apexpy/blob/master/src/fortranapex/apexsh.f90>`_.
 
 .. [1] Emmert, J. T., A. D. Richmond, and D. P. Drob (2010),
        A computationally compact representation of Magnetic-Apex
        and Quasi-Dipole coordinates with smooth base vectors,
-       J. Geophys. Res., 115(A8), A08322, :doi:`10.1029/2010JA015326`.
+       J. Geophys. Res., 115(A8), A08322, :doi:`10.1029/2010JA015326`.
diff --git a/pyproject.toml b/pyproject.toml
@@ -0,0 +1,3 @@
+[build-system]
+requires = ["numpy", "setuptools", "wheel"]
+build-backend = "setuptools.build_meta"