Arrow 16 Updates - fixes actions

cylondata · Dec 12, 2024 · 4810d09 · 4810d09
1 parent 3d3e28b
commit 4810d09
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 11 deletions.
diff --git a/.github/workflows/conda-actions.yml b/.github/workflows/conda-actions.yml
@@ -51,6 +51,8 @@ jobs:
 
     - uses: conda-incubator/setup-miniconda@v2
       with:
+        miniconda-version: "latest"  # You can specify a version or leave it as "latest"
+        auto-update-conda: true
         activate-environment: gcylon_dev
         environment-file: conda/environments/gcylon.yml
 

diff --git a/.github/workflows/conda-cpp-redis.yml b/.github/workflows/conda-cpp-redis.yml
@@ -38,6 +38,8 @@ jobs:
 
       - uses: conda-incubator/setup-miniconda@v2
         with:
+          miniconda-version: "latest"  # You can specify a version or leave it as "latest"
+          auto-update-conda: true
           activate-environment: cylon_dev
           environment-file: conda/environments/cylon.yml
 

diff --git a/.github/workflows/conda-cpp.yml b/.github/workflows/conda-cpp.yml
@@ -39,6 +39,8 @@ jobs:
 
       - uses: conda-incubator/setup-miniconda@v2
         with:
+          miniconda-version: "latest"  # You can specify a version or leave it as "latest"
+          auto-update-conda: true
           activate-environment: cylon_dev
           environment-file: conda/environments/cylon_NoUCX.yml
 

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -31,6 +31,8 @@ jobs:
 
       - uses: conda-incubator/setup-miniconda@v2
         with:
+          miniconda-version: "latest"  # You can specify a version or leave it as "latest"
+          auto-update-conda: true
           activate-environment: cylon_dev
           environment-file: conda/environments/cylon_MacOS.yml
 

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -27,6 +27,8 @@ jobs:
       - uses: actions/checkout@v2
       - uses: conda-incubator/setup-miniconda@v2
         with:
+          miniconda-version: "latest"  # You can specify a version or leave it as "latest"
+          auto-update-conda: true
           activate-environment: cylon_dev
           environment-file: conda/environments/windows.yml
 

diff --git a/conda/environments/cylon_NoUCX.yml b/conda/environments/cylon_NoUCX.yml
@@ -3,15 +3,17 @@ channels:
   - conda-forge
   - defaults
 dependencies:
-  - python>=3.8,<3.10
-  - cmake>=3.23.1,!=3.25.0
-  - arrow-cpp=9
-  - pyarrow=9.0.0
+  - python>=3.9,<3.12
+  - cmake
+  - pyarrow=16.1.0
+  - libarrow-acero==16.1.0.*
+  - libarrow-dataset==16.1.0.*
+  - libarrow==16.1.0.*
   - glog
-  - openmpi=4.1.3=ha1ae619_105
-  - cython>=0.29.31,<3
-  - numpy<1.24.4
-  - pandas>=1.0,<2.0.0
+  - openmpi
+  - cython>=0.29.31
+  - numpy>=1.23,<2.0a0
+  - pandas>=2.0,<2.2.3dev
   - fsspec>=0.6.0
   - setuptools
   # they are not needed for using pygcylon or compiling it

diff --git a/cpp/CMake/Modules/SetupCxxFlags.cmake b/cpp/CMake/Modules/SetupCxxFlags.cmake
@@ -117,9 +117,9 @@ if(CYLON_CPU_FLAG STREQUAL "armv8")
     if(NOT CXX_SUPPORTS_ARMV8_ARCH)
         message(FATAL_ERROR "Unsupported arch flag: ${CYLON_ARMV8_ARCH_FLAG}.")
     endif()
-    if(CYLON_ARMV8_ARCH_FLAG MATCHES "native")
-        message(FATAL_ERROR "native arch not allowed, please specify arch explicitly.")
-    endif()
+#    if(CYLON_ARMV8_ARCH_FLAG MATCHES "native")
+#        message(FATAL_ERROR "native arch not allowed, please specify arch explicitly.")
+    #endif()
     set(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} ${CYLON_ARMV8_ARCH_FLAG}")
 
     add_definitions(-DCYLON_HAVE_NEON)