bashtage · bashtage · Oct 9, 2020 · Oct 9, 2020 · Oct 9, 2020 · Oct 9, 2020
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -8,30 +8,33 @@ jobs:
     docker:
       # CircleCI maintains a library of pre-built images
       # documented at https://circleci.com/docs/2.0/circleci-images/
-      - image: circleci/python:3.6.6
+      - image: circleci/python:3.8.4
 
     working_directory: ~/repo
 
     steps:
-      - checkout
+      - checkout:
+      - run:
+          name: pull changes from merge
+          command: |
+            if [[ -v CI_PULL_REQUEST ]] ; then git pull --ff-only origin "refs/pull/${CI_PULL_REQUEST//*pull\//}/merge" ; fi
 
       - run:
           name: create virtual environment, install dependencies
           command: |
-            python3 -m venv venv
-            ln -s $(which python3) venv/bin/python3.6
-            . venv/bin/activate
             sudo apt-get update
             sudo apt-get install -y graphviz texlive-fonts-recommended texlive-latex-recommended texlive-latex-extra texlive-generic-extra latexmk texlive-xetex
+            python3.8 -m venv venv
+            . venv/bin/activate
 
       - run:
           name: build numpy
           command: |
             . venv/bin/activate
-            pip install --upgrade pip 'setuptools<49.2.0'
-            pip install -r test_requirements.txt
+            pip install --progress-bar=off --upgrade pip 'setuptools<49.2.0'
+            pip install --progress-bar=off -r test_requirements.txt
             pip install .
-            pip install -r doc_requirements.txt
+            pip install --progress-bar=off -r doc_requirements.txt
 
       - run:
           name: create release notes
@@ -49,11 +52,20 @@ jobs:
             (cd doc ; git submodule update --init)
             python tools/refguide_check.py --rst
 
+      - run:
+          name: build devdocs w/ref warnings
+          command: |
+            . venv/bin/activate
+            cd doc
+            # Don't use -q, show warning summary"
+            SPHINXOPTS="-n" make -e html || echo "ignoring errors for now, see gh-13114"
+
       - run:
           name: build devdocs
           command: |
             . venv/bin/activate
             cd doc
+            make clean
             SPHINXOPTS=-q make -e html
 
       - run:

