diff --git a/README.rst b/README.rst index 77dd3d1..b66f327 100644 --- a/README.rst +++ b/README.rst @@ -13,8 +13,8 @@ root_numpy: The interface between ROOT and NumPy :target: https://coveralls.io/github/scikit-hep/root_numpy?branch=master .. image:: https://landscape.io/github/scikit-hep/root_numpy/master/landscape.svg?style=flat :target: https://landscape.io/github/scikit-hep/root_numpy/master -.. image:: https://zenodo.org/badge/3823872.svg - :target: https://zenodo.org/badge/latestdoi/3823872 +.. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.592881.svg + :target: https://doi.org/10.5281/zenodo.592881 root_numpy is a Python extension module that provides an efficient interface between `ROOT `_ and `NumPy `_. @@ -49,4 +49,3 @@ array that are expressions involving the TTree branches similar to Did we mention that root_numpy is fast? .. image:: benchmarks/bench_tree2array.png - diff --git a/codemeta.json b/codemeta.json index dbd1435..bf38752 100644 --- a/codemeta.json +++ b/codemeta.json @@ -24,7 +24,7 @@ "affiliation": "The University of Chicago" } ], - "identifier": "http://doi.org/10.5281/zenodo.842249", + "identifier": "http://doi.org/10.5281/zenodo.592881", "codeRepository": "https://github.com/scikit-hep/root_numpy", "datePublished": "2017-08-14", "dateModified": "2017-08-14", @@ -33,5 +33,5 @@ "keywords": "Python, C++, NumPy, CERN, ROOT", "license": "BSD", "title": "root_numpy", - "version": "4.7.3" + "version": "4.8.0" } diff --git a/docs/install.rst b/docs/install.rst index 461674c..8b1b2e9 100644 --- a/docs/install.rst +++ b/docs/install.rst @@ -19,7 +19,7 @@ root_numpy has been tested with: * ROOT 5.32, 5.34, 6.04, 6.06, 6.09 * NumPy 1.6, 1.7, 1.8, 1.9, 1.10, 1.11 -* Python 2.6, 2.7, 3.4, 3.5 +* Python 2.7, 3.6, 3.7 * GNU/Linux, Mac OS .. warning:: **Mac OS:** libstdc++ and libc++ are not ABI-compatible. @@ -101,4 +101,3 @@ Your copy of the `root_numpy` source may also be tested by runnnig this inside the source directory:: make test - diff --git a/paper/Makefile b/paper/Makefile index e5d0271..47ff347 100644 --- a/paper/Makefile +++ b/paper/Makefile @@ -1,7 +1,7 @@ default: @pandoc \ -V repository=https://github.com/scikit-hep/root_numpy \ - -V archive_doi=http://doi.org/10.5281/zenodo.842249 \ + -V archive_doi=http://doi.org/10.5281/zenodo.592881 \ -V formatted_doi=10.21105/joss.00307 \ -S -o paper.tex -V geometry:margin=1in \ --filter pandoc-citeproc paper.md \ diff --git a/root_numpy/info.py b/root_numpy/info.py index fbd704f..e59a273 100644 --- a/root_numpy/info.py +++ b/root_numpy/info.py @@ -6,5 +6,5 @@ |_| \___/ \___/ \__|___|_| |_|\__,_|_| |_| |_| .__/ \__, | {0} |_____| |_| |___/ """ -__version__ = '4.7.3.dev0' +__version__ = '4.8.0' __doc__ = __doc__.format(__version__) # pylint:disable=redefined-builtin diff --git a/setup.py b/setup.py index 3949b36..45a6d18 100755 --- a/setup.py +++ b/setup.py @@ -4,10 +4,6 @@ import sys -# Check Python version -if sys.version_info < (2, 6): - sys.exit("root_numpy only supports python 2.6 and above") - if sys.version_info[0] < 3: import __builtin__ as builtins else: @@ -204,8 +200,8 @@ def setup_package(): long_description=''.join(open('README.rst').readlines()[7:-4]), author='the root_numpy developers', author_email='rootpy-dev@googlegroups.com', - maintainer='Noel Dawe', - maintainer_email='noel@dawe.me', + maintainer='The scikit-hep developers', + maintainer_email='scikit-hep-admins@googlegroups.com', license='new BSD', url='http://scikit-hep.org/root_numpy', packages=packages, @@ -229,12 +225,10 @@ def setup_package(): 'License :: OSI Approved :: BSD License', 'Programming Language :: Python', 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.6', 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', - 'Programming Language :: Python :: 3.3', - 'Programming Language :: Python :: 3.4', - 'Programming Language :: Python :: 3.5', + 'Programming Language :: Python :: 3.6', + 'Programming Language :: Python :: 3.7', 'Programming Language :: C++', 'Programming Language :: Cython', 'Development Status :: 5 - Production/Stable',