Skip to content

Commit 26b17e7

Browse files
scopatzscopatz
authored
Merge pull request #18 from dougalsutherland/fix-pin
fix pins
2 parents b6a51b7 + f8c566f commit 26b17e7

File tree

9 files changed

+96
-170
lines changed

9 files changed

+96
-170
lines changed

‎.circleci/config.yml

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
version: 2
2+
3+
jobs:
4+
build__CONDA_PY_27:
5+
working_directory: ~/test
6+
machine: true
7+
environment:
8+
- CONDA_PY: "27"
9+
steps:
10+
- checkout
11+
- run:
12+
name: Fast finish outdated PRs and merge PRs
13+
command: |
14+
./ci_support/fast_finish_ci_pr_build.sh
15+
./ci_support/checkout_merge_commit.sh
16+
- run:
17+
command: docker pull condaforge/linux-anvil
18+
- run:
19+
name: Print conda-build environment variables
20+
command: |
21+
echo "CONDA_PY=${CONDA_PY}"
22+
- run:
23+
# Run, test and (if we have a BINSTAR_TOKEN) upload the distributions.
24+
command: ./ci_support/run_docker_build.sh
25+
build__CONDA_PY_35:
26+
working_directory: ~/test
27+
machine: true
28+
environment:
29+
- CONDA_PY: "35"
30+
steps:
31+
- checkout
32+
- run:
33+
name: Fast finish outdated PRs and merge PRs
34+
command: |
35+
./ci_support/fast_finish_ci_pr_build.sh
36+
./ci_support/checkout_merge_commit.sh
37+
- run:
38+
command: docker pull condaforge/linux-anvil
39+
- run:
40+
name: Print conda-build environment variables
41+
command: |
42+
echo "CONDA_PY=${CONDA_PY}"
43+
- run:
44+
# Run, test and (if we have a BINSTAR_TOKEN) upload the distributions.
45+
command: ./ci_support/run_docker_build.sh
46+
build__CONDA_PY_36:
47+
working_directory: ~/test
48+
machine: true
49+
environment:
50+
- CONDA_PY: "36"
51+
steps:
52+
- checkout
53+
- run:
54+
name: Fast finish outdated PRs and merge PRs
55+
command: |
56+
./ci_support/fast_finish_ci_pr_build.sh
57+
./ci_support/checkout_merge_commit.sh
58+
- run:
59+
command: docker pull condaforge/linux-anvil
60+
- run:
61+
name: Print conda-build environment variables
62+
command: |
63+
echo "CONDA_PY=${CONDA_PY}"
64+
- run:
65+
# Run, test and (if we have a BINSTAR_TOKEN) upload the distributions.
66+
command: ./ci_support/run_docker_build.sh
67+
68+
workflows:
69+
version: 2
70+
build_and_test:
71+
jobs:
72+
- build__CONDA_PY_27
73+
- build__CONDA_PY_35
74+
- build__CONDA_PY_36

‎.gitattributes

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
* text=auto
22

3+
*.patch binary
4+
*.diff binary
35
meta.yaml text eol=lf
46
build.sh text eol=lf
57
bld.bat text eol=crlf

‎.travis.yml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,9 @@ osx_image: xcode6.4
99
env:
1010
matrix:
1111

