Skip to content

Commit a39d9c8

Browse files
TomAugspurgerjreback
authored andcommitted
CI: Use conda for 3.8 build (#29696)
1 parent d134b47 commit a39d9c8

File tree

4 files changed

+19
-29
lines changed

4 files changed

+19
-29
lines changed

.travis.yml

+3-5
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,9 @@ matrix:
3030
- python: 3.5
3131

3232
include:
33-
- dist: bionic
34-
# 18.04
35-
python: 3.8.0
33+
- dist: trusty
3634
env:
37-
- JOB="3.8-dev" PATTERN="(not slow and not network)"
35+
- JOB="3.8" ENV_FILE="ci/deps/travis-38.yaml" PATTERN="(not slow and not network)"
3836

3937
- dist: trusty
4038
env:
@@ -88,7 +86,7 @@ install:
8886
script:
8987
- echo "script start"
9088
- echo "$JOB"
91-
- if [ "$JOB" != "3.8-dev" ]; then source activate pandas-dev; fi
89+
- source activate pandas-dev
9290
- ci/run_tests.sh
9391

9492
after_script:

ci/build38.sh

-19
This file was deleted.

ci/deps/travis-38.yaml

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
name: pandas-dev
2+
channels:
3+
- defaults
4+
- conda-forge
5+
dependencies:
6+
- python=3.8.*
7+
- cython>=0.29.13
8+
- numpy
9+
- python-dateutil
10+
- nomkl
11+
- pytz
12+
# universal
13+
- pytest>=5.0.0
14+
- pytest-xdist>=1.29.0
15+
- hypothesis>=3.58.0
16+
- pip

ci/setup_env.sh

-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
#!/bin/bash -e
22

3-
if [ "$JOB" == "3.8-dev" ]; then
4-
/bin/bash ci/build38.sh
5-
exit 0
6-
fi
7-
83
# edit the locale file if needed
94
if [ -n "$LOCALE_OVERRIDE" ]; then
105
echo "Adding locale to the first line of pandas/__init__.py"

0 commit comments

Comments
 (0)