Skip to content

Commit 7d4c36d

Browse files
tswasttswast
authored
Merge pull request #17 from regro-cf-autotick-bot/0.9.0
pandas-gbq v0.9.0
2 parents 42e6b54 + e757c66 commit 7d4c36d

File tree

8 files changed

+142
-8
lines changed

8 files changed

+142
-8
lines changed

‎.azure-pipelines/azure-pipelines-linux.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
jobs:
2+
- job: linux_64
3+
pool:
4+
vmImage: ubuntu-16.04
5+
timeoutInMinutes: 240
6+
strategy:
7+
maxParallel: 8
8+
matrix:
9+
linux_:
10+
CONFIG: linux_
11+
steps:
12+
- script: |
13+
sudo pip install --upgrade pip
14+
sudo pip install setuptools shyaml
15+
displayName: Install dependencies
16+
17+
- script: .azure-pipelines/run_docker_build.sh
18+
displayName: Run docker build

‎.azure-pipelines/build_steps.sh

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
#!/usr/bin/env bash
2+
3+
# PLEASE NOTE: This script has been automatically generated by conda-smithy. Any changes here
4+
# will be lost next time ``conda smithy rerender`` is run. If you would like to make permanent
5+
# changes to this script, consider a proposal to conda-smithy so that other feedstocks can also
6+
# benefit from the improvement.
7+
8+
set -xeuo pipefail
9+
export PYTHONUNBUFFERED=1
10+
export FEEDSTOCK_ROOT=/home/conda/feedstock_root
11+
export RECIPE_ROOT=/home/conda/recipe_root
12+
export CI_SUPPORT=/home/conda/feedstock_root/.ci_support
13+
export CONFIG_FILE="${CI_SUPPORT}/${CONFIG}.yaml"
14+
15+
cat >~/.condarc <<CONDARC
16+
17+
conda-build:
18+
root-dir: /home/conda/feedstock_root/build_artifacts
19+
20+
CONDARC
21+
22+
conda install --yes --quiet conda-forge-ci-setup=2 conda-build -c conda-forge
23+
24+
# set up the condarc
25+
setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}"
26+
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
31+
make_build_number "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}"
32+
33+
conda build "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \
34+
--clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml"
35+
36+
37+
38+
touch "/home/conda/feedstock_root/build_artifacts/conda-forge-build-done-${CONFIG}"

‎.azure-pipelines/run_docker_build.sh

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
#!/usr/bin/env bash
2+
3+
# PLEASE NOTE: This script has been automatically generated by conda-smithy. Any changes here
4+
# will be lost next time ``conda smithy rerender`` is run. If you would like to make permanent
5+
# changes to this script, consider a proposal to conda-smithy so that other feedstocks can also
6+
# benefit from the improvement.
7+
8+
set -xeuo pipefail
9+
10+
THISDIR="$( cd "$( dirname "$0" )" >/dev/null && pwd )"
11+
PROVIDER_DIR="$(basename $THISDIR)"
12+
13+
FEEDSTOCK_ROOT=$(cd "$(dirname "$0")/.."; pwd;)
14+
RECIPE_ROOT="${FEEDSTOCK_ROOT}/recipe"
15+
16+
docker info
17+
18+
# In order for the conda-build process in the container to write to the mounted
19+
# volumes, we need to run with the same id as the host machine, which is
20+
# normally the owner of the mounted volumes, or at least has write permission
21+
export HOST_USER_ID=$(id -u)
22+
# Check if docker-machine is being used (normally on OSX) and get the uid from
23+
# the VM
24+
if hash docker-machine 2> /dev/null && docker-machine active > /dev/null; then
25+
export HOST_USER_ID=$(docker-machine ssh $(docker-machine active) id -u)
26+
fi
27+
28+
ARTIFACTS="$FEEDSTOCK_ROOT/build_artifacts"
29+
30+
if [ -z "$CONFIG" ]; then
31+
echo "Need to set CONFIG env variable"
32+
exit 1
33+
fi
34+
35+
pip install shyaml
36+
DOCKER_IMAGE=$(cat "${FEEDSTOCK_ROOT}/.ci_support/${CONFIG}.yaml" | shyaml get-value docker_image.0 condaforge/linux-anvil )
37+
38+
mkdir -p "$ARTIFACTS"
39+
DONE_CANARY="$ARTIFACTS/conda-forge-build-done-${CONFIG}"
40+
rm -f "$DONE_CANARY"
41+
# Not all providers run with a real tty. Disable using one
42+
DOCKER_RUN_ARGS=" "
43+
44+
45+
docker run ${DOCKER_RUN_ARGS} \
46+
-v "${RECIPE_ROOT}":/home/conda/recipe_root:ro,z \
47+
-v "${FEEDSTOCK_ROOT}":/home/conda/feedstock_root:rw,z \
48+
-e CONFIG \
49+
-e BINSTAR_TOKEN \
50+
-e HOST_USER_ID \
51+
$DOCKER_IMAGE \
52+
bash \
53+
/home/conda/feedstock_root/${PROVIDER_DIR}/build_steps.sh
54+
55+
# verify that the end of the script was reached
56+
test -f "$DONE_CANARY"

