Merge pull request #42 from saimn/actions-followup

Setup actions etc.

Author: pllim

.circleci/config.yml

@@ -10,7 +10,6 @@ jobs:
   build-n-publish:
     name: Build and publish Python 🐍 distributions 📦 to PyPI
     runs-on: ubuntu-latest
-    if: github.repository == 'astropy/pytest-doctestplus'
     if: (github.repository == 'astropy/sphinx-astropy' && (github.event_name == 'tags' || contains(github.event.pull_request.labels.*.name, 'Build wheels')))
 
     steps:
@@ -38,7 +37,7 @@ jobs:
         cd ..
         python -m venv testenv
         testenv/bin/pip install pytest sphinx-astropy/dist/*.whl
-        testenv/bin/pytest sphinx-astropy/tests
+        testenv/bin/pytest sphinx-astropy/sphinx_astropy
 
     - name: Publish distribution 📦 to PyPI
       if: startsWith(github.ref, 'refs/tags')

.github/workflows/publish.yml

@@ -19,28 +19,28 @@ jobs:
         include:
           - os: ubuntu-latest
             python-version: 3.7
-            toxenv: py36-test-sphinx17
+            toxenv: py37-test-sphinx17
           - os: windows-latest
             python-version: 3.7
-            toxenv: py36-test-sphinx18
+            toxenv: py37-test-sphinx18
           - os: macos-latest
             python-version: 3.7
             toxenv: py37-test-sphinx20
           - os: ubuntu-latest
             python-version: 3.8
-            toxenv: py37-test-sphinx24
+            toxenv: py38-test-sphinx24
           - os: windows-latest
             python-version: 3.8
             toxenv: py38-test-sphinx30
           - os: ubuntu-latest
             python-version: 3.9
-            toxenv: py38-test-sphinx35
+            toxenv: py39-test-sphinx35
           - os: ubuntu-latest
             python-version: 3.9
             toxenv: py39-test-sphinx40
           - os: macos-latest
             python-version: 3.9
-            toxenv: py38-test-sphinxdev
+            toxenv: py39-test-sphinxdev
 
     steps:
     - uses: actions/checkout@v2

.github/workflows/python-tests.yml

@@ -49,3 +49,6 @@ htmlcov
 
 # PyCharm
 .idea
+
+sphinx_astropy/version.py
+pip-wheel-metadata/

.gitignore

@@ -0,0 +1,5 @@
+[build-system]
+requires = ["setuptools>=30.3.0",
+            "setuptools_scm",
+            "wheel"]
+build-backend = 'setuptools.build_meta'

pyproject.toml

@@ -1,26 +1,23 @@
 [metadata]
 name = sphinx-astropy
-version = attr:sphinx_astropy.__version__
 url = https://github.com/astropy/sphinx-astropy
 author = The Astropy Developers
 author_email = [email protected]
 classifiers =
-	Intended Audience :: Developers
-	Programming Language :: Python
-	Programming Language :: Python :: 2
-	Programming Language :: Python :: 3
-	Operating System :: OS Independent
-	License :: OSI Approved :: BSD License
+    Intended Audience :: Developers
+    Programming Language :: Python
+    Programming Language :: Python :: 3
+    Operating System :: OS Independent
+    License :: OSI Approved :: BSD License
 license = BSD
 description = Sphinx extensions and configuration specific to the Astropy project
 long_description = file: README.rst
-
-[bdist_wheel]
-universal = 1
+long_description_content_type = text/x-rst
 
 [options]
 zip_safe = False
 packages = find:
+python_requires = >=3.7
 install_requires =
     sphinx>=1.7
     astropy-sphinx-theme
@@ -30,8 +27,8 @@ install_requires =
     pillow
 
 [options.extras_require]
-all =
-    astropy
+all = astropy
+tests = pytest
 
 [options.package_data]
 sphinx_astropy = local/*

setup.cfg

@@ -2,15 +2,9 @@
 
 # Licensed under a 3-clause BSD style license - see LICENSE.rst
 
-import sys
-import setuptools
-from distutils.version import LooseVersion
+import os
 from setuptools import setup
 
-# Setuptools 30.3.0 or later is needed for setup.cfg options to be used
-if LooseVersion(setuptools.__version__) < LooseVersion('30.3.0'):
-    sys.stderr.write("ERROR: sphinx-automodapi requires setuptools 30.3.0 or "
-                     "later (found {0})".format(setuptools.__version__))
-    sys.exit(1)
-
-setup()
+setup(
+    use_scm_version={'write_to': os.path.join('sphinx_astropy', 'version.py')}
+)

setup.py

@@ -1 +1 @@
-__version__ = '1.4.dev0'
+from .version import version as __version__  # noqa

sphinx_astropy/__init__.py

@@ -7,12 +7,9 @@
 from __future__ import print_function
 
 import re
-from distutils.version import LooseVersion
 from docutils.nodes import Text, reference
 
-from sphinx import __version__
-
-BLOCK_PATTERN = re.compile('\[#.+\]', flags=re.DOTALL)
+BLOCK_PATTERN = re.compile(r'\[#.+\]', flags=re.DOTALL)
 ISSUE_PATTERN = re.compile('#[0-9]+')
 
 

sphinx_astropy/ext/changelog_links.py

@@ -10,6 +10,7 @@ isolated_build = true
 [testenv]
 changedir = .tmp/{envname}
 description = run tests
+extras = tests
 deps =
     sphinx17: sphinx==1.7.*
     sphinx18: sphinx==1.8.*
@@ -22,7 +23,7 @@ deps =
 
 commands =
     pip freeze
-    pytest {toxinidir}/tests {posargs}
+    pytest {toxinidir}/sphinx_astropy {posargs}
 
 [testenv:codestyle]
 changedir =