Skip to content

Commit 82c83b1

Browse files
authored
Merge branch 'master' into msgpack-alimanfoo-20181106
2 parents 6990992 + c4c0a8f commit 82c83b1

File tree

8 files changed

+38
-37
lines changed

8 files changed

+38
-37
lines changed

.pyup.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# autogenerated 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

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ matrix:
2222

2323
install:
2424
- pip install -U tox-travis coveralls pip setuptools wheel
25-
- pip install -r requirements_dev.txt
2625
- python setup.py build_ext --inplace
26+
- pip freeze
2727

2828
script:
2929
- tox

appveyor.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,15 @@ environment:
4040
install:
4141
- "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
4242
- git submodule update --init --recursive
43+
- "%CMD_IN_ENV% python -m pip install -U pip setuptools wheel"
44+
- "%CMD_IN_ENV% python -m pip install -rrequirements_dev.txt"
45+
- "%CMD_IN_ENV% python -m pip install -rrequirements_test.txt"
46+
- "%CMD_IN_ENV% python setup.py build_ext --inplace"
47+
- "%CMD_IN_ENV% python -m pip freeze"
4348

4449
build: off
4550

4651
test_script:
47-
- "%CMD_IN_ENV% python -m pip install -U pip setuptools wheel"
48-
- "%CMD_IN_ENV% python -m pip install -rrequirements_dev.txt"
49-
- "%CMD_IN_ENV% python setup.py build_ext --inplace"
5052
- "%CMD_IN_ENV% python -m pytest -v numcodecs"
5153

5254
after_test:

numcodecs/tests/common.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@
1212

1313

1414
from numcodecs.compat import buffer_tobytes, ndarray_from_buffer
15-
from numcodecs import * # flake8: noqa
15+
from numcodecs.registry import get_codec
16+
# star import needed for repr tests so eval finds names
17+
from numcodecs import * # noqa
1618

1719

1820
greetings = [u'¡Hola mundo!', u'Hej Världen!', u'Servus Woid!', u'Hei maailma!',

requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
cython
12
numpy
23
msgpack
34
pytest

requirements_dev.txt

Lines changed: 1 addition & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,3 @@
1-
appdirs==1.4.3
2-
args==0.1.0
3-
certifi==2017.7.27.1
4-
chardet==3.0.4
5-
clint==0.5.1
6-
coverage==4.4.1
7-
coveralls==1.2.0
81
Cython==0.29
9-
docopt==0.6.2
10-
fasteners==0.14.1
11-
flake8==3.5.0
12-
idna==2.6
13-
mccabe==0.6.1
14-
monotonic==1.3
152
msgpack==0.5.6
16-
numpy==1.15.3
17-
packaging==16.8
18-
pkginfo==1.4.1
19-
pluggy==0.5.2
20-
py==1.4.34
21-
pycodestyle==2.3.1
22-
pyflakes==1.6.0
23-
pyparsing==2.2.0
24-
pytest==3.2.3
25-
pytest-cov==2.5.1
26-
requests==2.18.4
27-
requests-toolbelt==0.8.0
28-
setuptools-scm==1.15.6
29-
tox==2.9.1
30-
tox-travis==0.8
31-
tqdm==4.19.4
32-
twine==1.9.1
33-
urllib3==1.22
34-
virtualenv==15.1.0
3+
numpy==1.15.4

requirements_test.txt

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

tox.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ commands =
2121
deps =
2222
py27: backports.lzma
2323
-rrequirements_dev.txt
24+
-rrequirements_test.txt
2425

2526
[testenv:docs]
2627
basepython = python2.7

0 commit comments

Comments
 (0)