MNT: Revert to code from v1.3.2

Author: rdbisme

.github/workflows/pythonpackage.yml

@@ -8,68 +8,36 @@ jobs:
     strategy:
       max-parallel: 12
       matrix:
-        python-version: [3.7, 3.8, 3.9]
-        os: [ubuntu-latest, macOS-latest, windows-latest]
+        python-version: [2.7, 3.5, 3.6, 3.7, 3.8]
+        os: [ubuntu-latest, macOS-latest]
+        exclude:
+          - os: macOS-latest
+            python-version: 3.8
 
     steps:
     - uses: actions/checkout@v1
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v1
       with:
         python-version: ${{ matrix.python-version }}
-    - uses: actions/cache@v1
-      if: startsWith(runner.os, 'Linux')
-      with:
-        path: ~/.cache/pip
-        key: ${{ runner.os }}-py${{ matrix.python-version }}-pip-${{ hashFiles('pyproject.toml') }}
-        restore-keys: |
-          ${{ runner.os }}-py${{ matrix.python-version }}-pip-
-
-    - uses: actions/cache@v1
-      if: startsWith(runner.os, 'macOS')
-      with:
-        path: ~/Library/Caches/pip
-        key: ${{ runner.os }}-py${{ matrix.python-version }}-pip-${{ hashFiles('pyproject.toml') }}
-        restore-keys: |
-          ${{ runner.os }}-py${{ matrix.python-version }}-pip-
-
-    - uses: actions/cache@v1
-      if: startsWith(runner.os, 'Windows')
-      with:
-        path: ~\AppData\Local\pip\Cache
-        key: ${{ runner.os }}-py${{ matrix.python-version }}-pip-${{ hashFiles('pyproject.toml') }}
-        restore-keys: |
-          ${{ runner.os }}-py${{ matrix.python-version }}-pip-
-
-    - name: Install style dependencies
-      if: matrix.python-version == 3.9
+    - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install flake8 isort>=5 black>=20.8b1
+        pip install numpy pytest flake8
     - name: Build
       run: |
         python setup.py build_ext --inplace
-        pip install .[test]
     - name: Lint with flake8
-      if: matrix.python-version == 3.9
       run: |
         # stop the build if there are Python syntax errors or undefined names
         flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
         # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
         flake8 . --count --statistics
-    - name: Check import sorting with isort
-      if: matrix.python-version == 3.9
-      run: |
-        isort -c --df .
     - name: Check formatting with black
-      if: matrix.python-version == 3.9
+      if: matrix.python-version >= 3.6
       run: |
+        pip install black
         black . --check --exclude "(build/|dist/|\.git/|\.mypy_cache/|\.tox/|\.venv/\.asv/|env|\.eggs)"
-    - name: Check formatting with clang-format
-      if: (matrix.python-version == 3.9) && (startsWith(runner.os, 'Linux'))
-      run: |
-        clang-format -i --style=file bottleneck/**/*.c bottleneck/**/*.h
-        git diff --exit-code
     - name: Test with pytest
       run: |
         pytest

.gitignore

@@ -8,10 +8,4 @@ MANIFEST
 *.egg-info
 .*.swp
 *~
-\#*#
-.eggs
-.hypothesis
-.mypy_cache
-**/env
-**/*results
-**/html
+\#*#

.travis.yml

@@ -1,28 +1,102 @@
-os: linux
+
 language: generic
-cache:
-    directories:
-      - $HOME/.cache/pip
-      - .hypothesis
+sudo: false
+cache: pip
 
 git:
     depth: false
 
-jobs:
+matrix:
     fast_finish: true
     include:
+
+        # test installing bottleneck tarball before installing numpy;
+        # start this test first because it takes the longest
+        - os: linux
+          env: TEST_DEPS="numpy pytest"
+               PYTHON_VERSION="2.7"
+               PYTHON_ARCH="64"
+               TEST_RUN="sdist"
+
+         # flake8 and black
+        - os: linux
+          env: TEST_DEPS="flake8 black"
+               PYTHON_VERSION="3.7"
+               PYTHON_ARCH="64"
+               TEST_RUN="style"
+
+         # doc check
+        - os: linux
+          env: TEST_DEPS="sphinx numpydoc gitpython"
+               PYTHON_VERSION="3.7"
+               PYTHON_ARCH="64"
+               TEST_RUN="doc"
+
+        # python 3.5
+        - os: linux
+          env: TEST_DEPS="pytest"
+               PIP_DEPS="numpy>=1.16"
+               PYTHON_VERSION="3.5"
+               PYTHON_ARCH="64"
+               TEST_RUN="sdist"
+
+         # python 3.6
         - os: linux
