diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index f16402f..4129394 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,10 +8,6 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_numpy1.18python3.6.____cpython: - CONFIG: linux_64_numpy1.18python3.6.____cpython - UPLOAD_PACKAGES: 'True' - DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 linux_64_numpy1.18python3.7.____cpython: CONFIG: linux_64_numpy1.18python3.7.____cpython UPLOAD_PACKAGES: 'True' @@ -28,6 +24,22 @@ jobs: CONFIG: linux_64_numpy1.19python3.9.____cpython UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-comp7 + linux_ppc64le_numpy1.18python3.7.____cpython: + CONFIG: linux_ppc64le_numpy1.18python3.7.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le + linux_ppc64le_numpy1.18python3.8.____cpython: + CONFIG: linux_ppc64le_numpy1.18python3.8.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le + linux_ppc64le_numpy1.19python3.7.____73_pypy: + CONFIG: linux_ppc64le_numpy1.19python3.7.____73_pypy + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le + linux_ppc64le_numpy1.19python3.9.____cpython: + CONFIG: linux_ppc64le_numpy1.19python3.9.____cpython + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-ppc64le timeoutInMinutes: 360 steps: @@ -48,6 +60,11 @@ jobs: export CI=azure export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) + if [[ "${BUILD_REASON:-}" == "PullRequest" ]]; then + export IS_PR_BUILD="True" + else + export IS_PR_BUILD="False" + fi .scripts/run_docker_build.sh displayName: Run docker build env: diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 48b1fad..c38338b 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,9 +8,6 @@ jobs: vmImage: macOS-10.15 strategy: matrix: - osx_64_numpy1.18python3.6.____cpython: - CONFIG: osx_64_numpy1.18python3.6.____cpython - UPLOAD_PACKAGES: 'True' osx_64_numpy1.18python3.7.____cpython: CONFIG: osx_64_numpy1.18python3.7.____cpython UPLOAD_PACKAGES: 'True' @@ -38,6 +35,11 @@ jobs: export OSX_FORCE_SDK_DOWNLOAD="1" export GIT_BRANCH=$BUILD_SOURCEBRANCHNAME export FEEDSTOCK_NAME=$(basename ${BUILD_REPOSITORY_NAME}) + if [[ "${BUILD_REASON:-}" == "PullRequest" ]]; then + export IS_PR_BUILD="True" + else + export IS_PR_BUILD="False" + fi ./.scripts/run_osx_build.sh displayName: Run OSX build env: diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index 2657f8f..64e4a25 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,9 +8,6 @@ jobs: vmImage: vs2017-win2016 strategy: matrix: - win_64_numpy1.18python3.6.____cpython: - CONFIG: win_64_numpy1.18python3.6.____cpython - UPLOAD_PACKAGES: 'True' win_64_numpy1.18python3.7.____cpython: CONFIG: win_64_numpy1.18python3.7.____cpython UPLOAD_PACKAGES: 'True' @@ -64,7 +61,7 @@ jobs: - task: CondaEnvironment@1 inputs: - packageSpecs: 'python=3.6 conda-build conda "conda-forge-ci-setup=3" pip' # Optional + packageSpecs: 'python=3.9 conda-build conda "conda-forge-ci-setup=3" pip boa' # Optional installOptions: "-c conda-forge" updateConda: true displayName: Install conda-build and activate environment @@ -98,7 +95,7 @@ jobs: - script: | call activate base - conda.exe build "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables + conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables displayName: Build recipe env: PYTHONUNBUFFERED: 1 @@ -119,4 +116,4 @@ jobs: BINSTAR_TOKEN: $(BINSTAR_TOKEN) FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) - condition: and(succeeded(), not(eq(variables['UPLOAD_PACKAGES'], 'False'))) \ No newline at end of file + condition: and(succeeded(), not(eq(variables['UPLOAD_PACKAGES'], 'False')), not(eq(variables['Build.Reason'], 'PullRequest'))) \ No newline at end of file diff --git a/.ci_support/linux_64_numpy1.18python3.6.____cpython.yaml b/.ci_support/linux_64_numpy1.18python3.6.____cpython.yaml deleted file mode 100644 index 77a66b6..0000000 --- a/.ci_support/linux_64_numpy1.18python3.6.____cpython.yaml +++ /dev/null @@ -1,31 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '9' -cdt_name: -- cos6 -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -docker_image: -- quay.io/condaforge/linux-anvil-comp7 -libblas: -- 3.8 *netlib -liblapack: -- 3.8 *netlib -numpy: -- '1.18' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.6.* *_cpython -target_platform: -- linux-64 -zip_keys: -- - cdt_name - - docker_image -- - python - - numpy diff --git a/.ci_support/linux_64_numpy1.18python3.7.____cpython.yaml b/.ci_support/linux_64_numpy1.18python3.7.____cpython.yaml index 5944011..41e9d5b 100644 --- a/.ci_support/linux_64_numpy1.18python3.7.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.18python3.7.____cpython.yaml @@ -5,7 +5,7 @@ c_compiler_version: cdt_name: - cos6 channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main docker_image: diff --git a/.ci_support/linux_64_numpy1.18python3.8.____cpython.yaml b/.ci_support/linux_64_numpy1.18python3.8.____cpython.yaml index ea908e0..fa07789 100644 --- a/.ci_support/linux_64_numpy1.18python3.8.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.18python3.8.____cpython.yaml @@ -5,7 +5,7 @@ c_compiler_version: cdt_name: - cos6 channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main docker_image: diff --git a/.ci_support/linux_64_numpy1.19python3.7.____73_pypy.yaml b/.ci_support/linux_64_numpy1.19python3.7.____73_pypy.yaml index c62e0ff..0854e75 100644 --- a/.ci_support/linux_64_numpy1.19python3.7.____73_pypy.yaml +++ b/.ci_support/linux_64_numpy1.19python3.7.____73_pypy.yaml @@ -5,7 +5,7 @@ c_compiler_version: cdt_name: - cos6 channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main docker_image: diff --git a/.ci_support/linux_64_numpy1.19python3.9.____cpython.yaml b/.ci_support/linux_64_numpy1.19python3.9.____cpython.yaml index e5e9f09..507d9bc 100644 --- a/.ci_support/linux_64_numpy1.19python3.9.____cpython.yaml +++ b/.ci_support/linux_64_numpy1.19python3.9.____cpython.yaml @@ -5,7 +5,7 @@ c_compiler_version: cdt_name: - cos6 channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main docker_image: diff --git a/.ci_support/linux_aarch64_numpy1.18python3.6.____cpython.yaml b/.ci_support/linux_aarch64_numpy1.18python3.6.____cpython.yaml deleted file mode 100644 index c36e827..0000000 --- a/.ci_support/linux_aarch64_numpy1.18python3.6.____cpython.yaml +++ /dev/null @@ -1,33 +0,0 @@ -BUILD: -- aarch64-conda_cos7-linux-gnu -c_compiler: -- gcc -c_compiler_version: -- '9' -cdt_arch: -- aarch64 -cdt_name: -- cos7 -channel_sources: -- conda-forge -channel_targets: -- conda-forge main -docker_image: -- quay.io/condaforge/linux-anvil-aarch64 -libblas: -- 3.8 *netlib -liblapack: -- 3.8 *netlib -numpy: -- '1.18' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.6.* *_cpython -target_platform: -- linux-aarch64 -zip_keys: -- - python - - numpy diff --git a/.ci_support/linux_ppc64le_numpy1.18python3.6.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.18python3.6.____cpython.yaml deleted file mode 100644 index 470a639..0000000 --- a/.ci_support/linux_ppc64le_numpy1.18python3.6.____cpython.yaml +++ /dev/null @@ -1,29 +0,0 @@ -c_compiler: -- gcc -c_compiler_version: -- '9' -cdt_name: -- cos7 -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -docker_image: -- quay.io/condaforge/linux-anvil-ppc64le -libblas: -- 3.8 *netlib -liblapack: -- 3.8 *netlib -numpy: -- '1.18' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.6.* *_cpython -target_platform: -- linux-ppc64le -zip_keys: -- - python - - numpy diff --git a/.ci_support/linux_ppc64le_numpy1.18python3.7.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.18python3.7.____cpython.yaml index 18c5a82..3cbd299 100644 --- a/.ci_support/linux_ppc64le_numpy1.18python3.7.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.18python3.7.____cpython.yaml @@ -5,7 +5,7 @@ c_compiler_version: cdt_name: - cos7 channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main docker_image: diff --git a/.ci_support/linux_ppc64le_numpy1.18python3.8.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.18python3.8.____cpython.yaml index 01539bd..d3cec8a 100644 --- a/.ci_support/linux_ppc64le_numpy1.18python3.8.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.18python3.8.____cpython.yaml @@ -5,7 +5,7 @@ c_compiler_version: cdt_name: - cos7 channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main docker_image: diff --git a/.ci_support/linux_ppc64le_numpy1.19python3.7.____73_pypy.yaml b/.ci_support/linux_ppc64le_numpy1.19python3.7.____73_pypy.yaml index a32fa06..4d781ba 100644 --- a/.ci_support/linux_ppc64le_numpy1.19python3.7.____73_pypy.yaml +++ b/.ci_support/linux_ppc64le_numpy1.19python3.7.____73_pypy.yaml @@ -5,7 +5,7 @@ c_compiler_version: cdt_name: - cos7 channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main docker_image: diff --git a/.ci_support/linux_ppc64le_numpy1.19python3.9.____cpython.yaml b/.ci_support/linux_ppc64le_numpy1.19python3.9.____cpython.yaml index 0242041..63ae726 100644 --- a/.ci_support/linux_ppc64le_numpy1.19python3.9.____cpython.yaml +++ b/.ci_support/linux_ppc64le_numpy1.19python3.9.____cpython.yaml @@ -5,7 +5,7 @@ c_compiler_version: cdt_name: - cos7 channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main docker_image: diff --git a/.ci_support/osx_64_numpy1.18python3.6.____cpython.yaml b/.ci_support/osx_64_numpy1.18python3.6.____cpython.yaml deleted file mode 100644 index b25b38b..0000000 --- a/.ci_support/osx_64_numpy1.18python3.6.____cpython.yaml +++ /dev/null @@ -1,29 +0,0 @@ -MACOSX_DEPLOYMENT_TARGET: -- '10.9' -c_compiler: -- clang -c_compiler_version: -- '11' -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -libblas: -- 3.8 *netlib -liblapack: -- 3.8 *netlib -macos_machine: -- x86_64-apple-darwin13.4.0 -numpy: -- '1.18' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.6.* *_cpython -target_platform: -- osx-64 -zip_keys: -- - python - - numpy diff --git a/.ci_support/osx_64_numpy1.18python3.7.____cpython.yaml b/.ci_support/osx_64_numpy1.18python3.7.____cpython.yaml index 82cab67..8960680 100644 --- a/.ci_support/osx_64_numpy1.18python3.7.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.18python3.7.____cpython.yaml @@ -5,7 +5,7 @@ c_compiler: c_compiler_version: - '11' channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main libblas: diff --git a/.ci_support/osx_64_numpy1.18python3.8.____cpython.yaml b/.ci_support/osx_64_numpy1.18python3.8.____cpython.yaml index 57d6423..a8a382e 100644 --- a/.ci_support/osx_64_numpy1.18python3.8.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.18python3.8.____cpython.yaml @@ -5,7 +5,7 @@ c_compiler: c_compiler_version: - '11' channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main libblas: diff --git a/.ci_support/osx_64_numpy1.19python3.7.____73_pypy.yaml b/.ci_support/osx_64_numpy1.19python3.7.____73_pypy.yaml index 9ab10e5..f1fb11e 100644 --- a/.ci_support/osx_64_numpy1.19python3.7.____73_pypy.yaml +++ b/.ci_support/osx_64_numpy1.19python3.7.____73_pypy.yaml @@ -5,7 +5,7 @@ c_compiler: c_compiler_version: - '11' channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main libblas: diff --git a/.ci_support/osx_64_numpy1.19python3.9.____cpython.yaml b/.ci_support/osx_64_numpy1.19python3.9.____cpython.yaml index 2619bca..04b409c 100644 --- a/.ci_support/osx_64_numpy1.19python3.9.____cpython.yaml +++ b/.ci_support/osx_64_numpy1.19python3.9.____cpython.yaml @@ -5,7 +5,7 @@ c_compiler: c_compiler_version: - '11' channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main libblas: diff --git a/.ci_support/osx_arm64_python3.8.____cpython.yaml b/.ci_support/osx_arm64_python3.8.____cpython.yaml index 3486e3e..aae5cfd 100644 --- a/.ci_support/osx_arm64_python3.8.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.8.____cpython.yaml @@ -5,7 +5,7 @@ c_compiler: c_compiler_version: - '11' channel_sources: -- conda-forge/label/rust_dev,conda-forge +- conda-forge channel_targets: - conda-forge main libblas: diff --git a/.ci_support/osx_arm64_python3.9.____cpython.yaml b/.ci_support/osx_arm64_python3.9.____cpython.yaml index fe01674..cb73728 100644 --- a/.ci_support/osx_arm64_python3.9.____cpython.yaml +++ b/.ci_support/osx_arm64_python3.9.____cpython.yaml @@ -5,7 +5,7 @@ c_compiler: c_compiler_version: - '11' channel_sources: -- conda-forge/label/rust_dev,conda-forge +- conda-forge channel_targets: - conda-forge main libblas: diff --git a/.ci_support/win_64_numpy1.18python3.6.____cpython.yaml b/.ci_support/win_64_numpy1.18python3.6.____cpython.yaml deleted file mode 100644 index 049a2e7..0000000 --- a/.ci_support/win_64_numpy1.18python3.6.____cpython.yaml +++ /dev/null @@ -1,23 +0,0 @@ -c_compiler: -- vs2017 -channel_sources: -- conda-forge,defaults -channel_targets: -- conda-forge main -libblas: -- 3.8 *netlib -liblapack: -- 3.8 *netlib -numpy: -- '1.18' -pin_run_as_build: - python: - min_pin: x.x - max_pin: x.x -python: -- 3.6.* *_cpython -target_platform: -- win-64 -zip_keys: -- - python - - numpy diff --git a/.ci_support/win_64_numpy1.18python3.7.____cpython.yaml b/.ci_support/win_64_numpy1.18python3.7.____cpython.yaml index 93aa90d..dbe196c 100644 --- a/.ci_support/win_64_numpy1.18python3.7.____cpython.yaml +++ b/.ci_support/win_64_numpy1.18python3.7.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - vs2017 channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main libblas: diff --git a/.ci_support/win_64_numpy1.18python3.8.____cpython.yaml b/.ci_support/win_64_numpy1.18python3.8.____cpython.yaml index 1f27584..453df43 100644 --- a/.ci_support/win_64_numpy1.18python3.8.____cpython.yaml +++ b/.ci_support/win_64_numpy1.18python3.8.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - vs2017 channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main libblas: diff --git a/.ci_support/win_64_numpy1.19python3.7.____73_pypy.yaml b/.ci_support/win_64_numpy1.19python3.7.____73_pypy.yaml index f2177aa..515720e 100644 --- a/.ci_support/win_64_numpy1.19python3.7.____73_pypy.yaml +++ b/.ci_support/win_64_numpy1.19python3.7.____73_pypy.yaml @@ -1,7 +1,7 @@ c_compiler: - vs2017 channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main libblas: diff --git a/.ci_support/win_64_numpy1.19python3.9.____cpython.yaml b/.ci_support/win_64_numpy1.19python3.9.____cpython.yaml index 2225c0c..e9761c4 100644 --- a/.ci_support/win_64_numpy1.19python3.9.____cpython.yaml +++ b/.ci_support/win_64_numpy1.19python3.9.____cpython.yaml @@ -1,7 +1,7 @@ c_compiler: - vs2017 channel_sources: -- conda-forge,defaults +- conda-forge channel_targets: - conda-forge main libblas: diff --git a/.drone.yml b/.drone.yml index 935f4fd..a9d19b6 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,34 +1,3 @@ ---- -kind: pipeline -name: linux_aarch64_numpy1.18python3.6.____cpython - -platform: - os: linux - arch: arm64 - -steps: -- name: Install and build - image: quay.io/condaforge/linux-anvil-aarch64 - environment: - CONFIG: linux_aarch64_numpy1.18python3.6.____cpython - UPLOAD_PACKAGES: True - PLATFORM: linux-aarch64 - BINSTAR_TOKEN: - from_secret: BINSTAR_TOKEN - FEEDSTOCK_TOKEN: - from_secret: FEEDSTOCK_TOKEN - STAGING_BINSTAR_TOKEN: - from_secret: STAGING_BINSTAR_TOKEN - commands: - - export FEEDSTOCK_ROOT="$DRONE_WORKSPACE" - - export RECIPE_ROOT="$FEEDSTOCK_ROOT/recipe" - - export CI=drone - - export GIT_BRANCH="$DRONE_BRANCH" - - export FEEDSTOCK_NAME=$(basename ${DRONE_REPO_NAME}) - - sed -i '$ichown -R conda:conda "$FEEDSTOCK_ROOT"' /opt/docker/bin/entrypoint - - /opt/docker/bin/entrypoint $FEEDSTOCK_ROOT/.scripts/build_steps.sh - - echo "Done building" - --- kind: pipeline name: linux_aarch64_numpy1.18python3.7.____cpython @@ -56,6 +25,7 @@ steps: - export CI=drone - export GIT_BRANCH="$DRONE_BRANCH" - export FEEDSTOCK_NAME=$(basename ${DRONE_REPO_NAME}) + - export IS_PR_BUILD=$(if [[ "$${DRONE_PULL_REQUEST:-}" == "" ]]; then echo "False"; else echo "True"; fi) - sed -i '$ichown -R conda:conda "$FEEDSTOCK_ROOT"' /opt/docker/bin/entrypoint - /opt/docker/bin/entrypoint $FEEDSTOCK_ROOT/.scripts/build_steps.sh - echo "Done building" @@ -87,6 +57,7 @@ steps: - export CI=drone - export GIT_BRANCH="$DRONE_BRANCH" - export FEEDSTOCK_NAME=$(basename ${DRONE_REPO_NAME}) + - export IS_PR_BUILD=$(if [[ "$${DRONE_PULL_REQUEST:-}" == "" ]]; then echo "False"; else echo "True"; fi) - sed -i '$ichown -R conda:conda "$FEEDSTOCK_ROOT"' /opt/docker/bin/entrypoint - /opt/docker/bin/entrypoint $FEEDSTOCK_ROOT/.scripts/build_steps.sh - echo "Done building" @@ -118,6 +89,7 @@ steps: - export CI=drone - export GIT_BRANCH="$DRONE_BRANCH" - export FEEDSTOCK_NAME=$(basename ${DRONE_REPO_NAME}) + - export IS_PR_BUILD=$(if [[ "$${DRONE_PULL_REQUEST:-}" == "" ]]; then echo "False"; else echo "True"; fi) - sed -i '$ichown -R conda:conda "$FEEDSTOCK_ROOT"' /opt/docker/bin/entrypoint - /opt/docker/bin/entrypoint $FEEDSTOCK_ROOT/.scripts/build_steps.sh - echo "Done building" @@ -149,6 +121,7 @@ steps: - export CI=drone - export GIT_BRANCH="$DRONE_BRANCH" - export FEEDSTOCK_NAME=$(basename ${DRONE_REPO_NAME}) + - export IS_PR_BUILD=$(if [[ "$${DRONE_PULL_REQUEST:-}" == "" ]]; then echo "False"; else echo "True"; fi) - sed -i '$ichown -R conda:conda "$FEEDSTOCK_ROOT"' /opt/docker/bin/entrypoint - /opt/docker/bin/entrypoint $FEEDSTOCK_ROOT/.scripts/build_steps.sh - echo "Done building" diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 99baf86..2e87f6d 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -25,7 +25,8 @@ conda-build: root-dir: ${FEEDSTOCK_ROOT}/build_artifacts CONDARC -BUILD_CMD=build +GET_BOA=boa +BUILD_CMD=mambabuild conda install --yes --quiet "conda-forge-ci-setup=3" conda-build pip ${GET_BOA:-} -c conda-forge @@ -66,7 +67,7 @@ else ( startgroup "Uploading packages" ) 2> /dev/null - if [[ "${UPLOAD_PACKAGES}" != "False" ]]; then + if [[ "${UPLOAD_PACKAGES}" != "False" ]] && [[ "${IS_PR_BUILD}" == "False" ]]; then upload_package --validate --feedstock-name="${FEEDSTOCK_NAME}" "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}" fi diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh index 244ccd1..9a61caf 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -75,12 +75,14 @@ fi ( startgroup "Start Docker" ) 2> /dev/null export UPLOAD_PACKAGES="${UPLOAD_PACKAGES:-True}" +export IS_PR_BUILD="${IS_PR_BUILD:-False}" docker run ${DOCKER_RUN_ARGS} \ -v "${RECIPE_ROOT}":/home/conda/recipe_root:rw,z,delegated \ -v "${FEEDSTOCK_ROOT}":/home/conda/feedstock_root:rw,z,delegated \ -e CONFIG \ -e HOST_USER_ID \ -e UPLOAD_PACKAGES \ + -e IS_PR_BUILD \ -e GIT_BRANCH \ -e UPLOAD_ON_BRANCH \ -e CI \ diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 708b1e1..3dca437 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -9,15 +9,17 @@ MINIFORGE_HOME=${MINIFORGE_HOME:-${HOME}/miniforge3} ( startgroup "Installing a fresh version of Miniforge" ) 2> /dev/null MINIFORGE_URL="https://github.com/conda-forge/miniforge/releases/latest/download" -MINIFORGE_FILE="Miniforge3-MacOSX-x86_64.sh" +MINIFORGE_FILE="Miniforge3-MacOSX-$(uname -m).sh" curl -L -O "${MINIFORGE_URL}/${MINIFORGE_FILE}" +rm -rf ${MINIFORGE_HOME} bash $MINIFORGE_FILE -b -p ${MINIFORGE_HOME} ( endgroup "Installing a fresh version of Miniforge" ) 2> /dev/null ( startgroup "Configuring conda" ) 2> /dev/null -BUILD_CMD=build +GET_BOA=boa +BUILD_CMD=mambabuild source ${MINIFORGE_HOME}/etc/profile.d/conda.sh conda activate base @@ -66,7 +68,7 @@ validate_recipe_outputs "${FEEDSTOCK_NAME}" ( startgroup "Uploading packages" ) 2> /dev/null -if [[ "${UPLOAD_PACKAGES}" != "False" ]]; then +if [[ "${UPLOAD_PACKAGES}" != "False" ]] && [[ "${IS_PR_BUILD}" == "False" ]]; then upload_package --validate --feedstock-name="${FEEDSTOCK_NAME}" ./ ./recipe ./.ci_support/${CONFIG}.yaml fi diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index a3126ca..0000000 --- a/.travis.yml +++ /dev/null @@ -1,41 +0,0 @@ -# This file was generated automatically from conda-smithy. To update this configuration, -# update the conda-forge.yml and/or the recipe/meta.yaml. - -language: generic - - - -matrix: - include: - - env: CONFIG=linux_ppc64le_numpy1.18python3.6.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le - os: linux - arch: ppc64le - dist: focal - - - env: CONFIG=linux_ppc64le_numpy1.18python3.7.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le - os: linux - arch: ppc64le - dist: focal - - - env: CONFIG=linux_ppc64le_numpy1.18python3.8.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le - os: linux - arch: ppc64le - dist: focal - - - env: CONFIG=linux_ppc64le_numpy1.19python3.7.____73_pypy UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le - os: linux - arch: ppc64le - dist: focal - - - env: CONFIG=linux_ppc64le_numpy1.19python3.9.____cpython UPLOAD_PACKAGES=True PLATFORM=linux-ppc64le DOCKER_IMAGE=quay.io/condaforge/linux-anvil-ppc64le - os: linux - arch: ppc64le - dist: focal - -script: - - export CI=travis - - export GIT_BRANCH="$TRAVIS_BRANCH" - - export FEEDSTOCK_NAME=$(basename ${TRAVIS_REPO_SLUG}) - - - - if [[ ${PLATFORM} =~ .*linux.* ]]; then ./.scripts/run_docker_build.sh; fi \ No newline at end of file diff --git a/README.md b/README.md index f53107b..e4ba71b 100644 --- a/README.md +++ b/README.md @@ -23,13 +23,6 @@ Current build status - - -
Travis - - macOS - -
Drone @@ -50,13 +43,6 @@ Current build status - - - - - - - - - - - - - - -
VariantStatus
linux_64_numpy1.18python3.6.____cpython - - variant - -
linux_64_numpy1.18python3.7.____cpython @@ -84,13 +70,6 @@ Current build status variant
linux_aarch64_numpy1.18python3.6.____cpython - - variant - -
linux_aarch64_numpy1.18python3.7.____cpython @@ -119,13 +98,6 @@ Current build status variant
linux_ppc64le_numpy1.18python3.6.____cpython - - variant - -
linux_ppc64le_numpy1.18python3.7.____cpython @@ -154,13 +126,6 @@ Current build status variant
osx_64_numpy1.18python3.6.____cpython - - variant - -
osx_64_numpy1.18python3.7.____cpython @@ -203,13 +168,6 @@ Current build status variant
win_64_numpy1.18python3.6.____cpython - - variant - -
win_64_numpy1.18python3.7.____cpython diff --git a/build-locally.py b/build-locally.py index 00eeb34..f3d4f62 100755 --- a/build-locally.py +++ b/build-locally.py @@ -13,6 +13,7 @@ def setup_environment(ns): os.environ["CONFIG"] = ns.config os.environ["UPLOAD_PACKAGES"] = "False" + os.environ["IS_PR_BUILD"] = "True" if ns.debug: os.environ["BUILD_WITH_CONDA_DEBUG"] = "1" if ns.output_id: diff --git a/conda-forge.yml b/conda-forge.yml index 9b5f040..e758699 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1,4 +1,4 @@ build_platform: {osx_arm64: osx_64} conda_forge_output_validation: true -provider: {linux_aarch64: default, linux_ppc64le: default, win: azure} +provider: {linux_aarch64: default, linux_ppc64le: azure, win: azure} test_on_native_only: true diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 297c465..9197f7f 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,12 +1,16 @@ -{% set version = "2.1.4" %} +{% set version = "3.0.0" %} package: name: scs - version: {{ version|replace('-', '.') }} # 2.1.1-2 => 2.1.1.2 + version: {{ version }} source: - url: https://pypi.io/packages/source/s/scs/scs-{{ version }}.tar.gz - sha256: ddd6614db7f0e63b69672cfd02ba2c8423dade33a58b0a341a5119091c501739 + - url: https://github.com/bodono/scs-python/archive/refs/tags/{{ version }}.tar.gz + sha256: b962c8d757f49602aa2223f88b303504fe6dbf8249f2378e323ca197ed030202 + # include submodule (not in github tarball due to dear-github/dear-github#214) + - git_url: https://github.com/cvxgrp/scs.git + git_rev: 5be0e1684d12c4cfd4d22c5fba236a84a092ab5b + folder: scs build: number: 0 @@ -32,6 +36,9 @@ requirements: - python - {{ pin_compatible('numpy') }} - scipy >=0.13.2 + run_constrained: + # avoid installing incompatible cvxpy + - cvxpy >1.1.15 test: imports: