Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rebuild for r-base-3.6.1 #5

Merged
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
18 changes: 10 additions & 8 deletions .azure-pipelines/azure-pipelines-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ jobs:
strategy:
maxParallel: 8
matrix:
linux_target_platformlinux-64:
CONFIG: linux_target_platformlinux-64
linux_r_base3.5.1target_platformlinux-64:
CONFIG: linux_r_base3.5.1target_platformlinux-64
UPLOAD_PACKAGES: True
DOCKER_IMAGE: condaforge/linux-anvil-comp7
linux_r_base3.6target_platformlinux-64:
CONFIG: linux_r_base3.6target_platformlinux-64
UPLOAD_PACKAGES: True
DOCKER_IMAGE: condaforge/linux-anvil-comp7
steps:
- script: |
sudo pip install --upgrade pip
sudo pip install setuptools shyaml
displayName: Install dependencies

# configure qemu binfmt-misc running. This allows us to run docker containers
# embedded qemu-static
- script: |
Expand All @@ -27,7 +27,9 @@ jobs:
condition: not(startsWith(variables['CONFIG'], 'linux_64'))
displayName: Configure binfmt_misc

- script: .azure-pipelines/run_docker_build.sh
- script: |
export CI=azure
.azure-pipelines/run_docker_build.sh
displayName: Run docker build
env:
BINSTAR_TOKEN: $(BINSTAR_TOKEN)
13 changes: 7 additions & 6 deletions .azure-pipelines/build_steps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@

set -xeuo pipefail
export PYTHONUNBUFFERED=1
export FEEDSTOCK_ROOT=/home/conda/feedstock_root
export RECIPE_ROOT=/home/conda/recipe_root
export CI_SUPPORT=/home/conda/feedstock_root/.ci_support
export FEEDSTOCK_ROOT="${FEEDSTOCK_ROOT:-/home/conda/feedstock_root}"
export RECIPE_ROOT="${RECIPE_ROOT:-/home/conda/recipe_root}"
export CI_SUPPORT="${FEEDSTOCK_ROOT}/.ci_support"
export CONFIG_FILE="${CI_SUPPORT}/${CONFIG}.yaml"

cat >~/.condarc <<CONDARC

conda-build:
root-dir: /home/conda/feedstock_root/build_artifacts
root-dir: ${FEEDSTOCK_ROOT}/build_artifacts

CONDARC

Expand All @@ -24,7 +24,8 @@ conda install --yes --quiet conda-forge-ci-setup=2 conda-build -c conda-forge
# set up the condarc
setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}"

run_conda_forge_build_setup
source run_conda_forge_build_setup

# make the build number clobber
make_build_number "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}"

Expand All @@ -35,4 +36,4 @@ if [[ "${UPLOAD_PACKAGES}" != "False" ]]; then
upload_package "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}"
fi

touch "/home/conda/feedstock_root/build_artifacts/conda-forge-build-done-${CONFIG}"
touch "${FEEDSTOCK_ROOT}/build_artifacts/conda-forge-build-done-${CONFIG}"
9 changes: 6 additions & 3 deletions .azure-pipelines/run_docker_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ if [ -z "$CONFIG" ]; then
fi

if [ -z "${DOCKER_IMAGE}" ]; then
SHYAML_INSTALLED="$(shyaml --version || echo NO)"
SHYAML_INSTALLED="$(shyaml -h || echo NO)"
if [ "${SHYAML_INSTALLED}" == "NO" ]; then
echo "WARNING: DOCKER_IMAGE variable not set and shyaml not installed. Falling back to condaforge/linux-anvil-comp7"
DOCKER_IMAGE="condaforge/linux-anvil-comp7"
Expand All @@ -51,8 +51,10 @@ fi
mkdir -p "$ARTIFACTS"
DONE_CANARY="$ARTIFACTS/conda-forge-build-done-${CONFIG}"
rm -f "$DONE_CANARY"
# Not all providers run with a real tty. Disable using one
DOCKER_RUN_ARGS=" "

if [ -z "${CI}" ]; then
DOCKER_RUN_ARGS="-it "
fi

export UPLOAD_PACKAGES="${UPLOAD_PACKAGES:-True}"
docker run ${DOCKER_RUN_ARGS} \
Expand All @@ -62,6 +64,7 @@ docker run ${DOCKER_RUN_ARGS} \
-e BINSTAR_TOKEN \
-e HOST_USER_ID \
-e UPLOAD_PACKAGES \
-e CI \
$DOCKER_IMAGE \
bash \
/home/conda/feedstock_root/${PROVIDER_DIR}/build_steps.sh
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
build_number_decrement:
- '0'
channel_sources:
- conda-forge,defaults
channel_targets:
Expand All @@ -10,7 +8,8 @@ docker_image:
- condaforge/linux-anvil-comp7
pin_run_as_build:
r-base:
max_pin: x.x.x
min_pin: x.x
max_pin: x.x
r_base:
- 3.5.1
target_platform:
Expand Down
16 changes: 16 additions & 0 deletions .ci_support/linux_r_base3.6target_platformlinux-64.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
channel_sources:
- conda-forge,defaults
channel_targets:
- conda-forge main
cran_mirror:
- https://cran.r-project.org
docker_image:
- condaforge/linux-anvil-comp7
pin_run_as_build:
r-base:
min_pin: x.x
max_pin: x.x
r_base:
- '3.6'
target_platform:
- linux-64
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* @conda-forge/r
15 changes: 0 additions & 15 deletions .github/CONTRIBUTING.md

