diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index d96a198..246462f 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -16,8 +16,8 @@ jobs: CONFIG: linux_64_cross_target_platformosx-64version19.1.7 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - linux_64_cross_target_platformosx-64version20.1.7: - CONFIG: linux_64_cross_target_platformosx-64version20.1.7 + linux_64_cross_target_platformosx-64version20.1.8: + CONFIG: linux_64_cross_target_platformosx-64version20.1.8 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 linux_64_cross_target_platformosx-arm64version18.1.8: @@ -28,8 +28,8 @@ jobs: CONFIG: linux_64_cross_target_platformosx-arm64version19.1.7 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 - linux_64_cross_target_platformosx-arm64version20.1.7: - CONFIG: linux_64_cross_target_platformosx-arm64version20.1.7 + linux_64_cross_target_platformosx-arm64version20.1.8: + CONFIG: linux_64_cross_target_platformosx-arm64version20.1.8 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9 timeoutInMinutes: 360 @@ -61,4 +61,4 @@ jobs: env: BINSTAR_TOKEN: $(BINSTAR_TOKEN) FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) - STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) \ No newline at end of file + STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index a6c4478..7226373 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -14,8 +14,8 @@ jobs: osx_64_cross_target_platformosx-64version19.1.7: CONFIG: osx_64_cross_target_platformosx-64version19.1.7 UPLOAD_PACKAGES: 'True' - osx_64_cross_target_platformosx-64version20.1.7: - CONFIG: osx_64_cross_target_platformosx-64version20.1.7 + osx_64_cross_target_platformosx-64version20.1.8: + CONFIG: osx_64_cross_target_platformosx-64version20.1.8 UPLOAD_PACKAGES: 'True' osx_64_cross_target_platformosx-arm64version18.1.8: CONFIG: osx_64_cross_target_platformosx-arm64version18.1.8 @@ -23,8 +23,8 @@ jobs: osx_64_cross_target_platformosx-arm64version19.1.7: CONFIG: osx_64_cross_target_platformosx-arm64version19.1.7 UPLOAD_PACKAGES: 'True' - osx_64_cross_target_platformosx-arm64version20.1.7: - CONFIG: osx_64_cross_target_platformosx-arm64version20.1.7 + osx_64_cross_target_platformosx-arm64version20.1.8: + CONFIG: osx_64_cross_target_platformosx-arm64version20.1.8 UPLOAD_PACKAGES: 'True' osx_arm64_cross_target_platformosx-64version18.1.8: CONFIG: osx_arm64_cross_target_platformosx-64version18.1.8 @@ -32,8 +32,8 @@ jobs: osx_arm64_cross_target_platformosx-64version19.1.7: CONFIG: osx_arm64_cross_target_platformosx-64version19.1.7 UPLOAD_PACKAGES: 'True' - osx_arm64_cross_target_platformosx-64version20.1.7: - CONFIG: osx_arm64_cross_target_platformosx-64version20.1.7 + osx_arm64_cross_target_platformosx-64version20.1.8: + CONFIG: osx_arm64_cross_target_platformosx-64version20.1.8 UPLOAD_PACKAGES: 'True' osx_arm64_cross_target_platformosx-arm64version18.1.8: CONFIG: osx_arm64_cross_target_platformosx-arm64version18.1.8 @@ -41,8 +41,8 @@ jobs: osx_arm64_cross_target_platformosx-arm64version19.1.7: CONFIG: osx_arm64_cross_target_platformosx-arm64version19.1.7 UPLOAD_PACKAGES: 'True' - osx_arm64_cross_target_platformosx-arm64version20.1.7: - CONFIG: osx_arm64_cross_target_platformosx-arm64version20.1.7 + osx_arm64_cross_target_platformosx-arm64version20.1.8: + CONFIG: osx_arm64_cross_target_platformosx-arm64version20.1.8 UPLOAD_PACKAGES: 'True' timeoutInMinutes: 360 variables: {} @@ -67,4 +67,4 @@ jobs: env: BINSTAR_TOKEN: $(BINSTAR_TOKEN) FEEDSTOCK_TOKEN: $(FEEDSTOCK_TOKEN) - STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) \ No newline at end of file + STAGING_BINSTAR_TOKEN: $(STAGING_BINSTAR_TOKEN) diff --git a/.ci_support/linux_64_cross_target_platformosx-64version20.1.7.yaml b/.ci_support/linux_64_cross_target_platformosx-64version20.1.8.yaml similarity index 98% rename from .ci_support/linux_64_cross_target_platformosx-64version20.1.7.yaml rename to .ci_support/linux_64_cross_target_platformosx-64version20.1.8.yaml index 9ccbbfd..930225a 100644 --- a/.ci_support/linux_64_cross_target_platformosx-64version20.1.7.yaml +++ b/.ci_support/linux_64_cross_target_platformosx-64version20.1.8.yaml @@ -25,7 +25,7 @@ uname_kernel_release: uname_machine: - x86_64 version: -- 20.1.7 +- 20.1.8 zip_keys: - - cross_target_platform - macos_machine diff --git a/.ci_support/linux_64_cross_target_platformosx-arm64version20.1.7.yaml b/.ci_support/linux_64_cross_target_platformosx-arm64version20.1.8.yaml similarity index 98% rename from .ci_support/linux_64_cross_target_platformosx-arm64version20.1.7.yaml rename to .ci_support/linux_64_cross_target_platformosx-arm64version20.1.8.yaml index b96fde6..46b73d2 100644 --- a/.ci_support/linux_64_cross_target_platformosx-arm64version20.1.7.yaml +++ b/.ci_support/linux_64_cross_target_platformosx-arm64version20.1.8.yaml @@ -25,7 +25,7 @@ uname_kernel_release: uname_machine: - arm64 version: -- 20.1.7 +- 20.1.8 zip_keys: - - cross_target_platform - macos_machine diff --git a/.ci_support/osx_64_cross_target_platformosx-64version20.1.7.yaml b/.ci_support/osx_64_cross_target_platformosx-64version20.1.8.yaml similarity index 98% rename from .ci_support/osx_64_cross_target_platformosx-64version20.1.7.yaml rename to .ci_support/osx_64_cross_target_platformosx-64version20.1.8.yaml index 9e60de9..ddda76b 100644 --- a/.ci_support/osx_64_cross_target_platformosx-64version20.1.7.yaml +++ b/.ci_support/osx_64_cross_target_platformosx-64version20.1.8.yaml @@ -23,7 +23,7 @@ uname_kernel_release: uname_machine: - x86_64 version: -- 20.1.7 +- 20.1.8 zip_keys: - - cross_target_platform - macos_machine diff --git a/.ci_support/osx_64_cross_target_platformosx-arm64version20.1.7.yaml b/.ci_support/osx_64_cross_target_platformosx-arm64version20.1.8.yaml similarity index 98% rename from .ci_support/osx_64_cross_target_platformosx-arm64version20.1.7.yaml rename to .ci_support/osx_64_cross_target_platformosx-arm64version20.1.8.yaml index 6ecee79..7b1add0 100644 --- a/.ci_support/osx_64_cross_target_platformosx-arm64version20.1.7.yaml +++ b/.ci_support/osx_64_cross_target_platformosx-arm64version20.1.8.yaml @@ -23,7 +23,7 @@ uname_kernel_release: uname_machine: - arm64 version: -- 20.1.7 +- 20.1.8 zip_keys: - - cross_target_platform - macos_machine diff --git a/.ci_support/osx_arm64_cross_target_platformosx-64version20.1.7.yaml b/.ci_support/osx_arm64_cross_target_platformosx-64version20.1.8.yaml similarity index 98% rename from .ci_support/osx_arm64_cross_target_platformosx-64version20.1.7.yaml rename to .ci_support/osx_arm64_cross_target_platformosx-64version20.1.8.yaml index 1e8b4b2..2c85d6e 100644 --- a/.ci_support/osx_arm64_cross_target_platformosx-64version20.1.7.yaml +++ b/.ci_support/osx_arm64_cross_target_platformosx-64version20.1.8.yaml @@ -23,7 +23,7 @@ uname_kernel_release: uname_machine: - x86_64 version: -- 20.1.7 +- 20.1.8 zip_keys: - - cross_target_platform - macos_machine diff --git a/.ci_support/osx_arm64_cross_target_platformosx-arm64version20.1.7.yaml b/.ci_support/osx_arm64_cross_target_platformosx-arm64version20.1.8.yaml similarity index 98% rename from .ci_support/osx_arm64_cross_target_platformosx-arm64version20.1.7.yaml rename to .ci_support/osx_arm64_cross_target_platformosx-arm64version20.1.8.yaml index 0c23079..99dedcd 100644 --- a/.ci_support/osx_arm64_cross_target_platformosx-arm64version20.1.7.yaml +++ b/.ci_support/osx_arm64_cross_target_platformosx-arm64version20.1.8.yaml @@ -23,7 +23,7 @@ uname_kernel_release: uname_machine: - arm64 version: -- 20.1.7 +- 20.1.8 zip_keys: - - cross_target_platform - macos_machine diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index 827a29f..780a358 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -97,4 +97,4 @@ fi ( startgroup "Final checks" ) 2> /dev/null -touch "${FEEDSTOCK_ROOT}/build_artifacts/conda-forge-build-done-${CONFIG}" \ No newline at end of file +touch "${FEEDSTOCK_ROOT}/build_artifacts/conda-forge-build-done-${CONFIG}" diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh index 6ee04aa..b63b5a0 100755 --- a/.scripts/run_docker_build.sh +++ b/.scripts/run_docker_build.sh @@ -111,4 +111,4 @@ docker run ${DOCKER_RUN_ARGS} \ test -f "$DONE_CANARY" # This closes the last group opened in `build_steps.sh` -( endgroup "Final checks" ) 2> /dev/null \ No newline at end of file +( endgroup "Final checks" ) 2> /dev/null diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 0e3c394..361edeb 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -117,4 +117,4 @@ else fi ( endgroup "Uploading packages" ) 2> /dev/null -fi \ No newline at end of file +fi diff --git a/README.md b/README.md index 32201a9..b1923ec 100644 --- a/README.md +++ b/README.md @@ -63,10 +63,10 @@ Current build status - linux_64_cross_target_platformosx-64version20.1.7 + linux_64_cross_target_platformosx-64version20.1.8 - variant + variant @@ -84,10 +84,10 @@ Current build status - linux_64_cross_target_platformosx-arm64version20.1.7 + linux_64_cross_target_platformosx-arm64version20.1.8 - variant + variant @@ -105,10 +105,10 @@ Current build status - osx_64_cross_target_platformosx-64version20.1.7 + osx_64_cross_target_platformosx-64version20.1.8 - variant + variant @@ -126,10 +126,10 @@ Current build status - osx_64_cross_target_platformosx-arm64version20.1.7 + osx_64_cross_target_platformosx-arm64version20.1.8 - variant + variant @@ -147,10 +147,10 @@ Current build status - osx_arm64_cross_target_platformosx-64version20.1.7 + osx_arm64_cross_target_platformosx-64version20.1.8 - variant + variant @@ -168,10 +168,10 @@ Current build status - osx_arm64_cross_target_platformosx-arm64version20.1.7 + osx_arm64_cross_target_platformosx-arm64version20.1.8 - variant + variant diff --git a/build-locally.py b/build-locally.py index 02c2374..9dfe440 100755 --- a/build-locally.py +++ b/build-locally.py @@ -106,9 +106,7 @@ def main(args=None): action="store_true", help="Setup debug environment using `conda debug`", ) - p.add_argument( - "--output-id", help="If running debug, specify the output to setup." - ) + p.add_argument("--output-id", help="If running debug, specify the output to setup.") ns = p.parse_args(args=args) verify_config(ns) @@ -124,9 +122,7 @@ def main(args=None): elif ns.config.startswith("win"): run_win_build(ns) finally: - recipe_license_file = os.path.join( - "recipe", "recipe-scripts-license.txt" - ) + recipe_license_file = os.path.join("recipe", "recipe-scripts-license.txt") if os.path.exists(recipe_license_file): os.remove(recipe_license_file) diff --git a/recipe/conda_build_config.yaml b/recipe/conda_build_config.yaml index 080a924..45a009d 100644 --- a/recipe/conda_build_config.yaml +++ b/recipe/conda_build_config.yaml @@ -11,7 +11,7 @@ MACOSX_DEPLOYMENT_TARGET: # [linux] version: - 18.1.8 - 19.1.7 - - 20.1.7 + - 20.1.8 # everything below is zipped cross_target_platform: diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 5470905..a0294f4 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% if version is not defined %} -{% set version = "20.1.7" %} +{% set version = "20.1.8" %} {% endif %} {% set major_ver = version.split(".")[0] %} # in the past we've had to uncouple the compiler version from the version