Skip to content

Commit 272e877

Browse files
conda-forge-adminu6820
authored and
u6820
committed
MNT: Updated the feedstock for conda-smithy version 2.1.0.
1 parent 1b4bb84 commit 272e877

File tree

6 files changed

+57
-42
lines changed

6 files changed

+57
-42
lines changed

.travis.yml

+23-4
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
language: generic
55

66
os: osx
7-
osx_image: beta-xcode6.1
7+
osx_image: xcode6.4
88

99
env:
1010
matrix:
@@ -16,19 +16,38 @@ env:
1616

1717

1818
before_install:
19+
# Fast finish the PR.
20+
- |
21+
(curl https://raw.githubusercontent.com/conda-forge/conda-forge-build-setup-feedstock/master/recipe/ff_ci_pr_build.py | \
22+
python - -v --ci "travis" "${TRAVIS_REPO_SLUG}" "${TRAVIS_BUILD_NUMBER}" "${TRAVIS_PULL_REQUEST}") || exit 1
23+
1924
# Remove homebrew.
20-
- brew remove --force $(brew list)
21-
- brew cleanup -s
22-
- rm -rf $(brew --cache)
25+
- |
26+
echo ""
27+
echo "Removing homebrew from Travis CI to avoid conflicts."
28+
curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/uninstall > ~/uninstall_homebrew
29+
chmod +x ~/uninstall_homebrew
30+
~/uninstall_homebrew -fq
31+
rm ~/uninstall_homebrew
32+
2333
2434
install:
35+
# Install Miniconda.
2536
- |
37+
echo ""
38+
echo "Installing a fresh version of Miniconda."
2639
MINICONDA_URL="https://repo.continuum.io/miniconda"
2740
MINICONDA_FILE="Miniconda3-latest-MacOSX-x86_64.sh"
2841
curl -L -O "${MINICONDA_URL}/${MINICONDA_FILE}"
2942
bash $MINICONDA_FILE -b
3043
44+
# Configure conda.
45+
- |
46+
echo ""
47+
echo "Configuring conda."
3148
source /Users/travis/miniconda3/bin/activate root
49+
conda config --remove channels defaults
50+
conda config --add channels defaults
3251
conda config --add channels conda-forge
3352
conda config --set show_channel_urls true
3453
conda install --yes --quiet conda-forge-build-setup

LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
BSD 3-clause license
2-
Copyright (c) conda-forge
2+
Copyright (c) 2015-2017, conda-forge
33
All rights reserved.
44

55
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

appveyor.yml

+15-26
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ environment:
1616
matrix:
1717
- TARGET_ARCH: x86
1818
CONDA_PY: 36
19-
CONDA_INSTALL_LOCN: C:\\Miniconda
19+
CONDA_INSTALL_LOCN: C:\\Miniconda35
2020

2121
- TARGET_ARCH: x64
2222
CONDA_PY: 36
23-
CONDA_INSTALL_LOCN: C:\\Miniconda-x64
23+
CONDA_INSTALL_LOCN: C:\\Miniconda35-x64
2424

2525

2626
# We always use a 64-bit machine, but can build x86 distributions
@@ -30,42 +30,31 @@ platform:
3030

