Skip to content

Commit 61c2081

Browse files
MNT: Re-rendered with conda-build 3.17.8, conda-smithy 3.2.12, and conda-forge-pinning 2019.01.29
1 parent 4b71bc0 commit 61c2081

19 files changed

+100
-75
lines changed

.appveyor.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# This file was automatically generated by conda-smithy. To update a component of this
22
# file, make changes to conda-forge.yml and/or recipe/meta.yaml, and run
33
# "conda smithy rerender".
4+
# -*- mode: yaml -*-
45

56
environment:
67

@@ -27,7 +28,7 @@ platform:
2728
install:
2829
# If there is a newer build queued for the same PR, cancel this one.
2930
- cmd: |
30-
powershell -Command "(New-Object Net.WebClient).DownloadFile('https://raw.githubusercontent.com/conda-forge/conda-forge-ci-setup-feedstock/branch2.0/recipe/conda_forge_ci_setup/ff_ci_pr_build.py', 'ff_ci_pr_build.py')"
31+
powershell -Command "(New-Object Net.WebClient).DownloadFile('https://raw.githubusercontent.com/conda-forge/conda-forge-ci-setup-feedstock/master/recipe/conda_forge_ci_setup/ff_ci_pr_build.py', 'ff_ci_pr_build.py')"
3132
ff_ci_pr_build -v --ci "appveyor" "%APPVEYOR_ACCOUNT_NAME%/%APPVEYOR_PROJECT_SLUG%" "%APPVEYOR_BUILD_NUMBER%" "%APPVEYOR_PULL_REQUEST_NUMBER%"
3233
del ff_ci_pr_build.py
3334
@@ -41,14 +42,15 @@ install:
4142
- cmd: set PYTHONUNBUFFERED=1
4243

4344
# Configure the VM.
44-
- cmd: conda.exe install -n root -c conda-forge --quiet --yes conda-forge-ci-setup=2
45+
# Tell conda we want an updated version of conda-forge-ci-setup and conda-build
46+
- cmd: conda.exe install -n root -c conda-forge --quiet --yes conda-forge-ci-setup=2 conda-build
4547
- cmd: setup_conda_rc .\ .\recipe .\.ci_support\%CONFIG%.yaml
4648
- cmd: run_conda_forge_build_setup
4749

4850
# Skip .NET project specific build phase.
4951
build: off
5052

5153
test_script:
52-
- conda.exe build recipe -m .ci_support\%CONFIG%.yaml --quiet
54+
- conda.exe build recipe -m .ci_support\%CONFIG%.yaml
5355
deploy_script:
5456
- cmd: upload_package .\ .\recipe .ci_support\%CONFIG%.yaml
Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
1+
# This file was generated automatically from conda-smithy. To update this configuration,
2+
# update the conda-forge.yml and/or the recipe/meta.yaml.
3+
# -*- mode: yaml -*-
4+
15
jobs:
2-
- job: linux_64
6+
- job: linux
37
pool:
48
vmImage: ubuntu-16.04
59
timeoutInMinutes: 240
@@ -8,15 +12,28 @@ jobs:
812
matrix:
913
linux_python2.7:
1014
CONFIG: linux_python2.7
15+
UPLOAD_PACKAGES: False
1116
linux_python3.6:
1217
CONFIG: linux_python3.6
18+
UPLOAD_PACKAGES: False
1319
linux_python3.7:
1420
CONFIG: linux_python3.7
21+
UPLOAD_PACKAGES: False
1522
steps:
1623
- script: |
1724
sudo pip install --upgrade pip
1825
sudo pip install setuptools shyaml
1926
displayName: Install dependencies
2027
28+
# configure qemu binfmt-misc running. This allows us to run docker containers
29+
# embedded qemu-static
30+
- script: |
31+
docker run --rm --privileged multiarch/qemu-user-static:register
32+
ls /proc/sys/fs/binfmt_misc/
33+
condition: not(startsWith(variables['CONFIG'], 'linux_64'))
34+
displayName: Configure binfmt_misc
35+
2136
- script: .azure-pipelines/run_docker_build.sh
22-
displayName: Run docker build
37+
displayName: Run docker build
38+
env:
39+
BINSTAR_TOKEN: $(BINSTAR_TOKEN)

