Merge pull request #50 from mfisher87/1.4.557

Release v1.4.557
conda-forge · Jul 16, 2024 · ffd9cc4 · ffd9cc4
2 parents 32134bd + 2783919
commit ffd9cc4
Show file tree

Hide file tree

Showing 12 changed files with 30 additions and 112 deletions.
diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml
diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml
@@ -1,9 +1,5 @@
-c_stdlib:
-- sysroot
-c_stdlib_version:
-- '2.12'
 cdt_name:
-- cos6
+- cos7
 channel_sources:
 - conda-forge
 channel_targets:
@@ -12,6 +8,3 @@ docker_image:
 - quay.io/condaforge/linux-anvil-cos7-x86_64
 target_platform:
 - linux-64
-zip_keys:
-- - c_stdlib_version
-  - cdt_name
diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml
@@ -1,9 +1,7 @@
 MACOSX_DEPLOYMENT_TARGET:
-- '10.9'
-c_stdlib:
-- macosx_deployment_target
-c_stdlib_version:
-- '10.9'
+- '10.13'
+MACOSX_SDK_VERSION:
+- '10.13'
 channel_sources:
 - conda-forge
 channel_targets:

diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml
@@ -1,8 +1,6 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '11.0'
-c_stdlib:
-- macosx_deployment_target
-c_stdlib_version:
+MACOSX_SDK_VERSION:
 - '11.0'
 channel_sources:
 - conda-forge

diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml
@@ -1,7 +1,3 @@
-c_stdlib:
-- vs
-c_stdlib_version:
-- '2019'
 channel_sources:
 - conda-forge
 channel_targets:

diff --git a/.gitattributes b/.gitattributes
diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh
diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -1,6 +1,6 @@
-{% set version = "1.4.550" %}
-{% set sha256 = "245d9961c1a777a92d0821b30ea4cf15b83c40115e5f419f5d1135e0cd73e2ab" %}
-{% set build_number = 1 %}
+{% set version = "1.4.557" %}
+{% set sha256 = "d763346011f8a8034308d1f3d805c9a80049aa20893f7358778aac8bbea41778" %}
+{% set build_number = 0 %}
 {% set deno_version = load_file_regex(load_file='configuration', regex_pattern='export\sDENO=v(\S+)') %}
 {% set deno_dom_version = load_file_regex(load_file='configuration', regex_pattern='export DENO_DOM=v([^-]+)') %}
 {% set pandoc_version = load_file_regex(load_file='configuration', regex_pattern='export PANDOC=(\S+)') %}
@@ -16,10 +16,6 @@ source:
     - patches/0001-win-conda-path-overrides.patch
     - patches/0001-log-deno-bundle-command.patch
     - patches/0001-remove-QUARTO_VERSION-from-configuration.patch
-    # Temporary patches pending upstream fixes. See:
-    # https://github.com/conda-forge/quarto-feedstock/pull/36#issuecomment-1947515694
-    - patches/0001-skip-pandoc-symlink.patch
-    - patches/0001-always-build-quarto-preview-js.patch
 
 build:
   number: {{ build_number }}

diff --git a/recipe/patches/0001-always-build-quarto-preview-js.patch b/recipe/patches/0001-always-build-quarto-preview-js.patch
diff --git a/recipe/patches/0001-skip-pandoc-symlink.patch b/recipe/patches/0001-skip-pandoc-symlink.patch