‎.circleci/build_steps.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ conda-build:
1919
2020
CONDARC
2121

22-
conda install --yes --quiet conda-forge::conda-forge-ci-setup=2 conda-build
22+
conda install --yes --quiet conda-forge-ci-setup=2 conda-build -c conda-forge
2323

2424
# set up the condarc
2525
setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}"
@@ -33,8 +33,10 @@ source run_conda_forge_build_setup
3333
make_build_number "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}"
3434

3535
conda build "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \
36-
--clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" --quiet
36+
--clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml"
37+
3738

3839
upload_package "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}"
3940

41+
4042
touch "/home/conda/feedstock_root/build_artifacts/conda-forge-build-done-${CONFIG}"

‎.circleci/run_docker_build.sh

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77

88
set -xeuo pipefail
99

10+
THISDIR="$( cd "$( dirname "$0" )" >/dev/null && pwd )"
11+
PROVIDER_DIR="$(basename $THISDIR)"
12+
1013
FEEDSTOCK_ROOT=$(cd "$(dirname "$0")/.."; pwd;)
1114
RECIPE_ROOT="${FEEDSTOCK_ROOT}/recipe"
1215

@@ -35,16 +38,19 @@ DOCKER_IMAGE=$(cat "${FEEDSTOCK_ROOT}/.ci_support/${CONFIG}.yaml" | shyaml get-v
3538
mkdir -p "$ARTIFACTS"
3639
DONE_CANARY="$ARTIFACTS/conda-forge-build-done-${CONFIG}"
3740
rm -f "$DONE_CANARY"
41+
# Enable running in interactive mode attached to a tty
42+
DOCKER_RUN_ARGS=" -it "
43+
3844

39-
docker run -it \
40-
-v "${RECIPE_ROOT}":/home/conda/recipe_root \
41-
-v "${FEEDSTOCK_ROOT}":/home/conda/feedstock_root \
45+
docker run ${DOCKER_RUN_ARGS} \
46+
-v "${RECIPE_ROOT}":/home/conda/recipe_root:ro,z \
47+
-v "${FEEDSTOCK_ROOT}":/home/conda/feedstock_root:rw,z \
4248
-e CONFIG \
4349
-e BINSTAR_TOKEN \
4450
-e HOST_USER_ID \
4551
$DOCKER_IMAGE \
4652
bash \
47-
/home/conda/feedstock_root/.circleci/build_steps.sh
53+
/home/conda/feedstock_root/${PROVIDER_DIR}/build_steps.sh
4854

4955
# verify that the end of the script was reached
5056
test -f "$DONE_CANARY"

‎README.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
About pandas-gbq
22
================
33

4+
[![Powered by NumFOCUS](https://img.shields.io/badge/powered%20by-NumFOCUS-orange.svg?style=flat&colorA=E1523D&colorB=007D8A)](http://numfocus.org)
5+
46
Home: https://github.com/pydata/pandas-gbq
57

68
Package license: BSD 3-clause
@@ -103,3 +105,11 @@ In order to produce a uniquely identifiable distribution:
103105
* If the version of a package **is** being increased, please remember to return
104106
the [``build/number``](https://conda.io/docs/user-guide/tasks/build-packages/define-metadata.html#build-number-and-string)
105107
back to 0.
108+
109+
Feedstock Maintainers
110+
=====================
111+
112+
* [@jreback](https://github.com/jreback/)
113+
* [@parthea](https://github.com/parthea/)
114+
* [@tswast](https://github.com/tswast/)
115+

‎azure-pipelines.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
jobs:
2+
- template: ./.azure-pipelines/azure-pipelines-linux.yml
3+
4+

‎recipe/meta.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
{% set version = "0.8.0" %}
1+
{% set version = "0.9.0" %}
22
{% set name = "pandas-gbq" %}
3-
{% set sha256 = "bb8f8d4ad07eddde113e9602edf97f68a5e06d6d299f7d397367341271a12ada" %}
3+
{% set sha256 = "27b0a9d8df8c49e52f9321a5d699909c31c3beaaa9be21aee631970159621b02" %}
44

55
package:
66
name: {{ name|lower }}

0 commit comments

Comments
 (0)