.azure-pipelines/azure-pipelines-osx.yml

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
1+
# This file was generated automatically from conda-smithy. To update this configuration,
2+
# update the conda-forge.yml and/or the recipe/meta.yaml.
3+
# -*- mode: yaml -*-
4+
15
jobs:
2-
- job: osx_64
6+
- job: osx
37
pool:
48
vmImage: macOS-10.13
59
timeoutInMinutes: 240
@@ -8,10 +12,13 @@ jobs:
812
matrix:
913
osx_python2.7:
1014
CONFIG: osx_python2.7
15+
UPLOAD_PACKAGES: False
1116
osx_python3.6:
1217
CONFIG: osx_python3.6
18+
UPLOAD_PACKAGES: False
1319
osx_python3.7:
1420
CONFIG: osx_python3.7
21+
UPLOAD_PACKAGES: False
1522

1623
steps:
1724
# TODO: Fast finish on azure pipelines?
@@ -40,7 +47,7 @@ jobs:
4047
- script: |
4148
export PATH=$(Build.StagingDirectory)/miniconda/bin:$PATH
4249
set -x -e
43-
conda install -n base -c conda-forge --quiet --yes conda-forge-ci-setup=2
50+
conda install -n base -c conda-forge --quiet --yes conda-forge-ci-setup=2 conda-build
4451
displayName: 'Add conda-forge-ci-setup=2'
4552
4653
- script: |
@@ -75,4 +82,11 @@ jobs:
7582
conda build ./recipe -m ./.ci_support/${CONFIG}.yaml --clobber-file ./.ci_support/clobber_${CONFIG}.yaml
7683
displayName: Build recipe
7784
78-
85+
- script: |
86+
export PATH=$(Build.StagingDirectory)/miniconda/bin:$PATH
87+
set -x -e
88+
upload_package ./ ./recipe ./.ci_support/${CONFIG}.yaml
89+
displayName: Upload recipe
90+
env:
91+
BINSTAR_TOKEN: $(BINSTAR_TOKEN)
92+
condition: not(eq(variables['UPLOAD_PACKAGES'], 'False'))

.azure-pipelines/azure-pipelines-win.yml

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
1+
# This file was generated automatically from conda-smithy. To update this configuration,
2+
# update the conda-forge.yml and/or the recipe/meta.yaml.
3+
# -*- mode: yaml -*-
4+
15
jobs:
2-
- job: win_64
6+
- job: win
37
pool:
48
vmImage: vs2017-win2016
59
timeoutInMinutes: 240
@@ -9,12 +13,15 @@ jobs:
913
win_python2.7:
1014
CONFIG: win_python2.7
1115
CONDA_BLD_PATH: D:\\bld\\
16+
UPLOAD_PACKAGES: False
1217
win_python3.6:
1318
CONFIG: win_python3.6
1419
CONDA_BLD_PATH: D:\\bld\\
20+
UPLOAD_PACKAGES: False
1521
win_python3.7:
1622
CONFIG: win_python3.7
1723
CONDA_BLD_PATH: D:\\bld\\
24+
UPLOAD_PACKAGES: False
1825
steps:
1926
# TODO: Fast finish on azure pipelines?
2027
- script: |
@@ -30,7 +37,6 @@ jobs:
3037
# - script: rmdir C:\cygwin /s /q
3138
# continueOnError: true
3239

33-
3440
- powershell: |
3541
Set-PSDebug -Trace 1
3642
@@ -71,21 +77,28 @@ jobs:
7177
# Configure the VM.
7278
- script: |
7379
run_conda_forge_build_setup
80+
7481
displayName: conda-forge build setup
75-
run_conda_forge_build_setup
82+
7683
7784
# Special cased version setting some more things!
7885
- script: |
79-
conda.exe build recipe -m .ci_support\%CONFIG%.yaml --quiet
86+
conda.exe build recipe -m .ci_support\%CONFIG%.yaml
8087
displayName: Build recipe (vs2008)
81-
env: {
82-
VS90COMNTOOLS: "C:\\Program Files (x86)\\Common Files\\Microsoft\\Visual C++ for Python\\9.0\\VC\\bin",
83-
}
88+
env:
89+
VS90COMNTOOLS: "C:\\Program Files (x86)\\Common Files\\Microsoft\\Visual C++ for Python\\9.0\\VC\\bin"
90+
PYTHONUNBUFFERED: 1
8491
condition: contains(variables['CONFIG'], 'vs2008')
8592
8693
- script: |
87-
conda.exe build recipe -m .ci_support\%CONFIG%.yaml --quiet
94+
conda.exe build recipe -m .ci_support\%CONFIG%.yaml
8895
displayName: Build recipe
96+
env:
97+
PYTHONUNBUFFERED: 1
8998
condition: not(contains(variables['CONFIG'], 'vs2008'))
9099
91-
100+
- script: |
101+
upload_package .\ .\recipe .ci_support\%CONFIG%.yaml
102+
env:
103+
BINSTAR_TOKEN: $(BINSTAR_TOKEN)
104+
condition: not(eq(variables['UPLOAD_PACKAGES'], 'False'))

