Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 74 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
version: 2

jobs:
build__CONDA_PY_27:
working_directory: ~/test
machine: true
environment:
- CONDA_PY: "27"
steps:
- checkout
- run:
name: Fast finish outdated PRs and merge PRs
command: |
./ci_support/fast_finish_ci_pr_build.sh
./ci_support/checkout_merge_commit.sh
- run:
command: docker pull condaforge/linux-anvil
- run:
name: Print conda-build environment variables
command: |
echo "CONDA_PY=${CONDA_PY}"
- run:
# Run, test and (if we have a BINSTAR_TOKEN) upload the distributions.
command: ./ci_support/run_docker_build.sh
build__CONDA_PY_35:
working_directory: ~/test
machine: true
environment:
- CONDA_PY: "35"
steps:
- checkout
- run:
name: Fast finish outdated PRs and merge PRs
command: |
./ci_support/fast_finish_ci_pr_build.sh
./ci_support/checkout_merge_commit.sh
- run:
command: docker pull condaforge/linux-anvil
- run:
name: Print conda-build environment variables
command: |
echo "CONDA_PY=${CONDA_PY}"
- run:
# Run, test and (if we have a BINSTAR_TOKEN) upload the distributions.
command: ./ci_support/run_docker_build.sh
build__CONDA_PY_36:
working_directory: ~/test
machine: true
environment:
- CONDA_PY: "36"
steps:
- checkout
- run:
name: Fast finish outdated PRs and merge PRs
command: |
./ci_support/fast_finish_ci_pr_build.sh
./ci_support/checkout_merge_commit.sh
- run:
command: docker pull condaforge/linux-anvil
- run:
name: Print conda-build environment variables
command: |
echo "CONDA_PY=${CONDA_PY}"
- run:
# Run, test and (if we have a BINSTAR_TOKEN) upload the distributions.
command: ./ci_support/run_docker_build.sh

workflows:
version: 2
build_and_test:
jobs:
- build__CONDA_PY_27
- build__CONDA_PY_35
- build__CONDA_PY_36
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
* text=auto

*.patch binary
*.diff binary
meta.yaml text eol=lf
build.sh text eol=lf
bld.bat text eol=crlf
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ To manage the continuous integration and simplify feedstock maintenance
Using the ``conda-forge.yml`` within this repository, it is possible to re-render all of
this feedstock's supporting files (e.g. the CI configuration files) with ``conda smithy rerender``.

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

Terminology
===========
Expand Down Expand Up @@ -100,4 +101,4 @@ In order to produce a uniquely identifiable distribution:
the [``build/number``](http://conda.pydata.org/docs/building/meta-yaml.html#build-number-and-string).
* If the version of a package **is** being increased, please remember to return
the [``build/number``](http://conda.pydata.org/docs/building/meta-yaml.html#build-number-and-string)
back to 0.
back to 0.
22 changes: 4 additions & 18 deletions ci_support/run_docker_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ cat << EOF | docker run -i \
-v "${RECIPE_ROOT}":/recipe_root \
-v "${FEEDSTOCK_ROOT}":/feedstock_root \
-e HOST_USER_ID="${HOST_USER_ID}" \
-e CONDA_PY="${CONDA_PY}" \
-a stdin -a stdout -a stderr \
condaforge/linux-anvil \
bash || exit 1
Expand All @@ -57,24 +58,9 @@ conda clean --lock
conda install --yes --quiet conda-forge-build-setup
source run_conda_forge_build_setup

# Embarking on 3 case(s).
set -x
export CONDA_PY=27
set +x
conda build /recipe_root --quiet || exit 1
upload_or_check_non_existence /recipe_root conda-forge --channel=main || exit 1

set -x
export CONDA_PY=35
set +x
conda build /recipe_root --quiet || exit 1
upload_or_check_non_existence /recipe_root conda-forge --channel=main || exit 1

set -x
export CONDA_PY=36
set +x
conda build /recipe_root --quiet || exit 1
upload_or_check_non_existence /recipe_root conda-forge --channel=main || exit 1
conda build /recipe_root --quiet || exit 1
upload_or_check_non_existence /recipe_root conda-forge --channel=main || exit 1

touch /feedstock_root/build_artefacts/conda-forge-build-done
EOF

Expand Down
19 changes: 0 additions & 19 deletions circle.yml

This file was deleted.

6 changes: 3 additions & 3 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,21 @@ source:
- basemap-1.0.8dev-datadir.patch

build:
number: 2
number: 3

requirements:
build:
- python
- numpy 1.7.* # [py27]
- numpy 1.9.* # [py35]
- numpy 1.11.* # [py36]
- geos 3.5.1
- geos 3.6.2
run:
- python
- numpy >=1.7 # [py27]
- numpy >=1.9 # [py35]
- numpy >=1.11 # [py36]
- geos 3.5.1
- geos 3.6.2
- matplotlib
- pyproj
- pyshp
Expand Down