Skip to content
This repository was archived by the owner on May 3, 2023. It is now read-only.

Commit c85edad

Browse files
3.8 master (#64)
* Add 3.8 build to master * temporily bump to 0.25.x * fixed merge conflict * Add Mac job * trigger ci
1 parent 1508d26 commit c85edad

File tree

3 files changed

+27
-6
lines changed

3 files changed

+27
-6
lines changed

.travis.yml

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ env:
22
global:
33
- REPO_DIR=pandas
44
# on release change this to a version
5-
- BUILD_COMMIT=v0.25.1
5+
- BUILD_COMMIT=0.25.x
66
- PLAT=x86_64
77
- UNICODE_WIDTH=32
88
- MB_PYTHON_OSX_VER=10.9
@@ -27,6 +27,19 @@ matrix:
2727
# Exclude the default Python 3.5 build
2828
- python: 3.5
2929
include:
30+
- os: linux
31+
env:
32+
- MB_PYTHON_VERSION=3.8
33+
- NP_BUILD_DEP="numpy==1.18.0.dev0"
34+
- NP_TEST_DEP="numpy==1.18.0.dev0"
35+
36+
- os: osx
37+
language: generic
38+
env:
39+
- MB_PYTHON_VERSION=3.8
40+
- NP_BUILD_DEP="numpy==1.18.0.dev0"
41+
- NP_TEST_DEP="numpy==1.18.0.dev0"
42+
3043
- os: linux
3144
env:
3245
- MB_PYTHON_VERSION=3.5
@@ -71,10 +84,8 @@ before_install:
7184
- python -c "import fcntl; fcntl.fcntl(1, fcntl.F_SETFL, 0)"
7285
- CONTAINER="wheels"; # pre-relesae
7386
- BUILD_COMMIT=$BUILD_COMMIT;
74-
- BUILD_DEPENDS="$NP_BUILD_DEP $EXTRA_BUILD_DEP Cython==0.28.2"
75-
# binary-only for cryptogrpahy. See https://github.com/pandas-dev/pandas/issues/26589
76-
# Moto picks it up, and they don't distribute 32-bit wheels.
77-
- TEST_DEPENDS="$NP_TEST_DEP pytest>=4.0.2 pytest-xdist pytest-mock moto hypothesis>=3.58 wheel==0.31.1 cryptography --only-binary=cryptography"
87+
- BUILD_DEPENDS="$NP_BUILD_DEP $EXTRA_BUILD_DEP Cython"
88+
- TEST_DEPENDS="$NP_TEST_DEP pytest>=4.0.2 pytest-xdist hypothesis"
7889
- source multibuild/common_utils.sh
7990
- source multibuild/travis_steps.sh
8091
- before_install

config.sh

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,16 @@ function build_wheel {
2121
build_bdist_wheel $@
2222
}
2323

24+
25+
function pip_opts {
26+
# Add pre-release index until official NumPy release with 3.8
27+
if [ -n "$MANYLINUX_URL" ]; then
28+
echo "--find-links $MANYLINUX_URL --find-links=https://7933911d6844c6c53a7d-47bd50c35cd79bd838daf386af554a83.ssl.cf2.rackcdn.com"
29+
else
30+
echo "--find-links=https://7933911d6844c6c53a7d-47bd50c35cd79bd838daf386af554a83.ssl.cf2.rackcdn.com"
31+
fi
32+
}
33+
2434
function run_tests {
2535
# Runs tests on installed distribution from an empty directory
2636
export PYTHONHASHSEED=$(python -c 'import random; print(random.randint(1, 4294967295))')

0 commit comments

Comments
 (0)