3131
install:
3232
# If there is a newer build queued for the same PR, cancel this one.
33-
# The AppVeyor 'rollout builds' option is supposed to serve the same
34-
# purpose but it is problematic because it tends to cancel builds pushed
35-
# directly to master instead of just PR builds (or the converse).
36-
# credits: JuliaLang developers.
37-
- ps: if ($env:APPVEYOR_PULL_REQUEST_NUMBER -and $env:APPVEYOR_BUILD_NUMBER -ne ((Invoke-RestMethod `
38-
https://ci.appveyor.com/api/projects/$env:APPVEYOR_ACCOUNT_NAME/$env:APPVEYOR_PROJECT_SLUG/history?recordsNumber=50).builds | `
39-
Where-Object pullRequestId -eq $env:APPVEYOR_PULL_REQUEST_NUMBER)[0].buildNumber) { `
40-
throw "There are newer queued builds for this pull request, failing early." }
33+
- cmd: |
34+
curl https://raw.githubusercontent.com/conda-forge/conda-forge-build-setup-feedstock/master/recipe/ff_ci_pr_build.py > ff_ci_pr_build.py
35+
ff_ci_pr_build -v --ci "appveyor" "%APPVEYOR_ACCOUNT_NAME%/%APPVEYOR_PROJECT_SLUG%" "%APPVEYOR_BUILD_NUMBER%" "%APPVEYOR_PULL_REQUEST_NUMBER%"
36+
del ff_ci_pr_build.py
4137
4238
# Cywing's git breaks conda-build. (See https://github.com/conda-forge/conda-smithy-feedstock/pull/2.)
4339
- cmd: rmdir C:\cygwin /s /q
4440

41+
# Add path, activate `conda` and update conda.
42+
- cmd: call %CONDA_INSTALL_LOCN%\Scripts\activate.bat
43+
- cmd: conda update --yes --quiet conda
44+
45+
- cmd: set PYTHONUNBUFFERED=1
46+
4547
# Add our channels.
46-
- cmd: set "OLDPATH=%PATH%"
47-
- cmd: set "PATH=%CONDA_INSTALL_LOCN%\\Scripts;%CONDA_INSTALL_LOCN%\\Library\\bin;%PATH%"
4848
- cmd: conda config --set show_channel_urls true
49+
- cmd: conda config --remove channels defaults
50+
- cmd: conda config --add channels defaults
4951
- cmd: conda config --add channels conda-forge
5052

51-
# Add a hack to switch to `conda` version `4.1.12` before activating.
52-
# This is required to handle a long path activation issue.
53-
# Please see PR ( https://github.com/conda/conda/pull/3349 ).
54-
- cmd: conda install --yes --quiet conda=4.1.12
55-
- cmd: set "PATH=%OLDPATH%"
56-
- cmd: set "OLDPATH="
57-
58-
# Actually activate `conda`.
59-
- cmd: call %CONDA_INSTALL_LOCN%\Scripts\activate.bat
60-
- cmd: set PYTHONUNBUFFERED=1
61-
53+
# Configure the VM.
6254
- cmd: conda install -n root --quiet --yes obvious-ci
6355
- cmd: conda install -n root --quiet --yes conda-forge-build-setup
6456
- cmd: run_conda_forge_build_setup
6557

66-
# Install conda-build 2.x
67-
- cmd: conda install -n root --quiet --yes conda-build=2
68-
6958
# Skip .NET project specific build phase.
7059
build: off
7160

ci_support/fast_finish_ci_pr_build.sh

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/bin/bash
2+
3+
curl https://raw.githubusercontent.com/conda-forge/conda-forge-build-setup-feedstock/master/recipe/ff_ci_pr_build.py | \
4+
python - -v --ci "circle" "${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME}" "${CIRCLE_BUILD_NUM}" "${CIRCLE_PR_NUMBER}"

ci_support/run_docker_build.sh

+13-11
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ config=$(cat <<CONDARC
1414
1515
channels:
1616
- conda-forge
17-
- defaults # As we need conda-build
17+
- defaults
1818
1919
conda-build:
2020
root-dir: /feedstock_root/build_artefacts
@@ -24,12 +24,14 @@ show_channel_urls: true
2424
CONDARC
2525
)
2626

27+
rm -f "$FEEDSTOCK_ROOT/build_artefacts/conda-forge-build-done"
28+
2729
cat << EOF | docker run -i \
28-
-v ${RECIPE_ROOT}:/recipe_root \
29-
-v ${FEEDSTOCK_ROOT}:/feedstock_root \
30+
-v "${RECIPE_ROOT}":/recipe_root \
31+
-v "${FEEDSTOCK_ROOT}":/feedstock_root \
3032
-a stdin -a stdout -a stderr \
3133
condaforge/linux-anvil \
32-
bash || exit $?
34+
bash || exit 1
3335
3436
export BINSTAR_TOKEN=${BINSTAR_TOKEN}
3537
export PYTHONUNBUFFERED=1
@@ -41,17 +43,17 @@ conda clean --lock
4143
conda install --yes --quiet conda-forge-build-setup
4244
source run_conda_forge_build_setup
4345
44-
# install conda-build 2.x to build a long prefix
45-
conda install --yes --quiet conda-build=2
46-
conda info
47-
4846
# Embarking on 1 case(s).
4947
set -x
5048
export CONDA_PY=36
5149
set +x
5250
conda build /recipe_root --quiet || exit 1
5351
upload_or_check_non_existence /recipe_root conda-forge --channel=main || exit 1
54-
55-
# inspect the prefix lengths of the built packages
56-
conda inspect prefix-lengths /feedstock_root/build_artefacts/linux-64/*.tar.bz2
52+
touch /feedstock_root/build_artefacts/conda-forge-build-done
5753
EOF
54+
55+
# double-check that the build got to the end
56+
# see https://github.com/conda-forge/conda-smithy/pull/337
57+
# for a possible fix
58+
set -x
59+
test -f "$FEEDSTOCK_ROOT/build_artefacts/conda-forge-build-done" || exit 1

circle.yml

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
checkout:
22
post:
3+
- ./ci_support/fast_finish_ci_pr_build.sh
34
- ./ci_support/checkout_merge_commit.sh
45

56
machine:

0 commit comments

Comments
 (0)