Skip to content

Commit e3ef285

Browse files
brahmaneyarthhenryre
authored
Update build to support Python 3.8 (#1628)
* Bump scikit-learn version * Update setup.py Co-authored-by: Roman Yurchak <[email protected]> * Update build environment * Update build environment * Update build environment * Update build environment * Update requirements * Add Python 3.8 build * Reduce required build steps for non-3.6 versions Co-authored-by: Roman Yurchak <[email protected]> Co-authored-by: Henry Ehrenberg <[email protected]>
1 parent ed77718 commit e3ef285

File tree

3 files changed

+22
-12
lines changed

3 files changed

+22
-12
lines changed

.travis.yml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,23 @@ jobs:
1919
- if: type = pull_request
2020
name: "Python 3.7: unit tests"
2121
python: 3.7
22-
env: TOXENV=coverage,doctest,type,check TOX_INSTALL_DIR=.env JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
22+
env: TOXENV=type,check TOX_INSTALL_DIR=.env JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
23+
- if: type = pull_request
24+
name: "Python 3.8: unit tests"
25+
python: 3.8
26+
env: TOXENV=type,check TOX_INSTALL_DIR=.env JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
2327
- if: type != pull_request
2428
name: "Python 3.6: unit + integration tests"
2529
python: 3.6
2630
env: TOXENV=coverage,complex,spark,doctest,type,check TOX_INSTALL_DIR=.env JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
2731
- if: type != pull_request
2832
name: "Python 3.7: unit + integration tests"
2933
python: 3.7
30-
env: TOXENV=coverage,complex,spark,doctest,type,check TOX_INSTALL_DIR=.env JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
34+
env: TOXENV=complex,spark,type,check TOX_INSTALL_DIR=.env JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
35+
- if: type != pull_request
36+
name: "Python 3.8: unit + integration tests"
37+
python: 3.8
38+
env: TOXENV=complex,type,check TOX_INSTALL_DIR=.env JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
3139

3240
# Install JDK8 for PySpark tests
3341
before_install:
@@ -37,10 +45,10 @@ before_install:
3745
- sudo update-java-alternatives -s java-1.8.0-openjdk-amd64
3846

3947
install:
40-
- pip install -U pip setuptools
48+
- pip install -U pip setuptools wheel
4149
- pip install -U tox==3.12.0
4250
- pip install -U codecov
43-
- tox --notest
51+
- travis_wait 15 tox --notest
4452

4553
script:
4654
- tox

requirements.txt

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99
#### ESSENTIAL LIBRARIES
1010

1111
# General scientific computing
12-
numpy>=1.16.0,<2.0.0
12+
numpy>=1.16.0,<1.20.0
1313
scipy>=1.2.0,<2.0.0
1414

1515
# Data storage and function application
1616
pandas>=0.25.0,<2.0.0
1717
tqdm>=4.33.0,<5.0.0
1818

1919
# Internal models
20-
scikit-learn>=0.20.2,<0.22.0
20+
scikit-learn>=0.20.2,<0.25.0
2121
torch>=1.2.0,<2.0.0
2222
munkres>=1.0.6
2323

@@ -29,13 +29,15 @@ tensorboard>=1.14.0,<2.0.0
2929

3030
#### EXTRA/TEST LIBRARIES
3131

32-
# NLP applications
32+
# spaCy (NLP)
3333
spacy>=2.1.0,<3.0.0
34+
blis>=0.3.0,<0.5.0
3435

35-
# Scale-up/out
36-
dask[complete]>=2.1.0,<3.0.0
36+
# Dask (parallelism)
37+
dask[dataframe]>=2.1.0,<2.31.0
38+
distributed>=2.1.0,<2.31.0
3739

38-
# Serialization
40+
# Dill (serialization)
3941
dill>=0.3.0,<0.4.0
4042

4143

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@
3636
include_package_data=True,
3737
install_requires=[
3838
"munkres>=1.0.6",
39-
"numpy>=1.16.0,<2.0.0",
39+
"numpy>=1.16.0,<1.20.0",
4040
"scipy>=1.2.0,<2.0.0",
4141
"pandas>=0.25.0,<2.0.0",
4242
"tqdm>=4.33.0,<5.0.0",
43-
"scikit-learn>=0.20.2,<0.22.0",
43+
"scikit-learn>=0.20.2,<0.25.0",
4444
"torch>=1.2.0,<2.0.0",
4545
"tensorboard>=1.14.0,<2.0.0",
4646
"networkx>=2.2,<2.4",

0 commit comments

Comments
 (0)