12-
- CONDA_NPY=111 CONDA_PY=27
13-
- CONDA_NPY=112 CONDA_PY=27
14-
- CONDA_NPY=113 CONDA_PY=27
15-
- CONDA_NPY=111 CONDA_PY=35
16-
- CONDA_NPY=112 CONDA_PY=35
17-
- CONDA_NPY=113 CONDA_PY=35
18-
- CONDA_NPY=111 CONDA_PY=36
19-
- CONDA_NPY=112 CONDA_PY=36
20-
- CONDA_NPY=113 CONDA_PY=36
12+
- CONDA_PY=27
13+
- CONDA_PY=35
14+
- CONDA_PY=36
2115
global:
2216
# The BINSTAR_TOKEN secure variable. This is defined canonically in conda-forge.yml.
2317
- secure: "TLuVUKnbBeRdKn/OVAWBWf0pkawgtvg2XHaAZw2e8xRMPbIzIGxcLXweCkVjONB6jMqHGpuC669ClVuKUmKKCPWA8Nu/DCWgtxZAZ8XAmcFj78d0KjiaYcMoPvlOl0hvYzY8IBDKlYmS2uZJdpL794YllPbkOVs2TZ+qDprPwEpwNvkx+lsXORkc2RmpzzbLYOJoZwLoCEGGpNuN2dTevksLTr/NgtTc4hYc7maYwQxRVA7Hto8MOTB+CEwtQHrHM6KYXpZ5hz4877KYTWUnWduKCXKdX2Sr6hirvRNGaV8/qETW/p7HSQmwGHz5JHXQkzbTGcVFoTcHI1puWXuQDpWZwIFkU9G/PPq/YsT7N/S0Og1jpWwN7Ncvxb+KzKFKjQpvthvoB/wVlB1MGFk63MkfgeEPQW1vviIBrj7fulUEMZJTHf5USrOiH5XVPxE8ov1BSu0ChJTsCQvZocpWJhlUBgD1tjgyAz8yXs4GgPQR3tReilNcxyBDzPQBEX7AzBYFG5rQM7Dd/hx33leYPrQZyBuwj5kUlELh19D4zA1yVQFyL2F5VQc7xyKn9Qw9BnX++dFX1q/fMg8mr+XCp7OOL10TSmXfcH6SETU5wBrcM0fpZ1Pbq+J7RZ9AsMCUNdOWbCziNFKsU+sXXaG95p6WZrNpo9u2s47UbU6/djc="

‎README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ To manage the continuous integration and simplify feedstock maintenance
7070
Using the ``conda-forge.yml`` within this repository, it is possible to re-render all of
7171
this feedstock's supporting files (e.g. the CI configuration files) with ``conda smithy rerender``.
7272

