Skip to content

Commit 27aae22

Browse files
authored
CI/CLN: update travis (#36514)
1 parent 3a19556 commit 27aae22

File tree

3 files changed

+12
-23
lines changed

3 files changed

+12
-23
lines changed

.travis.yml

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
11
language: python
22
python: 3.7
33

4+
addons:
5+
apt:
6+
update: true
7+
packages:
8+
- xvfb
9+
10+
services:
11+
- xvfb
12+
413
# To turn off cached cython files and compiler cache
514
# set NOCACHE-true
615
# To delete caches go to https://travis-ci.org/OWNER/REPOSITORY/caches or run
@@ -10,30 +19,27 @@ cache:
1019
ccache: true
1120
directories:
1221
- $HOME/.cache # cython cache
13-
- $HOME/.ccache # compiler cache
1422

1523
env:
1624
global:
17-
# Variable for test workers
1825
- PYTEST_WORKERS="auto"
1926
# create a github personal access token
2027
# cd pandas-dev/pandas
2128
# travis encrypt 'PANDAS_GH_TOKEN=personal_access_token' -r pandas-dev/pandas
2229
- secure: "EkWLZhbrp/mXJOx38CHjs7BnjXafsqHtwxPQrqWy457VDFWhIY1DMnIR/lOWG+a20Qv52sCsFtiZEmMfUjf0pLGXOqurdxbYBGJ7/ikFLk9yV2rDwiArUlVM9bWFnFxHvdz9zewBH55WurrY4ShZWyV+x2dWjjceWG5VpWeI6sA="
2330

2431
git:
25-
# for cloning
2632
depth: false
2733

2834
matrix:
2935
fast_finish: true
3036

3137
include:
32-
# In allowed failures
3338
- dist: bionic
3439
python: 3.9-dev
3540
env:
3641
- JOB="3.9-dev" PATTERN="(not slow and not network and not clipboard)"
42+
3743
- env:
3844
- JOB="3.8" ENV_FILE="ci/deps/travis-38.yaml" PATTERN="(not slow and not network and not clipboard)"
3945

@@ -42,7 +48,7 @@ matrix:
4248

4349
- arch: arm64
4450
env:
45-
- JOB="3.7, arm64" PYTEST_WORKERS=8 ENV_FILE="ci/deps/travis-37-arm64.yaml" PATTERN="(not slow and not network and not clipboard and not arm_slow)"
51+
- JOB="3.7, arm64" PYTEST_WORKERS=1 ENV_FILE="ci/deps/travis-37-arm64.yaml" PATTERN="(not slow and not network and not clipboard and not arm_slow)"
4652

4753
- env:
4854
- JOB="3.7, locale" ENV_FILE="ci/deps/travis-37-locale.yaml" PATTERN="((not slow and not network and not clipboard) or (single and db))" LOCALE_OVERRIDE="zh_CN.UTF-8" SQL="1"
@@ -71,12 +77,6 @@ before_install:
7177
- uname -a
7278
- git --version
7379
- ./ci/check_git_tags.sh
74-
# Because travis runs on Google Cloud and has a /etc/boto.cfg,
75-
# it breaks moto import, see:
76-
# https://github.com/spulec/moto/issues/1771
77-
# https://github.com/boto/boto/issues/3741
78-
# This overrides travis and tells it to look nowhere.
79-
- export BOTO_CONFIG=/dev/null
8080

8181
install:
8282
- echo "install start"

ci/build39.sh

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#!/bin/bash -e
22
# Special build for python3.9 until numpy puts its own wheels up
33

4-
sudo apt-get install build-essential gcc xvfb
54
pip install --no-deps -U pip wheel setuptools
65
pip install cython numpy python-dateutil pytz pytest pytest-xdist hypothesis
76

ci/setup_env.sh

+1-11
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,7 @@ else
4242
fi
4343

4444
if [ "${TRAVIS_CPU_ARCH}" == "arm64" ]; then
45-
sudo apt-get update
46-
sudo apt-get -y install xvfb
47-
CONDA_URL="https://github.com/conda-forge/miniforge/releases/download/4.8.5-0/Miniforge3-4.8.5-0-Linux-aarch64.sh"
45+
CONDA_URL="https://github.com/conda-forge/miniforge/releases/download/4.8.5-1/Miniforge3-4.8.5-1-Linux-aarch64.sh"
4846
else
4947
CONDA_URL="https://repo.continuum.io/miniconda/Miniconda3-latest-$CONDA_OS.sh"
5048
fi
@@ -100,8 +98,6 @@ echo "conda list (root environment)"
10098
conda list
10199

102100
# Clean up any left-over from a previous build
103-
# (note workaround for https://github.com/conda/conda/issues/2679:
104-
# `conda env remove` issue)
105101
conda remove --all -q -y -n pandas-dev
106102

107103
echo
@@ -142,12 +138,6 @@ conda list pandas
142138
echo "[Build extensions]"
143139
python setup.py build_ext -q -i -j2
144140

145-
# TODO: Some of our environments end up with old versions of pip (10.x)
146-
# Adding a new enough version of pip to the requirements explodes the
147-
# solve time. Just using pip to update itself.
148-
# - py35_macos
149-
# - py35_compat
150-
# - py36_32bit
151141
echo "[Updating pip]"
152142
python -m pip install --no-deps -U pip wheel setuptools
153143

0 commit comments

Comments
 (0)