diff --git a/.travis.yml b/.travis.yml index 2bf72bd159fc2..1ddd886699d38 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,11 +35,6 @@ matrix: fast_finish: true include: - - dist: bionic - python: 3.9-dev - env: - - JOB="3.9-dev" PATTERN="(not slow and not network and not clipboard)" - - env: - JOB="3.8, slow" ENV_FILE="ci/deps/travis-38-slow.yaml" PATTERN="slow" SQL="1" services: @@ -94,7 +89,7 @@ install: script: - echo "script start" - echo "$JOB" - - if [ "$JOB" != "3.9-dev" ]; then source activate pandas-dev; fi + - source activate pandas-dev - ci/run_tests.sh after_script: diff --git a/ci/azure/posix.yml b/ci/azure/posix.yml index 3a9bb14470692..8e44db0b4bcd4 100644 --- a/ci/azure/posix.yml +++ b/ci/azure/posix.yml @@ -61,6 +61,11 @@ jobs: PANDAS_TESTING_MODE: "deprecate" EXTRA_APT: "xsel" + py39: + ENV_FILE: ci/deps/azure-39.yaml + CONDA_PY: "39" + PATTERN: "not slow and not network and not clipboard" + steps: - script: | if [ "$(uname)" == "Linux" ]; then diff --git a/ci/build39.sh b/ci/build39.sh deleted file mode 100755 index faef2be03c2bb..0000000000000 --- a/ci/build39.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash -e -# Special build for python3.9 until numpy puts its own wheels up - -pip install --no-deps -U pip wheel setuptools -pip install cython numpy python-dateutil pytz pytest pytest-xdist hypothesis - -python setup.py build_ext -inplace -python -m pip install --no-build-isolation -e . - -python -c "import sys; print(sys.version_info)" -python -c "import pandas as pd" -python -c "import hypothesis" diff --git a/ci/deps/azure-39.yaml b/ci/deps/azure-39.yaml new file mode 100644 index 0000000000000..67edc83a9d738 --- /dev/null +++ b/ci/deps/azure-39.yaml @@ -0,0 +1,17 @@ +name: pandas-dev +channels: + - conda-forge +dependencies: + - python=3.9.* + + # tools + - cython>=0.29.21 + - pytest>=5.0.1 + - pytest-xdist>=1.21 + - hypothesis>=3.58.0 + - pytest-azurepipelines + + # pandas dependencies + - numpy + - python-dateutil + - pytz diff --git a/ci/setup_env.sh b/ci/setup_env.sh index 247f809c5fe63..8984fa2d9a9be 100755 --- a/ci/setup_env.sh +++ b/ci/setup_env.sh @@ -1,10 +1,5 @@ #!/bin/bash -e -if [ "$JOB" == "3.9-dev" ]; then - /bin/bash ci/build39.sh - exit 0 -fi - # edit the locale file if needed if [[ "$(uname)" == "Linux" && -n "$LC_ALL" ]]; then echo "Adding locale to the first line of pandas/__init__.py"