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

Commit

Permalink
Merge pull request #22 from scikit-hep/sync-awkward-070
Browse files Browse the repository at this point in the history
require version 0.7.0 or later of awkward
  • Loading branch information
jpivarski authored Dec 13, 2018
2 parents 3a140f7 + 4481284 commit 0aae83f
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ install:
- pip install --upgrade setuptools_scm
- pip install $NUMPY
- python -c 'import numpy; print(numpy.__version__)'
- pip install awkward
- pip install "awkward>=0.7.0"
- python -c 'import awkward; print(awkward.__version__)'
- pip install pytest pytest-runner

Expand Down
13 changes: 5 additions & 8 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ Pythonic mix-ins for ROOT classes.

.. inclusion-marker-1-5-do-not-remove
(...)
This package is typically used as a dependency for `uproot <https://github.com/scikit-hep/uproot>`__, to define methods on the classes that are automatically generated from ROOT files. This includes histograms (TH*) and physics objects like TLorentzVectors. The reason it's a separate library is so that we can add physics-specific functionality on a shorter timescale than we can update uproot itself, which is purely an I/O package.

Occasionally, this library is used without uproot, as a way to make arrays of TLorentzVectors.

.. inclusion-marker-2-do-not-remove
Expand All @@ -30,16 +32,11 @@ Strict dependencies:
The following are installed automatically when you install uproot with pip:

- `Numpy <https://scipy.org/install.html>`__ (1.13.1+)
- `awkward-array <https://pypi.org/project/awkward>`__ to manipulate data from non-flat TTrees, such as jagged arrays (`part of Scikit-HEP <https://github.com/scikit-hep/awkward-array>`__)
- `awkward-array <https://pypi.org/project/awkward>`__ (0.7.0+) to manipulate data from non-flat TTrees, such as jagged arrays (`part of Scikit-HEP <https://github.com/scikit-hep/awkward-array>`__)

.. inclusion-marker-3-do-not-remove
Tutorial
========

This library is typically installed as a dependency for [uproot](https://github.com/scikit-hep/uproot).

Reference documentation
=======================

(...)
TBD.
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
numpy>=1.13.1
awkward
awkward>=0.7.0
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ def get_description():
download_url = "https://github.com/scikit-hep/uproot-methods/releases",
license = "BSD 3-clause",
test_suite = "tests",
install_requires = ["numpy>=1.13.1", "awkward"],
install_requires = ["numpy>=1.13.1", "awkward>=0.7.0"],
tests_require = [],
classifiers = [
"Development Status :: 4 - Beta",
Expand Down

0 comments on commit 0aae83f

Please sign in to comment.