Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions ci/conda_env_archery.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,9 @@ click

# bot, crossbow
jinja2
jira
pygit2
pygithub
ruamel.yaml
setuptools_scm
toolz

# benchmark
pandas
Expand Down
4 changes: 2 additions & 2 deletions ci/conda_env_gandiva.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@
# specific language governing permissions and limitations
# under the License.

clang>=11
llvmdev>=11
clang
llvmdev<23
3 changes: 0 additions & 3 deletions ci/docker/conda-cpp.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -37,7 +35,6 @@ RUN mamba install -q -y \
doxygen \
libnuma \
mold \
python=${python} \
valgrind && \
mamba clean --all --yes

Expand Down
3 changes: 0 additions & 3 deletions ci/docker/conda-integration.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion ci/docker/conda-python.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
3 changes: 3 additions & 0 deletions compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading