Skip to content

Commit 31edd0e

Browse files
committed
ci
1 parent efa177d commit 31edd0e

File tree

2 files changed

+29
-13
lines changed

2 files changed

+29
-13
lines changed

.travis.yml

+6-1
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,11 @@ matrix:
4242
env:
4343
- JOB="3.6, coverage" ENV_FILE="ci/deps/travis-36-cov.yaml" PATTERN="((not slow and not network) or (single and db))" PANDAS_TESTING_MODE="deprecate" COVERAGE=true
4444

45+
- dist: trusty
46+
python: "3.8-dev"
47+
env:
48+
- JOB="3.8-dev"
49+
4550
# In allow_failures
4651
- dist: trusty
4752
env:
@@ -88,7 +93,7 @@ before_script:
8893

8994
script:
9095
- echo "script start"
91-
- source activate pandas-dev
96+
- if [[ -v PENV_FILE]]; then source activate pandas-dev; fi
9297
- ci/run_tests.sh
9398

9499
after_script:

ci/setup_env.sh

+23-12
Original file line numberDiff line numberDiff line change
@@ -91,27 +91,38 @@ conda list
9191
conda remove --all -q -y -n pandas-dev
9292

9393
echo
94-
echo "conda env create -q --file=${ENV_FILE}"
95-
time conda env create -q --file="${ENV_FILE}"
94+
if [[ -v ENV_FILE ]]; then
95+
echo "conda env create -q --file=${ENV_FILE}"
96+
time conda env create -q --file="${ENV_FILE}"
97+
else
98+
# python dev
99+
python3 -m pip install -U pip wheel setuptools
100+
python3 -m pip install Cython pytz python-dateutil pytest pytest-xdist hypothesis
101+
python3 -m pip install git+https://github.com/numpy/numpy
102+
fi;
96103

97104

98105
if [[ "$BITS32" == "yes" ]]; then
99106
# activate 32-bit compiler
100107
export CONDA_BUILD=1
101108
fi
102109

103-
echo "activate pandas-dev"
104-
source activate pandas-dev
110+
if [[ -v ENV_FILE ]]; then
111+
echo "activate pandas-dev"
112+
source activate pandas-dev
105113

106-
echo
107-
echo "remove any installed pandas package"
108-
echo "w/o removing anything else"
109-
conda remove pandas -y --force || true
110-
pip uninstall -y pandas || true
114+
echo
115+
echo "remove any installed pandas package"
116+
echo "w/o removing anything else"
117+
conda remove pandas -y --force || true
118+
pip uninstall -y pandas || true
111119

112-
echo
113-
echo "conda list pandas"
114-
conda list pandas
120+
echo
121+
echo "conda list pandas"
122+
conda list pandas
123+
else
124+
python3 -m pip list
125+
fi
115126

116127
# Make sure any error below is reported as such
117128

0 commit comments

Comments
 (0)