73+
For more information please check the [conda-forge documentation](https://conda-forge.org/docs/).
7374

7475
Terminology
7576
===========
@@ -104,4 +105,4 @@ In order to produce a uniquely identifiable distribution:
104105
the [``build/number``](http://conda.pydata.org/docs/building/meta-yaml.html#build-number-and-string).
105106
* If the version of a package **is** being increased, please remember to return
106107
the [``build/number``](http://conda.pydata.org/docs/building/meta-yaml.html#build-number-and-string)
107-
back to 0.
108+
back to 0.

‎appveyor.yml

Lines changed: 0 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -10,92 +10,26 @@ environment:
1010

1111
matrix:
1212
- TARGET_ARCH: x86
13-
CONDA_NPY: 111
1413
CONDA_PY: 27
1514
CONDA_INSTALL_LOCN: C:\\Miniconda
1615

1716
- TARGET_ARCH: x64
18-
CONDA_NPY: 111
1917
CONDA_PY: 27
2018
CONDA_INSTALL_LOCN: C:\\Miniconda-x64
2119

2220
- TARGET_ARCH: x86
23-
CONDA_NPY: 112
24-
CONDA_PY: 27
25-
CONDA_INSTALL_LOCN: C:\\Miniconda
26-
27-
- TARGET_ARCH: x64
28-
CONDA_NPY: 112
29-
CONDA_PY: 27
30-
CONDA_INSTALL_LOCN: C:\\Miniconda-x64
31-
32-
- TARGET_ARCH: x86
33-
CONDA_NPY: 113
34-
CONDA_PY: 27
35-
CONDA_INSTALL_LOCN: C:\\Miniconda
36-
37-
- TARGET_ARCH: x64
38-
CONDA_NPY: 113
39-
CONDA_PY: 27
40-
CONDA_INSTALL_LOCN: C:\\Miniconda-x64
41-
42-
- TARGET_ARCH: x86
43-
CONDA_NPY: 111
44-
CONDA_PY: 35
45-
CONDA_INSTALL_LOCN: C:\\Miniconda35
46-
47-
- TARGET_ARCH: x64
48-
CONDA_NPY: 111
49-
CONDA_PY: 35
50-
CONDA_INSTALL_LOCN: C:\\Miniconda35-x64
51-
52-
- TARGET_ARCH: x86
53-
CONDA_NPY: 112
5421
CONDA_PY: 35
5522
CONDA_INSTALL_LOCN: C:\\Miniconda35
5623

5724
- TARGET_ARCH: x64
58-
CONDA_NPY: 112
5925
CONDA_PY: 35
6026
CONDA_INSTALL_LOCN: C:\\Miniconda35-x64
6127

6228
- TARGET_ARCH: x86
63-
CONDA_NPY: 113
64-
CONDA_PY: 35
65-
CONDA_INSTALL_LOCN: C:\\Miniconda35
66-
67-
- TARGET_ARCH: x64
68-
CONDA_NPY: 113
69-
CONDA_PY: 35
70-
CONDA_INSTALL_LOCN: C:\\Miniconda35-x64
71-
72-
- TARGET_ARCH: x86
73-
CONDA_NPY: 111
74-
CONDA_PY: 36
75-
CONDA_INSTALL_LOCN: C:\\Miniconda36
76-
77-
- TARGET_ARCH: x64
78-
CONDA_NPY: 111
79-
CONDA_PY: 36
80-
CONDA_INSTALL_LOCN: C:\\Miniconda36-x64
81-
82-
- TARGET_ARCH: x86
83-
CONDA_NPY: 112
84-
CONDA_PY: 36
85-
CONDA_INSTALL_LOCN: C:\\Miniconda36
86-
87-
- TARGET_ARCH: x64
88-
CONDA_NPY: 112
89-
CONDA_PY: 36
90-
CONDA_INSTALL_LOCN: C:\\Miniconda36-x64
91-
92-
- TARGET_ARCH: x86
93-
CONDA_NPY: 113
9429
CONDA_PY: 36
9530
CONDA_INSTALL_LOCN: C:\\Miniconda36
9631

9732
- TARGET_ARCH: x64
98-
CONDA_NPY: 113
9933
CONDA_PY: 36
10034
CONDA_INSTALL_LOCN: C:\\Miniconda36-x64
10135

‎ci_support/run_docker_build.sh

Lines changed: 4 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ cat << EOF | docker run -i \
4040
-v "${RECIPE_ROOT}":/recipe_root \
4141
-v "${FEEDSTOCK_ROOT}":/feedstock_root \
4242
-e HOST_USER_ID="${HOST_USER_ID}" \
43+
-e CONDA_PY="${CONDA_PY}" \
4344
-a stdin -a stdout -a stderr \
4445
condaforge/linux-anvil \
4546
bash || exit 1
@@ -57,69 +58,9 @@ conda clean --lock
5758
conda install --yes --quiet conda-forge-build-setup
5859
source run_conda_forge_build_setup
5960
60-
# Embarking on 9 case(s).
61-
set -x
62-
export CONDA_NPY=111
63-
export CONDA_PY=27
64-
set +x
65-
conda build /recipe_root --quiet || exit 1
66-
upload_or_check_non_existence /recipe_root conda-forge --channel=main || exit 1
67-
68-
set -x
69-
export CONDA_NPY=112
70-
export CONDA_PY=27
71-
set +x
72-
conda build /recipe_root --quiet || exit 1
73-
upload_or_check_non_existence /recipe_root conda-forge --channel=main || exit 1
74-
75-
set -x
76-
export CONDA_NPY=113
77-
export CONDA_PY=27
78-
set +x
79-
conda build /recipe_root --quiet || exit 1
80-
upload_or_check_non_existence /recipe_root conda-forge --channel=main || exit 1
81-
82-
set -x
83-
export CONDA_NPY=111
84-
export CONDA_PY=35
85-
set +x
86-
conda build /recipe_root --quiet || exit 1
87-
upload_or_check_non_existence /recipe_root conda-forge --channel=main || exit 1
88-
89-
set -x
90-
export CONDA_NPY=112
91-
export CONDA_PY=35
92-
set +x
93-
conda build /recipe_root --quiet || exit 1
94-
upload_or_check_non_existence /recipe_root conda-forge --channel=main || exit 1
95-
96-
set -x
97-
export CONDA_NPY=113
98-
export CONDA_PY=35
99-
set +x
100-
conda build /recipe_root --quiet || exit 1
101-
upload_or_check_non_existence /recipe_root conda-forge --channel=main || exit 1
102-
103-
set -x
104-
export CONDA_NPY=111
105-
export CONDA_PY=36
106-
set +x
107-
conda build /recipe_root --quiet || exit 1
108-
upload_or_check_non_existence /recipe_root conda-forge --channel=main || exit 1
109-
110-
set -x
111-
export CONDA_NPY=112
112-
export CONDA_PY=36
113-
set +x
114-
conda build /recipe_root --quiet || exit 1
115-
upload_or_check_non_existence /recipe_root conda-forge --channel=main || exit 1
116-
117-
set -x
118-
export CONDA_NPY=113
119-
export CONDA_PY=36
120-
set +x
121-
conda build /recipe_root --quiet || exit 1
122-
upload_or_check_non_existence /recipe_root conda-forge --channel=main || exit 1
61+
conda build /recipe_root --quiet || exit 1
62+
upload_or_check_non_existence /recipe_root conda-forge --channel=main || exit 1
63+
12364
touch /feedstock_root/build_artefacts/conda-forge-build-done
12465
EOF
12566

‎circle.yml

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎recipe/meta.yaml

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ source:
1010
sha256: 629a0227bb2b315c5d97629073696609eaee41d0fc89e03f997412613cd46d3a
1111

1212
build:
13-
number: 1
13+
number: 2
1414
entry_points:
1515
- pt2to3 = tables.scripts.pt2to3:main
1616
- ptdump = tables.scripts.ptdump:main
@@ -22,9 +22,11 @@ requirements:
2222
- python
2323
- setuptools
2424
- cython
25-
- numpy x.x
26-
- zlib 1.2.*
27-
- lzo 2.06 # [linux]
25+
- numpy 1.8.* # [not (win and (py35 or py36))]
26+
- numpy 1.9.* # [win and py35]
27+
- numpy 1.11.* # [win and py36]
28+
- zlib 1.2.8
29+
- lzo 2.* # [linux]
2830
- bzip2 1.0.*
2931
- hdf5 1.8.18|1.8.18.*
3032
- numexpr
@@ -33,11 +35,13 @@ requirements:
3335
run:
3436
- python
3537
- six
36-
- numpy x.x
38+
- numpy >=1.8 # [not (win and (py35 or py36))]
39+
- numpy >=1.9 # [win and py35]
40+
- numpy >=1.11 # [win and py36]
3741
- numexpr
3842
- hdf5 1.8.18|1.8.18.*
39-
- zlib 1.2.*
40-
- lzo 2.06 # [linux]
43+
- zlib 1.2.8
44+
- lzo 2.* # [linux]
4145
- bzip2 1.0.*
4246
# building blosc is done internally. The version is up-to-date.
4347
# - blosc

‎recipe/run_test.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,6 @@
1313
import tables.utilsextension
1414

1515

16-
if sys.platform.startswith('linux'):
17-
lzo_ver = tables.which_lib_version("lzo")[1]
18-
assert lzo_ver == '2.06', lzo_ver
19-
20-
2116
if __name__ == "__main__":
2217
from multiprocessing import freeze_support
2318
freeze_support()

0 commit comments

Comments
 (0)