Merge pull request #1361 from regro-cf-autotick-bot/rebuild-snappy120…

…-0-1_he34890 [main] Rebuild for snappy120
conda-forge · Apr 10, 2024 · 8639672 · 8639672
2 parents 5be586a + 045c8e8
commit 8639672
Show file tree

Hide file tree

Showing 15 changed files with 34 additions and 27 deletions.
diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml
diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml
diff --git a/...er_version11.2cxx_compiler_version10.yaml → ...er_version11.2cxx_compiler_version10.yaml b/...er_version11.2cxx_compiler_version10.yaml → ...er_version11.2cxx_compiler_version10.yaml
@@ -69,7 +69,7 @@ python:
 re2:
 - 2023.09.01
 snappy:
-- '1.1'
+- '1.2'
 target_platform:
 - linux-64
 thrift_cpp:

diff --git a/...er_versionNonecxx_compiler_version12.yaml → ...er_versionNonecxx_compiler_version12.yaml b/...er_versionNonecxx_compiler_version12.yaml → ...er_versionNonecxx_compiler_version12.yaml
@@ -69,7 +69,7 @@ python:
 re2:
 - 2023.09.01
 snappy:
-- '1.1'
+- '1.2'
 target_platform:
 - linux-64
 thrift_cpp:

diff --git a/...c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml b/...c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml
@@ -73,7 +73,7 @@ python:
 re2:
 - 2023.09.01
 snappy:
-- '1.1'
+- '1.2'
 target_platform:
 - linux-aarch64
 thrift_cpp:

diff --git a/...c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml b/...c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml
@@ -73,7 +73,7 @@ python:
 re2:
 - 2023.09.01
 snappy:
-- '1.1'
+- '1.2'
 target_platform:
 - linux-aarch64
 thrift_cpp:

diff --git a/...c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml b/...c_compiler_version10cuda_compilernvcccuda_compiler_version11.2cxx_compiler_version10.yaml
@@ -69,7 +69,7 @@ python:
 re2:
 - 2023.09.01
 snappy:
-- '1.1'
+- '1.2'
 target_platform:
 - linux-ppc64le
 thrift_cpp:

diff --git a/...c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml b/...c_compiler_version12cuda_compilerNonecuda_compiler_versionNonecxx_compiler_version12.yaml
@@ -69,7 +69,7 @@ python:
 re2:
 - 2023.09.01
 snappy:
-- '1.1'
+- '1.2'
 target_platform:
 - linux-ppc64le
 thrift_cpp:

diff --git a/.ci_support/migrations/snappy120.yaml b/.ci_support/migrations/snappy120.yaml
@@ -0,0 +1,7 @@
+migrator_ts: 1712592149
+__migrator:
+  kind: version
+  migration_number: 1
+  bump_number: 1
+snappy:
+  - 1.2
diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml
@@ -65,7 +65,7 @@ python:
 re2:
 - 2023.09.01
 snappy:
-- '1.1'
+- '1.2'
 target_platform:
 - osx-64
 thrift_cpp:

diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml
@@ -65,7 +65,7 @@ python:
 re2:
 - 2023.09.01
 snappy:
-- '1.1'
+- '1.2'
 target_platform:
 - osx-arm64
 thrift_cpp:

diff --git a/...ort/win_64_cuda_compiler_versionNone.yaml → ...ompilerNonecuda_compiler_versionNone.yaml b/...ort/win_64_cuda_compiler_versionNone.yaml → ...ompilerNonecuda_compiler_versionNone.yaml
@@ -65,7 +65,7 @@ python:
 re2:
 - 2023.09.01
 snappy:
-- '1.1'
+- '1.2'
 target_platform:
 - win-64
 thrift_cpp:

diff --git a/...ort/win_64_cuda_compiler_version11.2.yaml → ...ompilernvcccuda_compiler_version11.2.yaml b/...ort/win_64_cuda_compiler_version11.2.yaml → ...ompilernvcccuda_compiler_version11.2.yaml
@@ -65,7 +65,7 @@ python:
 re2:
 - 2023.09.01
 snappy:
-- '1.1'
+- '1.2'
 target_platform:
 - win-64
 thrift_cpp:

diff --git a/README.md b/README.md
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -29,7 +29,7 @@ source:
     folder: testing
 
 build:
-  number: 2
+  number: 3
   # for cuda support, building with one version is enough to be compatible with
   # all later versions, since arrow is only using libcuda, and not libcudart.
   skip: true  # [cuda_compiler_version not in ("None", cuda_compiler_version_min)]
-Original file line number
+Diff line change
@@ Expand Up / @@ -65,7 +65,7 @@ python: @@
     re2:
     - 2023.09.01
     snappy:
-    - '1.1'
+    - '1.2'
     target_platform:
     - osx-64
     thrift_cpp:
@@ Expand Down @@