Merge pull request #1 from astropy/main

Update fork

.circleci/config.yml

@@ -1,172 +1,58 @@
 version: 2
 
+# NOTE: We run these in CircleCI because it has better artifacts support.
+# TODO: Move to GitHub Actions when its artifacts support improves.
 jobs:
-  egg-info-37:
-    docker:
-      - image: circleci/python:3.7
-    steps:
-      - checkout
-      - run: python setup.py egg_info
 
-  32bit:
+  image-tests-mpl302:
     docker:
-      - image: quay.io/pypa/manylinux1_i686
+      - image: astropy/image-tests-py37-mpl302:1.10
     steps:
       - checkout
       - run:
-          name: Write configuration items to standard location to make sure they are ignored in parallel mode
-          command: |
-              mkdir -p $HOME/.astropy/config/
-              printf "unicode_output = True\nmax_width = 500" > $HOME/.astropy/config/astropy.cfg
-      - run:
-          name: Install dependencies for Python 3.6
-          command: /opt/python/cp36-cp36m/bin/pip install "numpy<1.17" scipy pytest pytest-astropy pytest-xdist Cython jinja2
-      - run:
-          name: Run tests for Python 3.6
-          command: PYTHONHASHSEED=42 /opt/python/cp36-cp36m/bin/python setup.py test --parallel=4 -a "--durations=50"
-      - run:
-          name: Install dependencies for Python 3.7
-          command: /opt/python/cp37-cp37m/bin/pip install "numpy<1.17" scipy pytest pytest-astropy pytest-xdist Cython jinja2 pandas
-      - run:
-          name: Run tests for Python 3.7
-          command: PYTHONHASHSEED=42 /opt/python/cp37-cp37m/bin/python setup.py test --parallel=4 -a "--durations=50"
-      - run:
-          name: Install dependencies for Python 3.8
-          command: /opt/python/cp38-cp38/bin/pip install numpy pytest pytest-astropy pytest-xdist Cython jinja2
-      - run:
-          name: Run tests for Python 3.8
-          command: PYTHONHASHSEED=42 /opt/python/cp38-cp38/bin/python setup.py test --parallel=4 -a "--durations=50"
-
-  image-tests-mpl212:
-    docker:
-      - image: astropy/image-tests-py36-mpl212:1.8
-    steps:
-      - checkout
+          name: Install dependencies
+          command: pip install -e .[test] pytest-mpl
       - run:
-          name: Run tests
-          command: python3 setup.py test -P visualization --remote-data=astropy --open-files -a "--mpl --mpl-results-path=$PWD/results -W ignore:np.asscalar"
-      - store_artifacts:
-          path: results
-
-  image-tests-mpl222:
-    docker:
-      - image: astropy/image-tests-py36-mpl222:1.8
-    steps:
-      - checkout
+          name: Force scipy upgrade
+          command: pip install scipy -U
       - run:
           name: Run tests
-          command: python3 setup.py test -P visualization --remote-data=astropy --open-files -a "--mpl --mpl-results-path=$PWD/results -W ignore:np.asscalar"
-      - store_artifacts:
-          path: results
-
-  image-tests-mpl302:
-    docker:
-      - image: astropy/image-tests-py37-mpl302:1.8
-    steps:
-      - checkout
-      - run:
-          name: Run tests
-          command: python3 setup.py test -P visualization --remote-data=astropy --open-files -a "--mpl --mpl-results-path=$PWD/results"
+          command: pytest -P visualization --remote-data=astropy --open-files --mpl --mpl-results-path=$PWD/results -W ignore:np.asscalar
       - store_artifacts:
           path: results
 
   image-tests-mpl310:
     docker:
-      - image: astropy/image-tests-py37-mpl311:1.8
+      - image: astropy/image-tests-py37-mpl311:1.10
     steps:
       - checkout
+      - run:
+          name: Install dependencies
+          command: pip install -e .[test] pytest-mpl
       - run:
           name: Run tests
-          command: python3 setup.py test -P visualization --remote-data=astropy --open-files -a "--mpl --mpl-results-path=$PWD/results"
+          command: pytest -P visualization --remote-data=astropy --open-files --mpl --mpl-results-path=$PWD/results -W ignore:np.asscalar
       - store_artifacts:
           path: results
 
   image-tests-mpldev:
     docker:
-      - image: astropy/image-tests-py37-base:1.2
+      - image: astropy/image-tests-py37-base:1.4
     steps:
       - checkout
       - run:
