[Release] Fix stable branch with correct versions and required fixes (a…

…pache#336) Cherry pick to stable. We did not update the cookbooks from 12.0.0 to 13.0.0 and when updating from 12.0.0 to 14.0.0 the script missed the following version updates because I used: `./dev/release/01-bump-versions.sh 13.0.0 14.0.0` instead of `./dev/release/01-bump-versions.sh 12.0.0 14.0.0` Manually update the missing updates to run cookbooks consistently for 14.0.0. The fix for * apache#331 Is also required for 14.0.0. --------- Co-authored-by: Alenka Frim <AlenkaF@users.noreply.github.com>
amoeba · Nov 14, 2023 · c1ebd4d · c1ebd4d
1 parent 4c2781f
commit c1ebd4d
Show file tree

Hide file tree

Showing 8 changed files with 156 additions and 133 deletions.
diff --git a/cpp/conda-linux-64.lock b/cpp/conda-linux-64.lock
diff --git a/cpp/conda-linux-aarch64.lock b/cpp/conda-linux-aarch64.lock
diff --git a/cpp/conda-osx-arm64.lock b/cpp/conda-osx-arm64.lock
diff --git a/cpp/dev.yml b/cpp/dev.yml
@@ -21,7 +21,7 @@ channels:
 dependencies:
   - python=3.9
   - compilers
-  - arrow-nightlies::arrow-cpp
+  - arrow-nightlies::libarrow
   - sphinx
   - gtest
   - gmock

diff --git a/cpp/environment.yml b/cpp/environment.yml
@@ -20,10 +20,10 @@ channels:
 dependencies:
   - python=3.9
   - compilers
-  - arrow-cpp==12.0.0
+  - libarrow==14.0.0
   - sphinx
   - gtest
   - gmock
-  - pyarrow==12.0.0
+  - pyarrow==14.0.0
   - clang-tools
   - zlib
diff --git a/dev/release/utils-prepare.sh b/dev/release/utils-prepare.sh
@@ -50,7 +50,7 @@ update_versions() {
 
   pushd "${ARROW_COOKBOOK_DIR}/cpp"
   sed -i.bak -E \
-    -e "s/arrow-cpp==${base_version}/arrow-cpp==${next_version}/" \
+    -e "s/libarrow==${base_version}/libarrow==${next_version}/" \
     -e "s/pyarrow==${base_version}/pyarrow==${next_version}/" \
     environment.yml
   rm -f environment.yml.bak

diff --git a/python/requirements.txt b/python/requirements.txt
@@ -1,5 +1,5 @@
 Sphinx>=4.0.2
-pyarrow==12.0.0
+pyarrow==14.0.0
 pandas>=1.2.5
 opentelemetry-api>=1.0.0
 opentelemetry-sdk>=1.0.0
diff --git a/python/source/schema.rst b/python/source/schema.rst
@@ -211,7 +211,7 @@ because in ``second_schema`` it was already declared as a ``pa.string()``
 
     try:
         union_schema =  pa.unify_schemas([first_schema, second_schema, third_schema])
-    except pa.ArrowInvalid as e:
+    except (pa.ArrowInvalid, pa.ArrowTypeError) as e:
         print(e)
 
 .. testoutput::