Skip to content

Commit 16d7028

Browse files
committed
MINOR: [Dev][CI] Remove outdated pins
1 parent 397b3d0 commit 16d7028

6 files changed

Lines changed: 6 additions & 12 deletions

File tree

‎ci/conda_env_archery.txt‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,9 @@ click
2020

2121
# bot, crossbow
2222
jinja2
23-
jira
2423
pygit2
2524
pygithub
2625
ruamel.yaml
27-
setuptools_scm
28-
toolz
2926

3027
# benchmark
3128
pandas

‎ci/conda_env_gandiva.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@
1515
# specific language governing permissions and limitations
1616
# under the License.
1717

18-
clang>=11
19-
llvmdev>=11
18+
clang
19+
llvmdev<23

‎ci/docker/conda-cpp.dockerfile‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ FROM --platform=linux/${arch} ${repo}:${arch_short}-conda
2323
COPY ci/scripts/install_minio.sh /arrow/ci/scripts
2424
RUN /arrow/ci/scripts/install_minio.sh latest /opt/conda
2525

26-
ARG python=3.11
27-
2826
# install the required conda packages into the test environment
2927
# use `mold` to work around issues with GNU `ld` (GH-47015).
3028
COPY ci/conda_env_cpp.txt \
@@ -37,7 +35,6 @@ RUN mamba install -q -y \
3735
doxygen \
3836
libnuma \
3937
mold \
40-
python=${python} \
4138
valgrind && \
4239
mamba clean --all --yes
4340

‎ci/docker/conda-integration.dockerfile‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,8 @@ ARG jdk=17
3030
# Install Archery and integration dependencies
3131
COPY ci/conda_env_archery.txt /arrow/ci/
3232

33-
# Pin Python until pythonnet is made compatible with 3.12
34-
# (https://github.com/pythonnet/pythonnet/pull/2249)
3533
RUN mamba install -q -y \
3634
--file arrow/ci/conda_env_archery.txt \
37-
"python < 3.12" \
3835
numpy \
3936
compilers \
4037
go \

‎ci/docker/conda-python.dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ ARG arch_short
2121
FROM --platform=linux/${arch} ${repo}:${arch_short}-conda-cpp
2222

2323
# install python specific packages
24-
ARG python=3.11
24+
ARG python=3.14
2525
COPY ci/conda_env_python.txt \
2626
/arrow/ci/
2727
# If the Python version being tested is the same as the Python used by the system gdb,

‎compose.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1869,7 +1869,10 @@ services:
18691869
volumes: *conda-volumes
18701870
environment:
18711871
<<: [*common, *ccache, *sccache]
1872+
ARCHERY_INTEGRATION_WITH_DOTNET: 0
18721873
ARCHERY_INTEGRATION_WITH_GO: 0
1874+
ARCHERY_INTEGRATION_WITH_JAVA: 0
1875+
ARCHERY_INTEGRATION_WITH_JS: 0
18731876
ARCHERY_INTEGRATION_WITH_NANOARROW: 0
18741877
ARCHERY_INTEGRATION_WITH_RUST: 0
18751878
# Tell Archery where Arrow binaries are located

0 commit comments

Comments
 (0)