Skip to content

Commit 4c0c1e2

Browse files
pitroukszucs
authored andcommitted
ARROW-7219: [Python] [CI] Test with pickle5 installed
Closes apache#6183 from pitrou/ARROW-7219-install-pickle5 and squashes the following commits: 41acad6 <Antoine Pitrou> ARROW-7219: Test with pickle5 installed Authored-by: Antoine Pitrou <antoine@python.org> Signed-off-by: Krisztián Szűcs <szucs.krisztian@gmail.com>
1 parent 90c0459 commit 4c0c1e2

4 files changed

Lines changed: 4 additions & 3 deletions

File tree

ci/docker/conda-python.dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ COPY ci/conda_env_python.yml /arrow/ci/
2525
RUN conda install -q \
2626
--file arrow/ci/conda_env_python.yml \
2727
$([ "$python" == "2.7" ] && echo "futures enum34") \
28+
$([ "$python" == "3.6" -o "$python" == "3.7" ] && echo "pickle5") \
2829
python=${python} \
2930
nomkl && \
3031
conda clean --all

ci/docker/linux-apt-python-3.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ COPY python/requirements.txt \
3636
RUN pip install \
3737
-r arrow/python/requirements.txt \
3838
-r arrow/python/requirements-test.txt \
39-
cython setuptools
39+
setuptools
4040

4141
ENV ARROW_PYTHON=ON \
4242
ARROW_BUILD_STATIC=OFF \

ci/docker/linux-dnf-python-3.dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@ COPY python/requirements.txt \
3232

3333
RUN pip install \
3434
-r arrow/python/requirements.txt \
35-
-r arrow/python/requirements-test.txt \
36-
cython
35+
-r arrow/python/requirements-test.txt
3736

3837
ENV ARROW_PYTHON=ON \
3938
ARROW_BUILD_STATIC=OFF \

python/requirements-test.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ cython
22
hypothesis
33
pandas
44
pathlib2; python_version < "3.4"
5+
pickle5; python_version == "3.6" or python_version == "3.7"
56
pytest
67
pytest-lazy-fixture
78
pytz

0 commit comments

Comments
 (0)