-          arch: arm64
-          env: TEST_DEPS="numpy"
+          env: TEST_DEPS="numpy pytest"
+               PYTHON_VERSION="3.6"
+               PYTHON_ARCH="64"
+
+         # python 3.7
+        - os: linux
+          env: TEST_DEPS="numpy pytest"
                PYTHON_VERSION="3.7"
                PYTHON_ARCH="64"
 
+         # python 3.8 conda numpy
+        - os: linux
+          env: TEST_DEPS="numpy pytest"
+               PYTHON_VERSION="3.8"
+               PYTHON_ARCH="64"
+
+         # python 3.8 conda numpy + sdist
         - os: linux
-          arch: ppc64le
-          env: TEST_DEPS="numpy gfortran_linux-ppc64le=8.2.0"
+          env: TEST_DEPS="numpy pytest"
+               PYTHON_VERSION="3.8"
+               PYTHON_ARCH="64"
+               TEST_RUN="sdist"
+
+        # python 2.7
+        - os: osx
+          env: TEST_DEPS="numpy pytest"
+               PYTHON_VERSION="2.7"
+               PYTHON_ARCH="64"
+               TEST_RUN="sdist"
+
+        # python 3.5
+        - os: osx
+          env: TEST_DEPS="pytest"
+               PIP_DEPS="numpy>=1.16"
+               PYTHON_VERSION="3.5"
+               PYTHON_ARCH="64"
+
+        # python 3.6
+        - os: osx
+          env: TEST_DEPS="numpy pytest"
+               PYTHON_VERSION="3.6"
+               PYTHON_ARCH="64"
+
+        # python 3.7
+        - os: osx
+          env: TEST_DEPS="numpy pytest"
                PYTHON_VERSION="3.7"
                PYTHON_ARCH="64"
 
+        # python 3.8
+        - os: osx
+          env: TEST_DEPS="numpy pytest"
+               PYTHON_VERSION="3.8"
+               PYTHON_ARCH="64"
+
 before_install:
     - uname -a
     - source "tools/travis/conda_setup.sh"
@@ -31,7 +105,7 @@ install:
     - source "tools/travis/conda_install.sh"
 
 script:
-    - ./tools/travis/bn_setup.sh
+    - source "tools/travis/bn_setup.sh"
 
 notifications:
     email:

MANIFEST.in

@@ -16,8 +16,6 @@ recursive-include doc *
 recursive-exclude doc/build *
 include versioneer.py
 include bottleneck/_version.py
-include bottleneck/tests/data/template_test/truth.c
-include bottleneck/tests/data/template_test/test_template.c
 
 global-exclude __pycache__
 global-exclude *.pyc

Makefile

@@ -7,22 +7,19 @@ srcdir := bottleneck
 help:
 	@echo "Available tasks:"
 	@echo "help    -->  This help page"
-	@echo "all     -->  clean, flake8, isort, black, build, test"
+	@echo "all     -->  clean, build, flake8, test"
 	@echo "build   -->  Build the Python C extensions"
 	@echo "clean   -->  Remove all the build files for a fresh start"
 	@echo "test    -->  Run unit tests"
 	@echo "flake8  -->  Check for pep8 errors"
-	@echo "isort   -->  Run isort to format imports"
-	@echo "black   -->  Run black formatting tool"
-	@echo "clang-format   -->  Run clang-format tool"
 	@echo "readme  -->  Update benchmark results in README.rst"
 	@echo "bench   -->  Run performance benchmark"
 	@echo "detail  -->  Detailed benchmarks for all functions"
 	@echo "sdist   -->  Make source distribution"
 	@echo "doc     -->  Build Sphinx manual"
 	@echo "pypi    -->  Upload to pypi"
 
