Skip to content

CI: Use conda for 3.8 build #29696

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 19, 2019
Merged

CI: Use conda for 3.8 build #29696

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cb86e36
CI: Use conda for 3.8 build
TomAugspurger Nov 18, 2019
d67de28
minimal deps
TomAugspurger Nov 18, 2019
2accc6c
fixup
TomAugspurger Nov 18, 2019
8ee8053
fixup
TomAugspurger Nov 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,9 @@ matrix:
- python: 3.5

include:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any reason for changing this to trusty? Isn’t that an older image?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The database services weren't starting up with bionic. Haven't looked into the differences at all.

- dist: bionic
# 18.04
python: 3.8.0
- dist: trusty
env:
- JOB="3.8-dev" PATTERN="(not slow and not network)"
- JOB="3.8" ENV_FILE="ci/deps/travis-38.yaml" PATTERN="(not slow and not network)"

- dist: trusty
env:
Expand Down Expand Up @@ -88,7 +86,7 @@ install:
script:
- echo "script start"
- echo "$JOB"
- if [ "$JOB" != "3.8-dev" ]; then source activate pandas-dev; fi
- source activate pandas-dev
- ci/run_tests.sh

after_script:
Expand Down
19 changes: 0 additions & 19 deletions ci/build38.sh
View file
Open in desktop

This file was deleted.

16 changes: 16 additions & 0 deletions ci/deps/travis-38.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: pandas-dev
channels:
- defaults
- conda-forge
dependencies:
- python=3.8.*
- cython>=0.29.13
- numpy
- python-dateutil
- nomkl
- pytz
# universal
- pytest>=5.0.0
- pytest-xdist>=1.29.0
- hypothesis>=3.58.0
- pip
5 changes: 0 additions & 5 deletions ci/setup_env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
#!/bin/bash -e

if [ "$JOB" == "3.8-dev" ]; then
/bin/bash ci/build38.sh
exit 0
fi

# edit the locale file if needed
if [ -n "$LOCALE_OVERRIDE" ]; then
echo "Adding locale to the first line of pandas/__init__.py"
Expand Down