Skip to content

Commit 0ec0886

Browse files
authored
Merge branch 'master' into master
2 parents 9492de0 + df60e2f commit 0ec0886

File tree

353 files changed

+11183
-16660
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

353 files changed

+11183
-16660
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,9 @@ coverage.xml
4949
.hypothesis/
5050
cover/
5151

52+
# Cython annotation files
53+
numcodecs/*.html
54+
5255
# Translations
5356
*.mo
5457
*.pot

.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: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,17 @@ addons:
1111
packages:
1212
- liblzma-dev
1313

14-
python:
15-
- 2.7
16-
- 3.4
17-
- 3.5
18-
- 3.6
14+
matrix:
15+
include:
16+
- python: 2.7
17+
- python: 3.5
18+
- python: 3.6
19+
- python: 3.7
20+
dist: xenial
21+
sudo: true
1922

2023
install:
2124
- pip install -U tox-travis coveralls pip setuptools wheel
22-
- pip install -r requirements_dev.txt
2325
- python setup.py build_ext --inplace
2426

2527
script:

README.rst

Lines changed: 6 additions & 6 deletions

appveyor.yml

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,6 @@ environment:
1919
PYTHON_VERSION: "2.7"
2020
DISTUTILS_USE_SDK: "1"
2121

22-
- PYTHON: "C:\\Python34"
23-
PYTHON_VERSION: "3.4"
24-
25-
- PYTHON: "C:\\Python34-x64"
26-
PYTHON_VERSION: "3.4"
27-
DISTUTILS_USE_SDK: "1"
28-
2922
- PYTHON: "C:\\Python35"
3023
PYTHON_VERSION: "3.5"
3124

@@ -38,16 +31,24 @@ environment:
3831
- PYTHON: "C:\\Python36-x64"
3932
PYTHON_VERSION: "3.6"
4033

34+
- PYTHON: "C:\\Python37"
35+
PYTHON_VERSION: "3.7"
36+
37+
- PYTHON: "C:\\Python37-x64"
38+
PYTHON_VERSION: "3.7"
39+
4140
install:
4241
- "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
4342
- 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"
4448

4549
build: off
4650

4751
test_script:
48-
- "%CMD_IN_ENV% python -m pip install -U pip setuptools wheel"
49-
- "%CMD_IN_ENV% python -m pip install -rrequirements_dev.txt"
50-
- "%CMD_IN_ENV% python setup.py build_ext --inplace"
5152
- "%CMD_IN_ENV% python -m pytest -v numcodecs"
5253

5354
after_test:

docs/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ def __getattr__(cls, name):
6060

6161
numpydoc_show_class_members = False
6262
numpydoc_class_members_toctree = False
63-
issues_github_path = 'alimanfoo/numcodecs'
63+
issues_github_path = 'zarr-developers/numcodecs'
6464

6565
# Add any paths that contain templates here, relative to this directory.
6666
templates_path = ['_templates']

docs/contributing.rst

Lines changed: 9 additions & 9 deletions

docs/gzip.rst

Lines changed: 11 additions & 0 deletions

docs/index.rst

Lines changed: 2 additions & 1 deletion

0 commit comments

Comments
 (0)