diff --git a/ci/conda_env_archery.txt b/ci/conda_env_archery.txt index f1de5b198905..f2317b8d9b41 100644 --- a/ci/conda_env_archery.txt +++ b/ci/conda_env_archery.txt @@ -20,12 +20,9 @@ click # bot, crossbow jinja2 -jira pygit2 pygithub ruamel.yaml -setuptools_scm -toolz # benchmark pandas diff --git a/ci/conda_env_gandiva.txt b/ci/conda_env_gandiva.txt index 217936e2c947..7127dc905586 100644 --- a/ci/conda_env_gandiva.txt +++ b/ci/conda_env_gandiva.txt @@ -15,5 +15,5 @@ # specific language governing permissions and limitations # under the License. -clang>=11 -llvmdev>=11 +clang +llvmdev<23 diff --git a/ci/docker/conda-cpp.dockerfile b/ci/docker/conda-cpp.dockerfile index 4340a18f6eea..ef24197dfd3b 100644 --- a/ci/docker/conda-cpp.dockerfile +++ b/ci/docker/conda-cpp.dockerfile @@ -23,8 +23,6 @@ FROM --platform=linux/${arch} ${repo}:${arch_short}-conda COPY ci/scripts/install_minio.sh /arrow/ci/scripts RUN /arrow/ci/scripts/install_minio.sh latest /opt/conda -ARG python=3.11 - # install the required conda packages into the test environment # use `mold` to work around issues with GNU `ld` (GH-47015). COPY ci/conda_env_cpp.txt \ @@ -37,7 +35,6 @@ RUN mamba install -q -y \ doxygen \ libnuma \ mold \ - python=${python} \ valgrind && \ mamba clean --all --yes diff --git a/ci/docker/conda-integration.dockerfile b/ci/docker/conda-integration.dockerfile index 272141b604e0..27f34d3f23ef 100644 --- a/ci/docker/conda-integration.dockerfile +++ b/ci/docker/conda-integration.dockerfile @@ -30,11 +30,8 @@ ARG jdk=17 # Install Archery and integration dependencies COPY ci/conda_env_archery.txt /arrow/ci/ -# Pin Python until pythonnet is made compatible with 3.12 -# (https://github.com/pythonnet/pythonnet/pull/2249) RUN mamba install -q -y \ --file arrow/ci/conda_env_archery.txt \ - "python < 3.12" \ numpy \ compilers \ go \ diff --git a/ci/docker/conda-python.dockerfile b/ci/docker/conda-python.dockerfile index 1a438d087f90..8c033dd97626 100644 --- a/ci/docker/conda-python.dockerfile +++ b/ci/docker/conda-python.dockerfile @@ -21,7 +21,7 @@ ARG arch_short FROM --platform=linux/${arch} ${repo}:${arch_short}-conda-cpp # install python specific packages -ARG python=3.11 +ARG python=3.14 COPY ci/conda_env_python.txt \ /arrow/ci/ # If the Python version being tested is the same as the Python used by the system gdb, diff --git a/compose.yaml b/compose.yaml index b44d8c836a56..5cf62a13aa20 100644 --- a/compose.yaml +++ b/compose.yaml @@ -1869,7 +1869,10 @@ services: volumes: *conda-volumes environment: <<: [*common, *ccache, *sccache] + ARCHERY_INTEGRATION_WITH_DOTNET: 0 ARCHERY_INTEGRATION_WITH_GO: 0 + ARCHERY_INTEGRATION_WITH_JAVA: 0 + ARCHERY_INTEGRATION_WITH_JS: 0 ARCHERY_INTEGRATION_WITH_NANOARROW: 0 ARCHERY_INTEGRATION_WITH_RUST: 0 # Tell Archery where Arrow binaries are located