Skip to content
This repository was archived by the owner on Jan 7, 2023. It is now read-only.

Commit 6cb666d

Browse files
authored
Merge pull request #372 from scikit-hep/eduardo-doc-20181122
Update to documentation and preparation towards the 4.8.0 release
2 parents 7d9b0e8 + a02a5e5 commit 6cb666d

File tree

6 files changed

+11
-19
lines changed

6 files changed

+11
-19
lines changed

README.rst

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ root_numpy: The interface between ROOT and NumPy
1313
:target: https://coveralls.io/github/scikit-hep/root_numpy?branch=master
1414
.. image:: https://landscape.io/github/scikit-hep/root_numpy/master/landscape.svg?style=flat
1515
:target: https://landscape.io/github/scikit-hep/root_numpy/master
16-
.. image:: https://zenodo.org/badge/3823872.svg
17-
:target: https://zenodo.org/badge/latestdoi/3823872
16+
.. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.592881.svg
17+
:target: https://doi.org/10.5281/zenodo.592881
1818

1919
root_numpy is a Python extension module that provides an efficient interface
2020
between `ROOT <http://root.cern.ch/>`_ and `NumPy <http://www.numpy.org/>`_.
@@ -49,4 +49,3 @@ array that are expressions involving the TTree branches similar to
4949
Did we mention that root_numpy is fast?
5050

5151
.. image:: benchmarks/bench_tree2array.png
52-

codemeta.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"affiliation": "The University of Chicago"
2525
}
2626
],
27-
"identifier": "http://doi.org/10.5281/zenodo.842249",
27+
"identifier": "http://doi.org/10.5281/zenodo.592881",
2828
"codeRepository": "https://github.com/scikit-hep/root_numpy",
2929
"datePublished": "2017-08-14",
3030
"dateModified": "2017-08-14",
@@ -33,5 +33,5 @@
3333
"keywords": "Python, C++, NumPy, CERN, ROOT",
3434
"license": "BSD",
3535
"title": "root_numpy",
36-
"version": "4.7.3"
36+
"version": "4.8.0"
3737
}

docs/install.rst

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ root_numpy has been tested with:
1919

2020
* ROOT 5.32, 5.34, 6.04, 6.06, 6.09
2121
* NumPy 1.6, 1.7, 1.8, 1.9, 1.10, 1.11
22-
* Python 2.6, 2.7, 3.4, 3.5
22+
* Python 2.7, 3.6, 3.7
2323
* GNU/Linux, Mac OS
2424

2525
.. 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
101101
the source directory::
102102

103103
make test
104-

paper/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
default:
22
@pandoc \
33
-V repository=https://github.com/scikit-hep/root_numpy \
4-
-V archive_doi=http://doi.org/10.5281/zenodo.842249 \
4+
-V archive_doi=http://doi.org/10.5281/zenodo.592881 \
55
-V formatted_doi=10.21105/joss.00307 \
66
-S -o paper.tex -V geometry:margin=1in \
77
--filter pandoc-citeproc paper.md \

root_numpy/info.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
|_| \___/ \___/ \__|___|_| |_|\__,_|_| |_| |_| .__/ \__, | {0}
77
|_____| |_| |___/
88
"""
9-
__version__ = '4.7.3.dev0'
9+
__version__ = '4.8.0'
1010
__doc__ = __doc__.format(__version__) # pylint:disable=redefined-builtin

setup.py

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@
44

55
import sys
66

7-
# Check Python version
8-
if sys.version_info < (2, 6):
9-
sys.exit("root_numpy only supports python 2.6 and above")
10-
117
if sys.version_info[0] < 3:
128
import __builtin__ as builtins
139
else:
@@ -204,8 +200,8 @@ def setup_package():
204200
long_description=''.join(open('README.rst').readlines()[7:-4]),
205201
author='the root_numpy developers',
206202
author_email='[email protected]',
207-
maintainer='Noel Dawe',
208-
maintainer_email='[email protected]',
203+
maintainer='The scikit-hep developers',
204+
maintainer_email='[email protected]',
209205
license='new BSD',
210206
url='http://scikit-hep.org/root_numpy',
211207
packages=packages,
@@ -229,12 +225,10 @@ def setup_package():
229225
'License :: OSI Approved :: BSD License',
230226
'Programming Language :: Python',
231227
'Programming Language :: Python :: 2',
232-
'Programming Language :: Python :: 2.6',
233228
'Programming Language :: Python :: 2.7',
234229
'Programming Language :: Python :: 3',
235-
'Programming Language :: Python :: 3.3',
236-
'Programming Language :: Python :: 3.4',
237-
'Programming Language :: Python :: 3.5',
230+
'Programming Language :: Python :: 3.6',
231+
'Programming Language :: Python :: 3.7',
238232
'Programming Language :: C++',
239233
'Programming Language :: Cython',
240234
'Development Status :: 5 - Production/Stable',

0 commit comments

Comments
 (0)