Add fix for #148 (#152)

automerged PR by conda-forge/automerge-action
conda-forge · Oct 13, 2022 · aed0212 · aed0212
2 parents 7f008f3 + 08aad5e
commit aed0212
Show file tree

Hide file tree

Showing 22 changed files with 1,124 additions and 107 deletions.
diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml
diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml
diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml
diff --git a/.ci_support/linux_64_OGRE_VERSION1.10.yaml b/.ci_support/linux_64_OGRE_VERSION1.10.yaml
@@ -43,16 +43,8 @@ libuuid:
 pin_run_as_build:
   boost-cpp:
     max_pin: x.x.x
-  curl:
-    max_pin: x
   graphviz:
     max_pin: x
-  libcurl:
-    max_pin: x
-  libgdal:
-    max_pin: x.x
-  libuuid:
-    max_pin: x
 qt_main:
 - '5.15'
 target_platform:

diff --git a/.ci_support/linux_64_OGRE_VERSION1.12.yaml b/.ci_support/linux_64_OGRE_VERSION1.12.yaml
@@ -43,16 +43,8 @@ libuuid:
 pin_run_as_build:
   boost-cpp:
     max_pin: x.x.x
-  curl:
-    max_pin: x
   graphviz:
     max_pin: x
-  libcurl:
-    max_pin: x
-  libgdal:
-    max_pin: x.x
-  libuuid:
-    max_pin: x
 qt_main:
 - '5.15'
 target_platform:

diff --git a/.ci_support/linux_aarch64_OGRE_VERSION1.10.yaml b/.ci_support/linux_aarch64_OGRE_VERSION1.10.yaml
@@ -47,16 +47,8 @@ libuuid:
 pin_run_as_build:
   boost-cpp:
     max_pin: x.x.x
-  curl:
-    max_pin: x
   graphviz:
     max_pin: x
-  libcurl:
-    max_pin: x
-  libgdal:
-    max_pin: x.x
-  libuuid:
-    max_pin: x
 qt_main:
 - '5.15'
 target_platform:

diff --git a/.ci_support/linux_aarch64_OGRE_VERSION1.12.yaml b/.ci_support/linux_aarch64_OGRE_VERSION1.12.yaml
@@ -47,16 +47,8 @@ libuuid:
 pin_run_as_build:
   boost-cpp:
     max_pin: x.x.x
-  curl:
-    max_pin: x
   graphviz:
     max_pin: x
-  libcurl:
-    max_pin: x
-  libgdal:
-    max_pin: x.x
-  libuuid:
-    max_pin: x
 qt_main:
 - '5.15'
 target_platform:

diff --git a/.ci_support/migrations/graphviz6.yaml b/.ci_support/migrations/graphviz6.yaml
diff --git a/.ci_support/osx_64_OGRE_VERSION1.10.yaml b/.ci_support/osx_64_OGRE_VERSION1.10.yaml
@@ -1,5 +1,5 @@
 MACOSX_DEPLOYMENT_TARGET:
-- '10.14'
+- '10.15'
 OGRE_VERSION:
 - '1.10'
 assimp:
@@ -41,22 +41,12 @@ libprotobuf:
 macos_machine:
 - x86_64-apple-darwin13.4.0
 macos_min_version:
-- '10.14'
+- '10.15'
 pin_run_as_build:
   boost-cpp:
     max_pin: x.x.x
-  bzip2:
-    max_pin: x
-  curl:
-    max_pin: x
   graphviz:
     max_pin: x
-  libcurl:
-    max_pin: x
-  libgdal:
-    max_pin: x.x
-  zlib:
-    max_pin: x.x
 qt_main:
 - '5.15'
 target_platform:

diff --git a/.ci_support/osx_64_OGRE_VERSION1.12.yaml b/.ci_support/osx_64_OGRE_VERSION1.12.yaml
@@ -1,5 +1,5 @@
 MACOSX_DEPLOYMENT_TARGET:
-- '10.14'
+- '10.15'
 OGRE_VERSION:
 - '1.12'
 assimp:
@@ -41,22 +41,12 @@ libprotobuf:
 macos_machine:
 - x86_64-apple-darwin13.4.0
 macos_min_version:
-- '10.14'
+- '10.15'
 pin_run_as_build:
   boost-cpp:
     max_pin: x.x.x
-  bzip2:
-    max_pin: x
-  curl:
-    max_pin: x
   graphviz:
     max_pin: x
-  libcurl:
-    max_pin: x
-  libgdal:
-    max_pin: x.x
-  zlib:
-    max_pin: x.x
 qt_main:
 - '5.15'
 target_platform:

diff --git a/.ci_support/osx_arm64_OGRE_VERSION1.10.yaml b/.ci_support/osx_arm64_OGRE_VERSION1.10.yaml
@@ -43,18 +43,8 @@ macos_machine:
 pin_run_as_build:
   boost-cpp:
     max_pin: x.x.x
-  bzip2:
-    max_pin: x
-  curl:
-    max_pin: x
   graphviz:
     max_pin: x
-  libcurl:
-    max_pin: x
-  libgdal:
-    max_pin: x.x
-  zlib:
-    max_pin: x.x
 qt_main:
 - '5.15'
 target_platform:

diff --git a/.ci_support/osx_arm64_OGRE_VERSION1.12.yaml b/.ci_support/osx_arm64_OGRE_VERSION1.12.yaml
@@ -43,18 +43,8 @@ macos_machine:
 pin_run_as_build:
   boost-cpp:
     max_pin: x.x.x
-  bzip2:
-    max_pin: x
-  curl:
-    max_pin: x
   graphviz:
     max_pin: x
-  libcurl:
-    max_pin: x
-  libgdal:
-    max_pin: x.x
-  zlib:
-    max_pin: x.x
 qt_main:
 - '5.15'
 target_platform:

diff --git a/.ci_support/win_64_OGRE_VERSION1.10.yaml b/.ci_support/win_64_OGRE_VERSION1.10.yaml
@@ -31,12 +31,6 @@ libprotobuf:
 pin_run_as_build:
   boost-cpp:
     max_pin: x.x.x
-  curl:
-    max_pin: x
-  libcurl:
-    max_pin: x
-  libgdal:
-    max_pin: x.x
 qt_main:
 - '5.15'
 target_platform:

diff --git a/.ci_support/win_64_OGRE_VERSION1.12.yaml b/.ci_support/win_64_OGRE_VERSION1.12.yaml
@@ -31,12 +31,6 @@ libprotobuf:
 pin_run_as_build:
   boost-cpp:
     max_pin: x.x.x
-  curl:
-    max_pin: x
-  libcurl:
-    max_pin: x
-  libgdal:
-    max_pin: x.x
 qt_main:
 - '5.15'
 target_platform:

diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh