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

Commit

Permalink
Merge pull request #372 from scikit-hep/eduardo-doc-20181122
Browse files Browse the repository at this point in the history
Update to documentation and preparation towards the 4.8.0 release
  • Loading branch information
kratsg authored Dec 4, 2018
2 parents 7d9b0e8 + a02a5e5 commit 6cb666d
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 19 deletions.
5 changes: 2 additions & 3 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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 <http://root.cern.ch/>`_ and `NumPy <http://www.numpy.org/>`_.
Expand Down Expand Up @@ -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

4 changes: 2 additions & 2 deletions codemeta.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -33,5 +33,5 @@
"keywords": "Python, C++, NumPy, CERN, ROOT",
"license": "BSD",
"title": "root_numpy",
"version": "4.7.3"
"version": "4.8.0"
}
3 changes: 1 addition & 2 deletions docs/install.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -101,4 +101,3 @@ Your copy of the `root_numpy` source may also be tested by runnnig this inside
the source directory::

make test

2 changes: 1 addition & 1 deletion paper/Makefile
Original file line number Diff line number Diff line change
@@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion root_numpy/info.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
|_| \___/ \___/ \__|___|_| |_|\__,_|_| |_| |_| .__/ \__, | {0}
|_____| |_| |___/
"""
__version__ = '4.7.3.dev0'
__version__ = '4.8.0'
__doc__ = __doc__.format(__version__) # pylint:disable=redefined-builtin
14 changes: 4 additions & 10 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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,
Expand All @@ -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',
Expand Down

0 comments on commit 6cb666d

Please sign in to comment.