-          name: Install C++ compiler
-          command: |
-            apt update
-            apt install -y g++
-      - run:
-          name: Install Python dependencies, including developer version of Matplotlib
-          command: pip3 install pytest pytest-mpl pytest-astropy numpy scipy git+https://github.com/matplotlib/matplotlib.git
+          name: Install tox
+          command: pip3 install tox
       - run:
           name: Run tests
-          command: python3 setup.py test -P visualization --remote-data=astropy --open-files -a "--mpl --mpl-results-path=$PWD/results"
+          command: tox -e py37-test-image-mpldev -- -P visualization --remote-data=astropy --open-files --mpl-results-path=$PWD/results -W ignore:np.asscalar
       - store_artifacts:
           path: results
 
-  html-docs:
-    docker:
-      - image: circleci/python:3.7
-    steps:
-      - checkout
-      - run:
-          name: Install apt packages
-          command: |
-            sudo apt update
-            sudo apt install -y graphviz
-      - run:
-          name: Install Python dependencies
-          command: |
-            python3 -m venv venv
-            . venv/bin/activate
-            pip install numpydoc matplotlib sphinx --progress-bar off
-            pip install .[docs,all] --progress-bar off
-      - run:
-          name: Make sure flake8 passes
-          command: |
-            python3 -m venv venv
-            . venv/bin/activate
-            pip install flake8 --progress-bar off
-            # select options should be the same as in the travis config
-            flake8 astropy --count --select=E101,W191,W291,W292,W293,W391,E111,E112,E113,E30,E502,E722,E901,E902,E999,F822,F823
-      - run:
-          name: Build Docs
-          command: venv/bin/python setup.py build_docs -w --parallel=4
-          environment:
-            LC_CTYPE: C
-            LC_ALL: C
-            LANG: C
-
-      - run:
-          name: Prepare for upload
-          command: |
-            # If it's not a PR, don't upload
-            if [ -z "${CIRCLE_PULL_REQUEST}" ]; then
-              rm -r docs/_build/html
-            else
-              # If it is a PR, delete sources and doctrees, because it's a lot
-              # of files which we don't really need to upload
-              rm -r docs/_build/html/_sources
-              rm -r docs/_build/html/_modules
-              rm -r docs/_build/html/.doctrees
-            fi
-
-      - store_artifacts:
-          path: docs/_build/html
-
-      - run:
-          name: "Built documentation is available at:"
-          command: DOCS_URL="${CIRCLE_BUILD_URL}/artifacts/${CIRCLE_NODE_INDEX}/${CIRCLE_WORKING_DIRECTORY/#\~/$HOME}/docs/_build/html/index.html"; echo $DOCS_URL
-
 workflows:
   version: 2
-  tests_and_docs:
+  tests:
     jobs:
-      - egg-info-37
-      - html-docs
-      - 32bit
-      - image-tests-mpl212
-      - image-tests-mpl222
       - image-tests-mpl302
       - image-tests-mpl310
       - image-tests-mpldev
-
-notify:
-  webhooks:
-    - url: https://giles.cadair.com/circleci

.github/ISSUE_TEMPLATE/bug_report.md

@@ -7,9 +7,9 @@ about: Create a report describing unexpected or incorrect behavior in astropy.
 so you do not need to remove them! -->
 
 <!-- Please be sure to check out our contributing guidelines,
-https://github.com/astropy/astropy/blob/master/CONTRIBUTING.md .
+https://github.com/astropy/astropy/blob/main/CONTRIBUTING.md .
 Please be sure to check out our code of conduct,
-https://github.com/astropy/astropy/blob/master/CODE_OF_CONDUCT.md . -->
+https://github.com/astropy/astropy/blob/main/CODE_OF_CONDUCT.md . -->
 
 <!-- Please have a search on our GitHub repository to see if a similar
 issue has already been posted.
@@ -34,7 +34,7 @@ command. -->
 
 ### Steps to Reproduce
 <!-- Ideally a code example could be provided so we can run it ourselves. -->
-<!-- If you are pasting code, use tripe backticks (```) around
+<!-- If you are pasting code, use triple backticks (```) around
 your code snippet. -->
 <!-- If necessary, sanitize your screen output to be pasted so you do not
 reveal secrets like tokens and passwords. -->
@@ -53,6 +53,7 @@ Please run the following snippet and paste the output below:
 import platform; print(platform.platform())
 import sys; print("Python", sys.version)
 import numpy; print("Numpy", numpy.__version__)
