Skip to content

Commit 2720338

Browse files
authored
Merge pull request #326 from alimanfoo/rework-requirements-alimanfoo-20181108
Rework requirements for pyup.io
2 parents d193a78 + 4a29648 commit 2720338

8 files changed

+52
-87
lines changed

.pyup.yml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# pyup.io config file
2+
# see https://pyup.io/docs/configuration/ for all available options
3+
4+
schedule: every month
5+
6+
requirements:
7+
- requirements.txt:
8+
pin: False
9+
update: False
10+
- requirements_test.txt:
11+
pin: False
12+
update: False
13+
- requirements_rtfd.txt:
14+
pin: False
15+
update: False
16+
- requirements_dev.txt:
17+
pin: True
18+
update: all
19+
- requirements_dev_npy.txt:
20+
pin: True
21+
update: all
22+
- requirements_dev_optional.txt:
23+
pin: True
24+
update: all

appveyor.yml

Lines changed: 6 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -12,49 +12,29 @@ environment:
1212

1313
matrix:
1414

15-
- PYTHON: "C:\\Python27"
16-
PYTHON_VERSION: "2.7"
17-
NUMPY_VERSION: "1.15.2"
18-
1915
- PYTHON: "C:\\Python27-x64"
2016
PYTHON_VERSION: "2.7"
21-
NUMPY_VERSION: "1.15.2"
2217
DISTUTILS_USE_SDK: "1"
2318

24-
- PYTHON: "C:\\Python35"
25-
PYTHON_VERSION: "3.5"
26-
NUMPY_VERSION: "1.15.2"
27-
2819
- PYTHON: "C:\\Python35-x64"
2920
PYTHON_VERSION: "3.5"
30-
NUMPY_VERSION: "1.15.2"
31-
32-
- PYTHON: "C:\\Python36"
33-
PYTHON_VERSION: "3.6"
34-
NUMPY_VERSION: "1.15.2"
3521

3622
- PYTHON: "C:\\Python36-x64"
3723
PYTHON_VERSION: "3.6"
38-
NUMPY_VERSION: "1.15.2"
39-
40-
- PYTHON: "C:\\Python37"
41-
PYTHON_VERSION: "3.7"
42-
NUMPY_VERSION: "1.15.2"
4324

4425
- PYTHON: "C:\\Python37-x64"
4526
PYTHON_VERSION: "3.7"
46-
NUMPY_VERSION: "1.15.2"
4727

4828
install:
4929
- "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
30+
- "%CMD_IN_ENV% python -m pip install -U pip setuptools wheel"
31+
- "%CMD_IN_ENV% python -m pip install -rrequirements_test.txt"
32+
- "%CMD_IN_ENV% python -m pip install -rrequirements_dev_npy.txt"
33+
- "%CMD_IN_ENV% python -m pip install --no-binary=numcodecs -rrequirements_dev.txt"
34+
- "%CMD_IN_ENV% python setup.py install"
35+
- "%CMD_IN_ENV% python -m pip freeze"
5036

5137
build: off
5238

5339
test_script:
54-
- "%CMD_IN_ENV% python -m pip install -U pip setuptools wheel"
55-
- "%CMD_IN_ENV% python -m pip install numpy==%NUMPY_VERSION%"
56-
- "%CMD_IN_ENV% python -m pip install cython==0.29"
57-
- "%CMD_IN_ENV% python -m pip install -v --no-binary=numcodecs numcodecs==0.5.5"
58-
- "%CMD_IN_ENV% python -m pip install -rrequirements_dev.txt"
59-
- "%CMD_IN_ENV% python setup.py install"
6040
- "%CMD_IN_ENV% python -m pytest -v --pyargs zarr"

requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
asciitree
2-
pytest
3-
numpy
42
fasteners
53
numcodecs
4+
numpy
5+
pytest

requirements_dev.txt

Lines changed: 0 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,3 @@
11
asciitree==0.3.3
2-
asn1crypto==0.24.0
3-
atomicwrites==1.2.1
4-
attrs==18.2.0
5-
bleach==3.0.2
6-
boto3==1.9.26
7-
botocore==1.12.26
8-
certifi==2018.10.15
9-
cffi==1.11.5
10-
chardet==3.0.4
11-
cmarkgfm==0.4.2
12-
configparser==3.5.0
13-
coverage==4.5.1
14-
coveralls==1.5.1
15-
cryptography==2.3.1
16-
Cython==0.29
17-
docopt==0.6.2
18-
docutils==0.14
19-
enum34==1.1.6
202
fasteners==0.14.1
21-
filelock==3.0.9
22-
flake8==3.5.0
23-
funcsigs==1.0.2
24-
future==0.16.0
25-
h5py==2.8.0
26-
idna==2.7
27-
ipaddress==1.0.22
28-
jmespath==0.9.3
29-
mccabe==0.6.1
30-
monotonic==1.5
31-
more-itertools==4.3.0
32-
msgpack-python==0.5.6
333
numcodecs==0.5.5
34-
pathlib2==2.3.2
35-
pkginfo==1.4.2
36-
pluggy==0.8.0
37-
py==1.7.0
38-
pycodestyle==2.3.1
39-
pycparser==2.19
40-
pyflakes==1.6.0
41-
Pygments==2.2.0
42-
pyOpenSSL==18.0.0
43-
pytest==3.9.1
44-
pytest-cov==2.6.0
45-
python-dateutil==2.7.3
46-
readme-renderer==22.0
47-
requests==2.19.1
48-
requests-toolbelt==0.8.0
49-
setuptools-scm==3.1.0
50-
s3fs==0.1.6
51-
s3transfer==0.1.13
52-
scandir==1.9.0
53-
six==1.11.0
54-
toml==0.10.0
55-
tox==3.5.2
56-
tox-travis==0.11
57-
tqdm==4.27.0
58-
twine==1.12.1
59-
urllib3==1.23
60-
virtualenv==16.0.0
61-
webencodings==0.5.1

requirements_dev_npy.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# Break this out into a separate file to allow testing against
2+
# different versions of numpy. This file should pin to the latest
3+
# numpy version.
4+
numpy==1.15.4

requirements_dev_optional.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1+
# These packages are currently not available on Windows.
12
bsddb3==6.2.6
23
lmdb==0.94

requirements_test.txt

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
coverage
2+
coveralls
3+
cython
4+
flake8
5+
h5py
6+
msgpack-python
7+
pytest
8+
pytest-cov
9+
s3fs
10+
setuptools-scm
11+
tox

tox.ini

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,14 @@ commands =
3030
py37: python -m doctest -o NORMALIZE_WHITESPACE -o ELLIPSIS docs/tutorial.rst docs/spec/v2.rst
3131
# pep8 checks
3232
py37: flake8 --max-line-length=100 zarr
33+
# print environment for debugging
34+
pip freeze
3335
deps =
3436
py27: backports.lzma
3537
py36-npy113: numpy==1.13.3
3638
py36-npy114: numpy==1.14.6
37-
py27,py35,py36-npy115,py37: numpy==1.15.2
39+
py27,py35,py36-npy115,py37: -rrequirements_dev_npy.txt
40+
-rrequirements_test.txt
3841
-rrequirements_dev.txt
3942
# linux only
4043
-rrequirements_dev_optional.txt

0 commit comments

Comments
 (0)