.azure-pipelines/build_steps.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@ conda install --yes --quiet conda-forge-ci-setup=2 conda-build -c conda-forge
2424
# set up the condarc
2525
setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}"
2626

27-
# A lock sometimes occurs with incomplete builds. The lock file is stored in build_artifacts.
28-
conda clean --lock
29-
30-
run_conda_forge_build_setup# make the build number clobber
27+
run_conda_forge_build_setup
28+
# make the build number clobber
3129
make_build_number "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}"
3230

3331
conda build "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \
3432
--clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml"
3533

36-
34+
if [[ "${UPLOAD_PACKAGES}" != "False" ]]; then
35+
upload_package "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}"
36+
fi
3737

3838
touch "/home/conda/feedstock_root/build_artifacts/conda-forge-build-done-${CONFIG}"

.azure-pipelines/run_docker_build.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,21 +33,22 @@ if [ -z "$CONFIG" ]; then
3333
fi
3434

3535
pip install shyaml
36-
DOCKER_IMAGE=$(cat "${FEEDSTOCK_ROOT}/.ci_support/${CONFIG}.yaml" | shyaml get-value docker_image.0 condaforge/linux-anvil )
36+
DOCKER_IMAGE=$(cat "${FEEDSTOCK_ROOT}/.ci_support/${CONFIG}.yaml" | shyaml get-value docker_image.0 condaforge/linux-anvil-comp7 )
3737

3838
mkdir -p "$ARTIFACTS"
3939
DONE_CANARY="$ARTIFACTS/conda-forge-build-done-${CONFIG}"
4040
rm -f "$DONE_CANARY"
4141
# Not all providers run with a real tty. Disable using one
4242
DOCKER_RUN_ARGS=" "
4343

44-
44+
export UPLOAD_PACKAGES="${UPLOAD_PACKAGES:-True}"
4545
docker run ${DOCKER_RUN_ARGS} \
4646
-v "${RECIPE_ROOT}":/home/conda/recipe_root:ro,z \
4747
-v "${FEEDSTOCK_ROOT}":/home/conda/feedstock_root:rw,z \
4848
-e CONFIG \
4949
-e BINSTAR_TOKEN \
5050
-e HOST_USER_ID \
51+
-e UPLOAD_PACKAGES \
5152
$DOCKER_IMAGE \
5253
bash \
5354
/home/conda/feedstock_root/${PROVIDER_DIR}/build_steps.sh

.ci_support/linux_python2.7.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,3 @@ pin_run_as_build:
1212
max_pin: x.x
1313
python:
1414
- '2.7'
15-
zip_keys:
16-
- - channel_sources
17-
- channel_targets
18-
- docker_image
19-
- build_number_decrement

.ci_support/linux_python3.6.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,3 @@ pin_run_as_build:
1212
max_pin: x.x
1313
python:
1414
- '3.6'
15-
zip_keys:
16-
- - channel_sources
17-
- channel_targets
18-
- docker_image
19-
- build_number_decrement

.ci_support/linux_python3.7.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,3 @@ pin_run_as_build:
1212
max_pin: x.x
1313
python:
1414
- '3.7'
15-
zip_keys:
16-
- - channel_sources
17-
- channel_targets
18-
- docker_image
19-
- build_number_decrement

.ci_support/osx_python2.7.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,3 @@ pin_run_as_build:
1818
max_pin: x.x
1919
python:
2020
- '2.7'
21-
zip_keys:
22-
- - channel_sources
23-
- channel_targets
24-
- build_number_decrement

0 commit comments

Comments
 (0)