8000 - removed exclusion of numpy==1.16.* version since pytables 3.5 is no… · larray-project/larray@099cc4a · GitHub
[go: up one dir, main page]
Skip to content

Commit 099cc4a

Browse files
alixdammanalixdamman
committed
- removed exclusion of numpy==1.16.* version since pytables 3.5 is now available and fixed the incompatibility
- dropped support for Python 3.5 in travis.yml - added support for Python 3.7 in travis.yml - made travis to use the xenial distribution by default
1 parent 03fea19 commit 099cc4a

File tree

5 files changed

+7
-20
lines changed

5 files changed

+7
-20
lines changed

‎.travis.yml

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,13 @@
11
# References
22
# - https://gist.github.com/dan-blanchard/7045057
33
# - https://github.com/numba/numba/blob/master/.travis.yml
4+
dist: xenial # required for Python >= 3.7
45
language: python
56

67
python:
78
- "2.7"
8-
- "3.5"
99
- "3.6"
10-
11-
# Work-around to enable python 3.7 without globally enabling sudo and dist: xenial for other build jobs
12-
# see https://github.com/travis-ci/travis-ci/issues/9815
13-
matrix:
14-
include:
15-
- python: 3.7
16-
dist: xenial
17-
sudo: true
10+
- "3.7"
1811

1912
branches:
2013
only:
@@ -44,12 +37,10 @@ install:
4437
# - pandas will bring dateutil numpy pytz setuptools six and scipy, we
4538
# might want to avoid the later by installing all dependencies manually
4639
# except scipy and install pandas with --no-deps
47-
# - fixed versions of numpy and pytables because of incompatibilities
48-
# between pytables <= 3.4 and numpy >= 1.16
4940
# - pandas >= 0.20.0 is required since commit 01669f2024a7bffe47cceec0a0fd845f71b6f7cc
5041
# (issue 702 : fixed bug when writing metadata using HDF format)
5142
- conda create -n travisci --yes python=${TRAVIS_PYTHON_VERSION:0:3}
52-
"numpy==1.15.2" "pandas>=0.20" "pytables==3.4.4" matplotlib xlrd openpyxl
43+
"numpy>=1.13" "pandas>=0.20" pytables matplotlib xlrd openpyxl
5344
xlsxwriter pytest pytest-pep8
5445
- source activate travisci
5546

‎condarecipe/larray/meta.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ requirements:
2121

2222
run:
2323
- python
24-
- numpy >=1.13,!= 1.16
24+
- numpy >=1.13
2525
- pandas >=0.20
2626

2727
test:

‎make_release.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,11 @@ def fill(s):
3939

4040
# TODO: this should be echocall(redirect_stdout=False)
4141
print(fill('Updating larrayenv metapackage to version {version}'))
42-
# - fixed versions of numpy and pytables because of incompatibilities
43-
# between pytables <= 3.4 and numpy >= 1.16
44-
# Didn't set pytables ==3.5 because it is not available for Python 3.5
4542
# - excluded versions 5.0 and 5.1 of ipykernel because these versions make the console useless after any exception
4643
# https://github.com/larray-project/larray-editor/issues/166
4744
check_call(['conda', 'metapackage', 'larrayenv', version, '--dependencies', fill('larray =={version}'),
4845
fill('larray-editor =={version}'), fill('larray_eurostat =={version}'),
49-
"qtconsole", "matplotlib", "pyqt", "qtpy", "numpy ==1.15.2", "pytables ==3.4.4",
46+
"qtconsole", "matplotlib", "pyqt", "qtpy", "pytables",
5047
"xlsxwriter", "xlrd", "openpyxl", "xlwings", "ipykernel !=5.0,!=5.1.0",
5148
'--home', 'http://github.com/larray-project/larray',
5249
'--license', 'GPL-3.0',

‎setup.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ test=pytest
55
testpaths = larray
66
# - exclude (doc)tests from ufuncs (because docstrings are copied from numpy
77
# and many of those doctests are failing
8-
# - deselect LArray.astype since doctests fails for Python 3.6 and numpy => 1.17
8+
# - deselect LArray.astype since doctests fails for Python 3.6 and numpy >= 1.17
99
addopts = -v --doctest-modules
1010
--ignore=larray/core/npufuncs.py
1111
--ignore=larray/ipfp

‎setup.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,9 @@ def readlocal(fname):
1515
DESCRIPTION = "N-D labeled arrays in Python"
1616
LONG_DESCRIPTION = readlocal("README.rst")
1717
SETUP_REQUIRES = []
18-
# - excludes numpy 1.16.* because it is incompatible with pytables < 3.5
1918
# - pandas >= 0.20.0 is required since commit 01669f2024a7bffe47cceec0a0fd845f71b6f7cc
2019
# (issue 702 : fixed bug when writing metadata using HDF format)
21-
INSTALL_REQUIRES = ['numpy >= 1.13, != 1.16.*', 'pandas >= 0.20.0']
20+
INSTALL_REQUIRES = ['numpy >= 1.13', 'pandas >= 0.20.0']
2221
TESTS_REQUIRE = ['pytest', 'pytest-pep8']
2322

2423
LICENSE = 'GPLv3'

0 commit comments

Comments
 (0)
0