-import scipy; print("Scipy", scipy.__version__)
 import astropy; print("astropy", astropy.__version__)
+import scipy; print("Scipy", scipy.__version__)
+import matplotlib; print("Matplotlib", matplotlib.__version__)
 -->

.github/ISSUE_TEMPLATE/feature_request.md

@@ -7,9 +7,9 @@ about: Suggest an idea to improve astropy
 so you do not need to remove them! -->
 
 <!-- Please be sure to check out our contributing guidelines,
-https://github.com/astropy/astropy/blob/master/CONTRIBUTING.md .
+https://github.com/astropy/astropy/blob/main/CONTRIBUTING.md .
 Please be sure to check out our code of conduct,
-https://github.com/astropy/astropy/blob/master/CODE_OF_CONDUCT.md . -->
+https://github.com/astropy/astropy/blob/main/CODE_OF_CONDUCT.md . -->
 
 <!-- Please have a search on our GitHub repository to see if a similar
 issue has already been posted.

.github/PULL_REQUEST_TEMPLATE.md

@@ -2,16 +2,26 @@
 so you do not need to remove them! -->
 
 <!-- Please be sure to check out our contributing guidelines,
-https://github.com/astropy/astropy/blob/master/CONTRIBUTING.md .
+https://github.com/astropy/astropy/blob/main/CONTRIBUTING.md .
 Please be sure to check out our code of conduct,
-https://github.com/astropy/astropy/blob/master/CODE_OF_CONDUCT.md . -->
+https://github.com/astropy/astropy/blob/main/CODE_OF_CONDUCT.md . -->
 
 <!-- If you are new or need to be re-acquainted with Astropy
 contributing workflow, please see
 http://docs.astropy.org/en/latest/development/workflow/development_workflow.html .
 There is even a practical example at
 https://docs.astropy.org/en/latest/development/workflow/git_edit_workflow_examples.html#astropy-fix-example . -->
 
+<!-- Astropy coding style guidelines can be found here:
+https://docs.astropy.org/en/latest/development/codeguide.html#coding-style-conventions
+Our testing infrastructure enforces to follow a subset of the PEP8 to be
+followed. You can check locally whether your changes have followed these by
+running the following command:
+
+tox -e codestyle
+
+-->
+
 <!-- Please just have a quick search on GitHub to see if a similar
 pull request has already been posted.
 We have old closed pull requests that might provide useful code or ideas
@@ -25,6 +35,9 @@ you navigate them, if necessary. -->
 <!-- Provide a general description of what your pull request does.
 Complete the following sentence and add relevant details as you see fit. -->
 
+<!-- In addition please ensure that the pull request title is descriptive
+and allows maintainers to infer the applicable subpackage(s). -->
+
 This pull request is to address ...
 
 <!-- If the pull request closes any open issues you can add this.
@@ -33,3 +46,19 @@ If this pull request is unrelated to any issues, please remove
 the following line. -->
 
 Fixes #<Issue Number>
+
+### Checklist for package maintainer(s)
+<!-- This section is to be filled by package maintainer(s) who will
+review this pull request. -->
+
+This checklist is meant to remind the package maintainer(s) who will review this pull request of some common things to look for. This list is not exhaustive.
+
+- [ ] Do the proposed changes actually accomplish desired goals?
+- [ ] Do the proposed changes follow the [Astropy coding guidelines](https://docs.astropy.org/en/latest/development/codeguide.html)?
+- [ ] Are tests added/updated as required? If so, do they follow the [Astropy testing guidelines](https://docs.astropy.org/en/latest/development/testguide.html)?
+- [ ] Are docs added/updated as required? If so, do they follow the [Astropy documentation guidelines](https://docs.astropy.org/en/latest/development/docguide.html#astropy-documentation-rules-and-guidelines)?
+- [ ] Is rebase and/or squash necessary? If so, please provide the author with appropriate instructions. Also see ["When to rebase and squash commits"](https://docs.astropy.org/en/latest/development/when_to_rebase.html).
+- [ ] Did the CI pass? If no, are the failures related? If you need to run daily and weekly cron jobs as part of the PR, please apply the `Extra CI` label.
+- [ ] Is a change log needed? If yes, did the change log check pass? If no, add the `no-changelog-entry-needed` label.
+- [ ] Is a milestone set? Milestone must be set but `astropy-bot` check might be missing; do not let the green checkmark fool you.
+- [ ] At the time of adding the milestone, if the milestone set requires a backport to release branch(es), apply the appropriate `backport-X.Y.x` label(s) *before* merge.