From c5d6865345ade86fa9f236a05bfbb9a32304aafc Mon Sep 17 00:00:00 2001 From: eduardo-rodrigues Date: Sun, 1 Nov 2020 10:23:13 +0100 Subject: [PATCH 1/4] Add support for Python 3.8 and 3.9 --- .travis.yml | 9 ++++++++- appveyor.yml | 15 +++++++++++++++ setup.py | 2 ++ 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1f2a841c..4d32b753 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,8 +7,9 @@ os: python: - 2.7 - 3.5 - - 3.6 - 3.7 + - 3.8 + - 3.9 - pypy2.7-5.10.0 - pypy3.6-7.1.1 @@ -21,6 +22,12 @@ matrix: exclude: - python: 3.7 env: NUMPY="numpy==1.13.1" + - python: 3.8 + env: NUMPY="numpy==1.13.1" + - python: 3.9 + env: NUMPY="numpy==1.13.1" + - python: 3.9 + env: NUMPY="numpy==1.14.5" - python: pypy2.7-5.10.0 env: NUMPY="numpy==1.14.5" - python: pypy3.6-7.1.1 diff --git a/appveyor.yml b/appveyor.yml index 193cadd4..d0dad727 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -40,6 +40,21 @@ environment: PYTHON_ARCH: "64" NUMPY: "numpy>=1.15" + - PYTHON: "C:\\Python37" + PYTHON_VERSION: "3.7.x" + PYTHON_ARCH: "32" + NUMPY: "numpy>=1.15" + + - PYTHON: "C:\\Python38" + PYTHON_VERSION: "3.8.x" + PYTHON_ARCH: "32" + NUMPY: "numpy>=1.15" + + - PYTHON: "C:\\Python39" + PYTHON_VERSION: "3.9.x" + PYTHON_ARCH: "32" + NUMPY: "numpy>=1.15" + install: - "python --version" diff --git a/setup.py b/setup.py index 85a8050d..062321b2 100755 --- a/setup.py +++ b/setup.py @@ -81,6 +81,8 @@ def get_description(): "Programming Language :: Python :: 3.5", "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.7", + "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", "Topic :: Scientific/Engineering", "Topic :: Scientific/Engineering :: Information Analysis", "Topic :: Scientific/Engineering :: Mathematics", From 1ab17f241c25d105dc36d383a284fa681232e608 Mon Sep 17 00:00:00 2001 From: eduardo-rodrigues Date: Sun, 1 Nov 2020 10:23:33 +0100 Subject: [PATCH 2/4] Update date in LICENSE --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 0daba27a..cb088576 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ BSD 3-Clause License -Copyright (c) 2018-2019, Jim Pivarski +Copyright (c) 2018-2020, Jim Pivarski All rights reserved. Redistribution and use in source and binary forms, with or without From 410b7b9235c9ff8dc8a0930b5e5ff061b90668c6 Mon Sep 17 00:00:00 2001 From: eduardo-rodrigues Date: Sun, 1 Nov 2020 10:24:24 +0100 Subject: [PATCH 3/4] Bump version to 0.14.0 --- awkward-cpp/setup.py | 6 ++++-- awkward-numba/setup.py | 2 ++ awkward/version.py | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/awkward-cpp/setup.py b/awkward-cpp/setup.py index ddba0855..15abfa91 100644 --- a/awkward-cpp/setup.py +++ b/awkward-cpp/setup.py @@ -25,7 +25,7 @@ class get_pybind_include(object): The purpose of this class is to postpone importing pybind11 until it is actually installed, so that the ``get_include()`` method can be invoked. """ - + def __init__(self, user=False): self.user = user @@ -97,7 +97,7 @@ def build_extensions(self): build_ext.build_extensions(self) ############################# end copy-pasted code ############################## - + setup(name = "awkward-cpp", version = get_version(), packages = find_packages(exclude = ["tests"]), @@ -137,6 +137,8 @@ def build_extensions(self): "Programming Language :: Python :: 3.5", "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.7", + "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", "Topic :: Scientific/Engineering", "Topic :: Scientific/Engineering :: Information Analysis", "Topic :: Scientific/Engineering :: Mathematics", diff --git a/awkward-numba/setup.py b/awkward-numba/setup.py index d852a108..10d8476e 100755 --- a/awkward-numba/setup.py +++ b/awkward-numba/setup.py @@ -62,6 +62,8 @@ def get_version(): "Programming Language :: Python :: 3.5", "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.7", + "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", "Topic :: Scientific/Engineering", "Topic :: Scientific/Engineering :: Information Analysis", "Topic :: Scientific/Engineering :: Mathematics", diff --git a/awkward/version.py b/awkward/version.py index f552c9c8..24c2ae9a 100644 --- a/awkward/version.py +++ b/awkward/version.py @@ -4,7 +4,7 @@ import re -__version__ = "0.13.1" +__version__ = "0.14.0" version = __version__ version_info = tuple(re.split(r"[-\.]", __version__)) From 0d363f4d43e0af32e92a2f20f10b45324371894e Mon Sep 17 00:00:00 2001 From: eduardo-rodrigues Date: Sun, 1 Nov 2020 17:14:00 +0100 Subject: [PATCH 4/4] Relax requirement on numpy version for tests, to have a compatible Pandas --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4d32b753..8c6283de 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,7 +50,7 @@ script: install: - pip install --upgrade setuptools_scm - pip install $NUMPY - - if [[ $TRAVIS_PYTHON_VERSION == 2.7 ]] ; then pip install "pandas==0.24.2"; elif [[ $TRAVIS_PYTHON_VERSION != pypy* ]]; then pip install "pandas==0.25.3" ; fi + - if [[ $TRAVIS_PYTHON_VERSION == 2.7 ]] ; then pip install "pandas==0.24.2"; elif [[ $TRAVIS_PYTHON_VERSION != pypy* ]]; then pip install "pandas>=0.25.3" ; fi - if [[ $TRAVIS_PYTHON_VERSION = pypy* ]] ; then pip install "numpy<1.16.0" ; fi # FIXME: pypy bug in numpy - python -c 'import numpy; print(numpy.__version__)' - pip install pytest pytest-runner