minor changes and tzdata to latest

Author: rok

.github/workflows/r.yml

@@ -280,7 +280,7 @@ jobs:
       - name: Download Timezone Database
         shell: bash
         run: |
-          # RTools 40's MinGW GCC may not support C++20 chrono timezones,
+          # RTools 40 uses GCC 8.x which does not support C++20 chrono timezones,
           # so Arrow uses the vendored date library which requires tzdata
           ci/scripts/download_tz_database.sh
       - run: mkdir r/windows

ci/scripts/download_tz_database.sh

@@ -20,7 +20,7 @@
 set -ex
 
 # Download database
-curl https://data.iana.org/time-zones/releases/tzdata2024b.tar.gz --output ~/Downloads/tzdata.tar.gz
+curl https://data.iana.org/time-zones/releases/tzdata.tar.gz --output ~/Downloads/tzdata.tar.gz
 
 # Extract
 mkdir -p ~/Downloads/tzdata

cpp/src/arrow/compute/kernels/scalar_temporal_test.cc

@@ -29,7 +29,6 @@
 #include "arrow/type_fwd.h"
 #include "arrow/type_traits.h"
 #include "arrow/util/checked_cast.h"
-#include "arrow/util/chrono_internal.h"  // for ARROW_USE_STD_CHRONO
 #include "arrow/util/formatting.h"
 #include "arrow/util/logging_internal.h"
 

cpp/src/arrow/compute/kernels/temporal_internal.h

@@ -165,13 +165,13 @@ struct ZonedLocalizer {
 
 template <typename Duration>
 struct TimestampFormatter {
-  const char* format;
+  const std::string format;
   const ArrowTimeZone tz;
   std::ostringstream bufstream;
 
   explicit TimestampFormatter(const std::string& format, const ArrowTimeZone time_zone,
                               const std::locale& locale)
-      : format(format.c_str()), tz(time_zone) {
+      : format(format), tz(time_zone) {
     bufstream.imbue(locale);
     // Propagate errors as C++ exceptions (to get an actual error message)
     bufstream.exceptions(std::ios::failbit | std::ios::badbit);
@@ -182,7 +182,7 @@ struct TimestampFormatter {
     const auto timepoint = sys_time<Duration>(Duration{arg});
     auto format_zoned_time = [&](auto&& zt) {
       try {
-        chrono::to_stream(bufstream, format, zt);
+        chrono::to_stream(bufstream, format.c_str(), zt);
         return Status::OK();
       } catch (const std::runtime_error& ex) {
         bufstream.clear();

cpp/src/arrow/util/date_internal.h

@@ -64,13 +64,13 @@ namespace std::chrono {
 namespace arrow_vendored::date {
 #endif
 
-using arrow::internal::OffsetZone;
-
 template <>
-struct zoned_traits<OffsetZone> {
-  static OffsetZone default_zone() { return OffsetZone{std::chrono::minutes{0}}; }
+struct zoned_traits<arrow::internal::OffsetZone> {
+  static arrow::internal::OffsetZone default_zone() {
+    return arrow::internal::OffsetZone{std::chrono::minutes{0}};
+  }
 
-  static OffsetZone locate_zone(const std::string& name) {
+  static arrow::internal::OffsetZone locate_zone(const std::string& name) {
     throw std::runtime_error{"OffsetZone can't parse " + name};
   }
 };

docs/source/cpp/build_system.rst

@@ -245,7 +245,7 @@ timezone mapping XML. To download, you can use the following batch script:
 
 .. code-block:: batch
 
-   curl https://data.iana.org/time-zones/releases/tzdata2021e.tar.gz --output tzdata.tar.gz
+   curl https://data.iana.org/time-zones/releases/tzdata.tar.gz --output tzdata.tar.gz
    mkdir tzdata
    tar --extract --file tzdata.tar.gz --directory tzdata
    move tzdata %USERPROFILE%\Downloads\tzdata
@@ -254,7 +254,7 @@ timezone mapping XML. To download, you can use the following batch script:
      --output %USERPROFILE%\Downloads\tzdata\windowsZones.xml
 
 By default, the timezone database will be detected at ``%USERPROFILE%\Downloads\tzdata``,
-but you can set a custom path at runtime in :struct:`arrow::ArrowGlobalOptions`::
+but you can set a custom path at runtime in :struct:`arrow::GlobalOptions`::
 
    arrow::GlobalOptions options;
    options.timezone_db_path = "path/to/tzdata";

python/pyarrow/config.pxi

@@ -117,7 +117,7 @@ def set_timezone_db_path(path):
     warnings.warn(
         "pyarrow.set_timezone_db_path is deprecated as of 24.0.0 "
         "and will be removed in a future version. PyArrow now uses the "
-        "operating system's timezone database on Windows.",
+        "operating system's timezone database on most Windows builds.",
         FutureWarning,
         stacklevel=2
     )

python/pyarrow/tests/test_misc.py

@@ -143,10 +143,11 @@ def import_arrow():
                            "on non-Windows platforms")
 def test_set_timezone_db_path_non_windows():
     # set_timezone_db_path raises an error on non-Windows platforms
-    with pytest.raises(ArrowInvalid,
-                       match="Arrow was set to use OS timezone "
-                             "database at compile time"):
-        pa.set_timezone_db_path("path")
+    with pytest.warns(FutureWarning, match="deprecated"):
+        with pytest.raises(ArrowInvalid,
+                           match="Arrow was set to use OS timezone "
+                                 "database at compile time"):
+            pa.set_timezone_db_path("path")
 
 
 @pytest.mark.parametrize('klass', [

python/pyarrow/tests/test_util.py

@@ -220,7 +220,8 @@ def test_download_tzdata_on_windows():
     # Download timezone database and remove data in case it already exists
     if (os.path.exists(tzdata_path)):
         shutil.rmtree(tzdata_path)
-    download_tzdata_on_windows()
+    with pytest.warns(FutureWarning, match="deprecated"):
+        download_tzdata_on_windows()
 
     # Inspect the folder
     assert os.path.exists(tzdata_path)

python/pyarrow/util.py

@@ -260,7 +260,7 @@ def download_tzdata_on_windows():
     warnings.warn(
         "pyarrow.util.download_tzdata_on_windows is deprecated as of 24.0.0 "
         "and will be removed in a future version. PyArrow now uses the "
-        "operating system's timezone database on Windows.",
+        "operating system's timezone database on most Windows builds.",
         FutureWarning,
         stacklevel=2
     )