Skip to content
This repository has been archived by the owner on Jun 21, 2022. It is now read-only.

Commit

Permalink
Merge pull request #318 from scikit-hep/forbid-awkward1
Browse files Browse the repository at this point in the history
Explicitly forbid awkward 1.0 well in advance of such a thing existing.
  • Loading branch information
jpivarski committed Aug 16, 2019
2 parents afb0364 + 066441f commit ca84815
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ install:
- pip install --upgrade setuptools-scm
- pip install $NPY
- python -c 'import numpy; print(numpy.__version__)'
- pip install "awkward>=0.12.0"
- pip install "awkward>=0.12.0,<1.0"
- python -c 'import awkward; print(awkward.__version__)'
- pip install "uproot-methods>=0.7.0"
- python -c 'import uproot_methods; print(uproot_methods.__version__)'
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ install:
build_script:
- "python -m pip install --upgrade pip"
- "pip install %NUMPY%"
- "pip install \"awkward>=0.12.0\""
- "pip install \"awkward>=0.12.0,<1.0\""
- "python -c \"import awkward; print(awkward.__version__)\""
- "pip install \"uproot-methods>=0.7.0\""
- "python -c \"import uproot_methods; print(uproot_methods.__version__)\""
Expand Down
2 changes: 1 addition & 1 deletion binder/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
numpy>=1.13.1
awkward>=0.12.0
awkward>=0.12.0,<1.0
uproot-methods>=0.7.0
cachetools
pkgconfig
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
numpy>=1.13.1
awkward>=0.12.0
awkward>=0.12.0,<1.0
uproot-methods>=0.7.0
cachetools
backports.lzma;python_version<"3.3"
6 changes: 3 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,8 @@ def get_description():
download_url = "https://github.com/scikit-hep/uproot/releases",
license = "BSD 3-clause",
test_suite = "tests",
install_requires = ["numpy>=1.13.1", "awkward>=0.12.0", "uproot-methods>=0.7.0", "cachetools"],
python_requires = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*",
install_requires = ["numpy>=1.13.1", "awkward>=0.12.0,<1.0", "uproot-methods>=0.7.0", "cachetools"],
setup_requires = ["pytest-runner"],
tests_require = ["pytest>=3.9", "pkgconfig", "lz4", 'backports.lzma;python_version<"3.3"', "xxhash", "mock", "requests"],
classifiers = [
Expand All @@ -154,12 +155,11 @@ def get_description():
"Operating System :: POSIX",
"Operating System :: Unix",
"Programming Language :: Python",
"Programming Language :: Python :: 2.6",
"Programming Language :: Python :: 2.7",
"Programming Language :: Python :: 3.4",
"Programming Language :: Python :: 3.5",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Topic :: Scientific/Engineering",
"Topic :: Scientific/Engineering :: Information Analysis",
"Topic :: Scientific/Engineering :: Mathematics",
Expand Down
2 changes: 1 addition & 1 deletion uproot/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import re

__version__ = "3.8.2"
__version__ = "3.9.0"
version = __version__
version_info = tuple(re.split(r"[-\.]", __version__))

Expand Down

0 comments on commit ca84815

Please sign in to comment.