Skip to content

Commit 345e9fc

Browse files
Backport PR pandas-dev#37039: CI: move py39 build to conda pandas-dev#33948 (pandas-dev#38059)
Co-authored-by: Fangchen Li <[email protected]>
1 parent 288e319 commit 345e9fc

File tree

5 files changed

+23
-27
lines changed

5 files changed

+23
-27
lines changed

.travis.yml

+1-9
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,6 @@ matrix:
2929
fast_finish: true
3030

3131
include:
32-
# In allowed failures
33-
- dist: bionic
34-
python: 3.9-dev
35-
env:
36-
- JOB="3.9-dev" PATTERN="(not slow and not network and not clipboard)"
37-
- env:
38-
- JOB="3.8" ENV_FILE="ci/deps/travis-38.yaml" PATTERN="(not slow and not network and not clipboard)"
39-
4032
- env:
4133
- JOB="3.7" ENV_FILE="ci/deps/travis-37.yaml" PATTERN="(not slow and not network and not clipboard)"
4234

@@ -92,7 +84,7 @@ install:
9284
script:
9385
- echo "script start"
9486
- echo "$JOB"
95-
- if [ "$JOB" != "3.9-dev" ]; then source activate pandas-dev; fi
87+
- source activate pandas-dev
9688
- ci/run_tests.sh
9789

9890
after_script:

ci/azure/posix.yml

+5
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,11 @@ jobs:
6565
PANDAS_TESTING_MODE: "deprecate"
6666
EXTRA_APT: "xsel"
6767

68+
py39:
69+
ENV_FILE: ci/deps/azure-39.yaml
70+
CONDA_PY: "39"
71+
PATTERN: "not slow and not network and not clipboard"
72+
6873
steps:
6974
- script: |
7075
if [ "$(uname)" == "Linux" ]; then

ci/build39.sh

-13
This file was deleted.

ci/deps/azure-39.yaml

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: pandas-dev
2+
channels:
3+
- conda-forge
4+
dependencies:
5+
- python=3.9.*
6+
7+
# tools
8+
- cython>=0.29.21
9+
- pytest>=5.0.1
10+
- pytest-xdist>=1.21
11+
- hypothesis>=3.58.0
12+
- pytest-azurepipelines
13+
14+
# pandas dependencies
15+
- numpy
16+
- python-dateutil
17+
- pytz

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.9-dev" ]; then
4-
/bin/bash ci/build39.sh
5-
exit 0
6-
fi
7-
83
# edit the locale file if needed
94
if [[ "$(uname)" == "Linux" && -n "$LC_ALL" ]]; then
105
echo "Adding locale to the first line of pandas/__init__.py"

0 commit comments

Comments
 (0)