diff --git a/.gitattributes b/.gitattributes
@@ -3,3 +3,19 @@ numpy/lib/tests/data/*.npy binary
 
 # Release notes, reduce number of conflicts.
 doc/release/*.rst merge=union
+
+# Highlight our custom templating language as C, since it's hopefully better
+# than nothing. This also affects repo statistics.
+*.c.src linguist-language=C
+*.inc.src linguist-language=C
+*.h.src linguist-language=C
+
+# Mark some files as vendored
+numpy/linalg/lapack_lite/f2c.c linguist-vendored
+numpy/linalg/lapack_lite/f2c.h linguist-vendored
+tools/npy_tempita/* linguist-vendored
+
+# Mark some files as generated
+numpy/linalg/lapack_lite/f2c_*.c linguist-generated
+numpy/linalg/lapack_lite/lapack_lite_names.h linguist-generated
+
diff --git a/.github/CODE_OF_CONDUCT.md b/.github/CODE_OF_CONDUCT.md
@@ -1 +1 @@
-NumPy has a Code of Conduct, please see: https://www.numpy.org/devdocs/dev/conduct/code_of_conduct.html
+NumPy has a Code of Conduct, please see: https://numpy.org/code-of-conduct
diff --git a/.github/ISSUE_TEMPLATE.md → .github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE.md → .github/ISSUE_TEMPLATE/bug-report.md
@@ -1,3 +1,8 @@
+---
+name: "Bug report"
+about: Report a bug. Not for security vulnerabilities -- see below.
+
+---
 
 <!-- Please describe the issue in detail here, and fill in the fields below -->
 
@@ -11,8 +16,6 @@ import numpy as np
 << your code here >>
 ```
 
-<!-- Remove these sections for a feature request -->
-
 ### Error message:
 
 <!-- If you are reporting a segfault please include a GDB traceback, which you
@@ -21,7 +24,7 @@ https://github.com/numpy/numpy/blob/master/doc/source/dev/development_environmen
 
 <!-- Full error message, if any (starting from line Traceback: ...) -->
 
-### Numpy/Python version information:
+### NumPy/Python version information:
 
 <!-- Output from 'import sys, numpy; print(numpy.__version__, sys.version)' -->
 
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,7 @@
+contact_links:
+  - name: Question/Help/Support
+    url: https://numpy.org/gethelp/
+    about: "If you have a question, please look at the listed resources available on the website."
+  - name: Development-related matters
+    url: https://numpy.org/community/
+    about: "If you would like to discuss development-related matters or need help from the NumPy team, see our community's communication channels."
diff --git a/.github/ISSUE_TEMPLATE/documentation.md b/.github/ISSUE_TEMPLATE/documentation.md
@@ -0,0 +1,20 @@
+---
+name: "Documentation"
+about: Report an issue related to the NumPy documentation
+labels: 04 - Documentation
+
+---
+
+## Documentation
+
+<!-- If this is an issue with the current documentation for NumPy (e.g.
+incomplete/inaccurate docstring, unclear explanation in any part of the
+documentation), make sure to leave a reference to the document/code you're
+referring to. You can also check the development version of the documentation
+and see if this issue has already been addressed: https://numpy.org/devdocs/
+-->
+
+<!-- If this is an idea or a request for content, please describe as clearly as
+possible what topics you think are missing from the current documentation. Make
+sure to check https://github.com/numpy/numpy-tutorials and see if this issue
+might be more appropriate there. -->
diff --git a/.github/ISSUE_TEMPLATE/feature-request.md b/.github/ISSUE_TEMPLATE/feature-request.md
@@ -0,0 +1,16 @@
+---
+name: "Feature request"
+about: Check instructions for submitting your idea on the mailing list first.
+
+---
+
+## Feature
+
+<!-- If you're looking to request a new feature or change in functionality, including
+adding or changing the meaning of arguments to an existing function, please
+post your idea on the [numpy-discussion mailing list]
+(https://mail.python.org/mailman/listinfo/numpy-discussion) to explain your
+reasoning in addition to opening an issue or pull request. You can also check
+out our [Contributor Guide]
+(https://github.com/numpy/numpy/blob/master/doc/source/dev/index.rst) if you
+need more information. -->
diff --git a/.github/ISSUE_TEMPLATE/post-install.md b/.github/ISSUE_TEMPLATE/post-install.md
@@ -0,0 +1,21 @@
+---
+name: "Post-install/importing issue"
+about: If you have trouble importing or using NumPy after installation
+labels: 32 - Installation
+
+---
+
+<!-- Please describe the issue in detail here, and fill in the fields below. Also, check our Troubleshooting ImportError document to see if your issue is listed there: https://numpy.org/devdocs/user/troubleshooting-importerror.html -->
+
+### Steps to reproduce:
+
+<!-- Please describe the installation method (e.g. building from source, Anaconda, pip), your OS and NumPy/Python version information -->
+
+### Error message:
+
+<!-- If you are reporting a segfault please include a GDB traceback, which you
+can generate by following
+https://github.com/numpy/numpy/blob/master/doc/source/dev/development_environment.rst#debugging -->
+
+<!-- Full error message, if any (starting from line Traceback: ...) -->
+
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,7 +1,16 @@
-<!-- Please be sure you are following the instructions in the dev guidelines
-http://www.numpy.org/devdocs/dev/development_workflow.html
--->
-
-<!-- We'd appreciate it if your commit message is properly formatted
-http://www.numpy.org/devdocs/dev/development_workflow.html#writing-the-commit-message
--->
+<!--         ----------------------------------------------------------------
+                MAKE SURE YOUR PR GETS THE ATTENTION IT DESERVES!
+                ----------------------------------------------------------------
+
+*  FORMAT IT RIGHT:
+      http://www.numpy.org/devdocs/dev/development_workflow.html#writing-the-commit-message
+
+*  IF IT'S A NEW FEATURE OR API CHANGE, TEST THE WATERS:
+      http://www.numpy.org/devdocs/dev/development_workflow.html#get-the-mailing-list-s-opinion
+
+*  HIT ALL THE GUIDELINES:
+      https://numpy.org/devdocs/dev/index.html#guidelines
+
+*  WHAT TO DO IF WE HAVEN'T GOTTEN BACK TO YOU:
+      http://www.numpy.org/devdocs/dev/development_workflow.html#getting-your-pr-reviewed
+-->
diff --git a/.github/pr-prefix-labeler.yml b/.github/pr-prefix-labeler.yml
@@ -0,0 +1,12 @@
+"API": "30 - API"
+"BENCH": "28 - Benchmark"
+"BUG": "00 - Bug"
+"DEP": "07 - Deprecation"
+"DEV": "16 - Development"
+"DOC": "04 - Documentation"
+"ENH": "01 - Enhancement"
+"MAINT": "03 - Maintenance"
+"REV": "34 - Reversion"
+"TST": "05 - Testing"
+"REL": "14 - Release"
+"WIP": "25 - WIP"
diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
@@ -0,0 +1,13 @@
+name: "Pull Request Labeler"
+on:
+  pull_request_target:
+    types: [opened, synchronize, reopened, edited]
+
+jobs:
+  pr-labeler:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Label the PR
+      uses: gerrymanoim/pr-prefix-labeler@v3
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.gitignore b/.gitignore
@@ -182,6 +182,7 @@ benchmarks/results
 benchmarks/html
 benchmarks/env
 benchmarks/numpy
+benchmarks/_asv_compare.conf.json
 # cythonized files
 cythonize.dat
 numpy/random/_mtrand/_mtrand.c

diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "doc/sphinxext"]
-	path = doc/sphinxext
-	url = https://github.com/numpy/numpydoc.git

diff --git a/INSTALL.rst.txt b/INSTALL.rst.txt
@@ -30,21 +30,21 @@ Building NumPy requires the following installed software:
 
    This is required for testing NumPy, but not for using it.
 
-Python__ http://www.python.org
-pytest__ http://pytest.readthedocs.io
+Python__ https://www.python.org/
+pytest__ https://docs.pytest.org/en/stable/
 Hypothesis__ https://hypothesis.readthedocs.io/en/latest/
 
 
 .. note::
 
    If you want to build NumPy in order to work on NumPy itself, use
    ``runtests.py``.  For more details, see
-   https://docs.scipy.org/doc/numpy/dev/development_environment.html
+   https://numpy.org/devdocs/dev/development_environment.html
 
 .. note::
 
-   More extensive information on building NumPy (and SciPy) is maintained at
-   https://scipy.github.io/devdocs/building/
+   More extensive information on building NumPy is maintained at
+   https://numpy.org/devdocs/user/building.html#building-from-source
 
 
 Basic Installation
@@ -69,7 +69,7 @@ NPY_NUM_BUILD_JOBS.
 Choosing compilers
 ==================
 
-NumPy needs a C compiler, and for development versions also Cython.  A Fortran
+NumPy needs a C compiler, and for development versions also needs Cython.  A Fortran
 compiler isn't needed to build NumPy itself; the ``numpy.f2py`` tests will be
 skipped when running the test suite if no Fortran compiler is available.  For
 building Scipy a Fortran compiler is needed though, so we include some details
@@ -87,7 +87,7 @@ Windows
 -------
 
 On Windows, building from source can be difficult (in particular if you need to
-build SciPy as well, because that requires a Fortran compiler).  Currently, the
+build SciPy as well, because that requires a Fortran compiler). Currently, the
 most robust option is to use MSVC (for NumPy only). If you also need SciPy,
 you can either use MSVC + Intel Fortran or the Intel compiler suite.
 Intel itself maintains a good `application note
@@ -151,7 +151,7 @@ Or by preloading a specific BLAS library with::
 Build issues
 ============
 
-If you run into build issues and need help, the NumPy
+If you run into build issues and need help, the NumPy and SciPy
 `mailing list <https://scipy.org/scipylib/mailing-lists.html>`_ is the best
-place to ask.  If the issue is clearly a bug in NumPy, please file an issue (or
+place to ask. If the issue is clearly a bug in NumPy, please file an issue (or
 even better, a pull request) at https://github.com/numpy/numpy.
diff --git a/LICENSES_bundled.txt b/LICENSES_bundled.txt
@@ -1,16 +1,6 @@
 The NumPy repository and source distributions bundle several libraries that are
 compatibly licensed.  We list these here.
 
-Name: Numpydoc
-Files: doc/sphinxext/numpydoc/*
-License: BSD-2-Clause
-  For details, see doc/sphinxext/LICENSE.txt
-
-Name: scipy-sphinx-theme
-Files: doc/scipy-sphinx-theme/*
-License: BSD-3-Clause AND PSF-2.0 AND Apache-2.0
-  For details, see doc/scipy-sphinx-theme/LICENSE.txt
-
 Name: lapack-lite
 Files: numpy/linalg/lapack_lite/*
 License: BSD-3-Clause

diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # <img alt="NumPy" src="https://ghcdn.rawgit.org/numpy/numpy/master/branding/icons/primary/numpylogo.svg" height="60">
 
-[![Travis](https://img.shields.io/travis/numpy/numpy/master.svg?label=Travis%20CI)](
-    https://travis-ci.org/numpy/numpy)
+[![Travis CI](https://img.shields.io/travis/com/numpy/numpy/master?label=Travis%20CI)](
+    https://travis-ci.com/github/numpy/numpy)
 [![Azure](https://dev.azure.com/numpy/numpy/_apis/build/status/azure-pipeline%20numpy.numpy)](
     https://dev.azure.com/numpy/numpy/_build/latest?definitionId=5)
 [![codecov](https://codecov.io/gh/numpy/numpy/branch/master/graph/badge.svg)](