This file was deleted.

25 changes: 0 additions & 25 deletions .github/ISSUE_TEMPLATE.md

This file was deleted.

18 changes: 0 additions & 18 deletions .github/PULL_REQUEST_TEMPLATE.md

This file was deleted.

4 changes: 1 addition & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@ Current build status
====================


<table><tr>

<td>All platforms:</td>
<table><tr><td>All platforms:</td>
<td>
<a href="https://dev.azure.com/conda-forge/feedstock-builds/_build/latest?definitionId=3375&branchName=master">
<img src="https://dev.azure.com/conda-forge/feedstock-builds/_apis/build/status/r-genetics-feedstock?branchName=master">
Expand Down
58 changes: 58 additions & 0 deletions build-locally.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
#!/usr/bin/env python3
#
# This file has been generated by conda-smithy in order to build the recipe
# locally.
#
import os
import glob
import subprocess
from argparse import ArgumentParser


def setup_environment(ns):
os.environ["CONFIG"] = ns.config
os.environ["UPLOAD_PACKAGES"] = "False"


def run_docker_build(ns):
script = glob.glob(".*/run_docker_build.sh")[0]
subprocess.check_call(script)

def verify_config(ns):
valid_configs = {os.path.basename(f)[:-5] for f in glob.glob(".ci_support/*.yaml")}
print(f"valid configs are {valid_configs}")
if ns.config in valid_configs:
print("Using " + ns.config + " configuration")
return
elif len(valid_configs) == 1:
ns.config = valid_configs.pop()
print("Found " + ns.config + " configuration")
elif ns.config is None:
print("config not selected, please choose from the following:\n")
selections = list(enumerate(sorted(valid_configs), 1))
for i, c in selections:
print(f"{i}. {c}")
s = input("\n> ")
idx = int(s) - 1
ns.config = selections[idx][1]
print(f"selected {ns.config}")
else:
raise ValueError("config " + ns.config + " is not valid")
# Remove the following, as implemented
if not ns.config.startswith('linux'):
raise ValueError(f"only Linux configs currently supported, got {ns.config}")


def main(args=None):
p = ArgumentParser("build-locally")
p.add_argument("config", default=None, nargs="?")

ns = p.parse_args(args=args)
verify_config(ns)
setup_environment(ns)

run_docker_build(ns)


if __name__ == "__main__":
main()
1 change: 1 addition & 0 deletions conda-forge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@ appveyor:
compiler_stack: comp7
max_py_ver: '37'
max_r_ver: '35'
provider: {win: azure}
travis:
secure: {BINSTAR_TOKEN: d8cV1IqHiHeVR53a/eAMdXlZznQGEMgmZ/YfyO8NXTuTklk8T9smq3Q9GqVhx6C2k5XJYZJCpTqev6SdTVjYyr9aPLUO1zi0lt62ZUSMGmJkHC/RVI/z5T/NVBQGXf3Jtnz+GOuEjE3X2H664yYGVeBGRQ6N7blv8qpbMF/gC0QcPvkxyL37VZHl5JRIjTzjFCuGQ7jznvGNJfoMvqvr6LJXvAoAcyBenAhu9s9Wf6QybTCuAi7HI7rVgJUtDm3CyJnk4mr2w2AQjDkFQlJTNIR6s74CwbPLQLGyigGBGCXNCe3yYeJTG81YgKu7pyD44m6XDdtmImNTRksCaUL8YeRC6yQ0aQt7ttl/ju+LitKK+9tOQx1cbuGMhfrw6XP6Dc2fn7RICYwJMzkF10wuVThGX1t3YocEAinxPdmbUNd96dYkz7syTnjoPFAGqBHdZdqXQIve6KSoVSOoOG9ZLgepzAV1Zsf5pAHE3QIpfsADa/mXzK56Mvd9zZ7o/13Y25YitaXWhB33Ayfat5s0cSPru0MVt1WW1zfmhm4xigf35hWycrhdlw1AmYEEY/Cd52auI9FnxXUXrLp8Ig8035SO0oUYamKyIlAkvnSJqqZGLnCuOd19XWQ/oU499FnIqxzicdh3puR0aE6RkEB0yZW18Uv2NN8CWUrYeg5V7KM=}
2 changes: 1 addition & 1 deletion recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ source:

build:
merge_build_host: True # [win]
number: 0
number: 1
noarch: generic
rpaths:
- lib/R/lib/
Expand Down