-all: clean flake8 isort black build test
+all: clean build test flake8
 
 build:
 	${PYTHON} setup.py build_ext --inplace
@@ -33,15 +30,9 @@ test:
 flake8:
 	flake8
 
-isort:
-	isort -rc .
-
 black:
 	black . --exclude "(build/|dist/|\.git/|\.mypy_cache/|\.tox/|\.venv/\.asv/|env|\.eggs)"
 
-clang-format:
-	clang-format --style=file -i bottleneck/**/*.c bottleneck/**/*.h
-
 readme:
 	PYTHONPATH=`pwd`:PYTHONPATH ${PYTHON} tools/update_readme.py
 

README.rst

@@ -7,26 +7,7 @@
 Bottleneck
 ==========
 
-Bottleneck is a collection of fast, NaN-aware NumPy array functions
-written in C.
-
-As one example, to check if a ``np.array`` has any NaNs using numpy,
-one must call ``np.any(np.isnan(array))``. The :meth:`bottleneck.anynan`
-function interleaves the :meth:`np.isnan` check with :meth:`np.any`
-pre-exit, enabling up to an ``O(N)`` speedup relative to numpy.
-
-Bottleneck strives to be a drop-in accelerator for NumPy functions.
-When using the following libraries, Bottleneck support is automatically
-enabled and utilized:
-
- - `pandas <https://pandas.pydata.org/pandas-docs/stable/install.html#recommended-dependencies>`_
- - `xarray <http://xarray.pydata.org/en/stable/installing.html#instructions>`_
- - `astropy <https://docs.astropy.org/en/stable/install.html>`_
-
-Details on the performance benefits can be found in :ref:`benchmarking`
-
-Example
-=======
+Bottleneck is a collection of fast NumPy array functions written in C.
 
 Let's give it a try. Create a NumPy array::
 
@@ -44,8 +25,6 @@ Moving window mean::
     >>> bn.move_mean(a, window=2, min_count=1)
     array([ 1. ,  1.5,  2. ,  4. ,  4.5])
 
-.. _benchmarking:
-
 Benchmark
 =========
 
@@ -123,14 +102,12 @@ Install
 Requirements:
 
 ======================== ====================================================
-Bottleneck               Python 3.6, 3.7, 3.8; NumPy 1.15.0+ (follows NEP 29)
+Bottleneck               Python 2.7, 3.5, 3.6, 3.7, 3.8; NumPy 1.16.0+
 Compile                  gcc, clang, MinGW or MSVC
-Unit tests               pytest, hypothesis
+Unit tests               pytest
 Documentation            sphinx, numpydoc
 ======================== ====================================================
 
-Detailed installation instructions can be found at :ref:`installing`
-
 To install Bottleneck on Linux, Mac OS X, et al.::
 
     $ pip install .
@@ -146,15 +123,6 @@ http://www.lfd.uci.edu/~gohlke/pythonlibs/#bottleneck
 Unit tests
 ==========
 
-To keep the install dependencies light, test dependencies are made available
-via a setuptools "extra":
-
-    $ pip install bottleneck[test]
-
-Or, if working locally:
-
-    $ pip install .[test]
-
 After you have installed Bottleneck, run the suite of unit tests::
 
   In [1]: import bottleneck as bn
@@ -166,7 +134,7 @@ After you have installed Bottleneck, run the suite of unit tests::
   rootdir: /home/chris/code/bottleneck, inifile: setup.cfg
   plugins: openfiles-0.3.2, remotedata-0.3.2, doctestplus-0.3.0, mock-1.10.4, forked-1.0.2, cov-2.7.1, hypothesis-4.32.2, xdist-1.26.1, arraydiff-0.3
   collected 190 items
-
+  
   bottleneck/tests/input_modification_test.py ........................... [ 14%]
   ..                                                                      [ 15%]
   bottleneck/tests/list_input_test.py .............................       [ 30%]
@@ -176,7 +144,7 @@ After you have installed Bottleneck, run the suite of unit tests::
   bottleneck/tests/reduce_test.py ....................................... [ 84%]
   ............                                                            [ 90%]
   bottleneck/tests/scalar_input_test.py ..................                [100%]
-
+  
   ========================= 190 passed in 46.42 seconds =========================
   Out[2]: True