diff options
| -rw-r--r-- | .appveyor.yml | 7 | ||||
| -rw-r--r-- | .travis.yml | 3 | ||||
| -rw-r--r-- | azure-pipelines.yml | 6 | ||||
| -rw-r--r-- | doc/release/1.17.0-notes.rst | 43 | ||||
| -rw-r--r-- | doc/source/release.rst | 1 | ||||
| -rw-r--r-- | numpy/random/mtrand/mtrand.pyx | 2 | ||||
| -rw-r--r-- | numpy/random/mtrand/numpy.pxd | 2 | ||||
| -rw-r--r-- | pavement.py | 3 | ||||
| -rwxr-xr-x | setup.py | 16 | ||||
| -rw-r--r-- | shippable.yml | 3 |
10 files changed, 57 insertions, 29 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index 01440c6a0..079496d93 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -30,11 +30,6 @@ environment: PYTHON_ARCH: 32 TEST_MODE: fast - - PYTHON: C:\Python27-x64 - PYTHON_VERSION: 2.7 - PYTHON_ARCH: 64 - TEST_MODE: fast - - PYTHON: C:\Python36-x64 PYTHON_VERSION: 3.6 PYTHON_ARCH: 64 @@ -91,7 +86,7 @@ install: $clnt.DownloadFile($env:OPENBLAS, $file) Get-FileHash $file | Format-List - Expand-Archive $file $tmpdir + Expand-Archive $file $tmpdir rm $tmpdir\$env:PYTHON_ARCH\lib\*.dll.a $lib = ls $tmpdir\$env:PYTHON_ARCH\lib\*.a | ForEach { ls $_ } | Select-Object -first 1 diff --git a/.travis.yml b/.travis.yml index 491fcefea..ae3cf26dc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,7 +31,6 @@ env: ahp7Qnm0rWRmA0z9SomuRUQOJQ6s684vU=" python: - - 2.7 - 3.5 - 3.6 matrix: @@ -63,8 +62,6 @@ matrix: - python3-setuptools - python: 3.6 env: USE_WHEEL=1 RUN_FULL_TESTS=1 RUN_COVERAGE=1 INSTALL_PICKLE5=1 - - python: 2.7 - env: USE_WHEEL=1 RUN_FULL_TESTS=1 PYTHON_OPTS="-3 -OO" - python: 3.6 env: USE_SDIST=1 - python: 3.6 diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 812315bc2..b70ff158c 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -105,12 +105,6 @@ jobs: TEST_MODE: fast OPENBLAS: $(OPENBLAS_32) BITS: 32 - Python27-64bit-fast: - PYTHON_VERSION: '2.7' - PYTHON_ARCH: 'x64' - TEST_MODE: fast - OPENBLAS: $(OPENBLAS_64) - BITS: 64 Python35-64bit-full: PYTHON_VERSION: '3.5' PYTHON_ARCH: 'x64' diff --git a/doc/release/1.17.0-notes.rst b/doc/release/1.17.0-notes.rst new file mode 100644 index 000000000..ec6f63945 --- /dev/null +++ b/doc/release/1.17.0-notes.rst @@ -0,0 +1,43 @@ +========================== +NumPy 1.17.0 Release Notes +========================== + + +Highlights +========== + + +New functions +============= + + +Deprecations +============ + + +Future Changes +============== + + +Expired deprecations +==================== + + +Compatibility notes +=================== + + +C API changes +============= + + +New Features +============ + + +Improvements +============ + + +Changes +======= diff --git a/doc/source/release.rst b/doc/source/release.rst index 1cf215549..11a25d13e 100644 --- a/doc/source/release.rst +++ b/doc/source/release.rst @@ -2,6 +2,7 @@ Release Notes ************* +.. include:: ../release/1.17.0-notes.rst .. include:: ../release/1.16.0-notes.rst .. include:: ../release/1.15.4-notes.rst .. include:: ../release/1.15.3-notes.rst diff --git a/numpy/random/mtrand/mtrand.pyx b/numpy/random/mtrand/mtrand.pyx index 21bc73e54..059a39e55 100644 --- a/numpy/random/mtrand/mtrand.pyx +++ b/numpy/random/mtrand/mtrand.pyx @@ -1,3 +1,5 @@ +# cython: language_level=3 + # mtrand.pyx -- A Pyrex wrapper of Jean-Sebastien Roy's RandomKit # # Copyright 2005 Robert Kern (robert.kern@gmail.com) diff --git a/numpy/random/mtrand/numpy.pxd b/numpy/random/mtrand/numpy.pxd index 9092fa113..1b4fe6c10 100644 --- a/numpy/random/mtrand/numpy.pxd +++ b/numpy/random/mtrand/numpy.pxd @@ -1,3 +1,5 @@ +# cython: language_level=3 + # :Author: Travis Oliphant from cpython.exc cimport PyErr_Print diff --git a/pavement.py b/pavement.py index f2c56883b..2a5225f71 100644 --- a/pavement.py +++ b/pavement.py @@ -42,13 +42,12 @@ from paver.easy import Bunch, options, task, sh #----------------------------------- # Path to the release notes -RELEASE_NOTES = 'doc/release/1.16.0-notes.rst' +RELEASE_NOTES = 'doc/release/1.17.0-notes.rst' #------------------------------------------------------- # Hardcoded build/install dirs, virtualenv options, etc. #------------------------------------------------------- -DEFAULT_PYTHON = "2.7" # Where to put the release installers options(installers=Bunch(releasedir="release", @@ -27,15 +27,14 @@ import subprocess import textwrap -if sys.version_info[:2] < (2, 7) or (3, 0) <= sys.version_info[:2] < (3, 4): - raise RuntimeError("Python version 2.7 or >= 3.4 required.") +if sys.version_info[:2] < (3, 5): + raise RuntimeError("Python version >= 3.5 required.") -if sys.version_info[0] >= 3: - import builtins -else: - import __builtin__ as builtins +import builtins +python_requires = '>=3.5' + CLASSIFIERS = """\ Development Status :: 5 - Production/Stable Intended Audience :: Science/Research @@ -43,10 +42,7 @@ Intended Audience :: Developers License :: OSI Approved Programming Language :: C Programming Language :: Python -Programming Language :: Python :: 2 -Programming Language :: Python :: 2.7 Programming Language :: Python :: 3 -Programming Language :: Python :: 3.4 Programming Language :: Python :: 3.5 Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 @@ -60,7 +56,7 @@ Operating System :: MacOS """ MAJOR = 1 -MINOR = 16 +MINOR = 17 MICRO = 0 ISRELEASED = False VERSION = '%d.%d.%d' % (MAJOR, MINOR, MICRO) diff --git a/shippable.yml b/shippable.yml index 6a92c0f34..195972e60 100644 --- a/shippable.yml +++ b/shippable.yml @@ -6,12 +6,11 @@ language: python python: # use versions available for job image - # aarch64_u16pytall:v6.7.4 + # aarch64_u16pytall:v6.7.4 # (what we currently have access to by default) # this is a bit restrictive in terms # of version availability / control, # but it is convenient - - 2.7 - 3.7 runtime: |