Skip to content
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

Update build to support Python 3.8 #1628

Merged
merged 9 commits into from
Feb 14, 2021
+22 −12
Merged

Update build to support Python 3.8 #1628

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
65ffc6b
Bump scikit-learn version
brahmaneya Feb 12, 2021
1b81a20
Update setup.py
brahmaneya Feb 12, 2021
55a6da9
Update build environment
henryre Feb 13, 2021
6aef711
Update build environment
henryre Feb 13, 2021
f673932
Update build environment
henryre Feb 13, 2021
aba5819
Update build environment
henryre Feb 13, 2021
1c00242
Update requirements
henryre Feb 13, 2021
00e2f81
Add Python 3.8 build
henryre Feb 13, 2021
af6f152
Reduce required build steps for non-3.6 versions
henryre Feb 14, 2021
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
16 changes: 12 additions & 4 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,23 @@ jobs:
- if: type = pull_request
name: "Python 3.7: unit tests"
python: 3.7
env: TOXENV=coverage,doctest,type,check TOX_INSTALL_DIR=.env JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
env: TOXENV=type,check TOX_INSTALL_DIR=.env JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
- if: type = pull_request
name: "Python 3.8: unit tests"
python: 3.8
env: TOXENV=type,check TOX_INSTALL_DIR=.env JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
- if: type != pull_request
name: "Python 3.6: unit + integration tests"
python: 3.6
env: TOXENV=coverage,complex,spark,doctest,type,check TOX_INSTALL_DIR=.env JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
- if: type != pull_request
name: "Python 3.7: unit + integration tests"
python: 3.7
env: TOXENV=coverage,complex,spark,doctest,type,check TOX_INSTALL_DIR=.env JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
env: TOXENV=complex,spark,type,check TOX_INSTALL_DIR=.env JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64
- if: type != pull_request
name: "Python 3.8: unit + integration tests"
python: 3.8
env: TOXENV=complex,type,check TOX_INSTALL_DIR=.env JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64

# Install JDK8 for PySpark tests
before_install:
Expand All @@ -37,10 +45,10 @@ before_install:
- sudo update-java-alternatives -s java-1.8.0-openjdk-amd64

install:
- pip install -U pip setuptools
- pip install -U pip setuptools wheel
- pip install -U tox==3.12.0
- pip install -U codecov
- tox --notest
- travis_wait 15 tox --notest

script:
- tox
Expand Down
14 changes: 8 additions & 6 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@
#### ESSENTIAL LIBRARIES

# General scientific computing
numpy>=1.16.0,<2.0.0
numpy>=1.16.0,<1.20.0
scipy>=1.2.0,<2.0.0

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

# Internal models
scikit-learn>=0.20.2,<0.22.0
scikit-learn>=0.20.2,<0.25.0
torch>=1.2.0,<2.0.0
munkres>=1.0.6

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

#### EXTRA/TEST LIBRARIES

# NLP applications
# spaCy (NLP)
spacy>=2.1.0,<3.0.0
blis>=0.3.0,<0.5.0

# Scale-up/out
dask[complete]>=2.1.0,<3.0.0
# Dask (parallelism)
dask[dataframe]>=2.1.0,<2.31.0
distributed>=2.1.0,<2.31.0

# Serialization
# Dill (serialization)
dill>=0.3.0,<0.4.0


Expand Down
4 changes: 2 additions & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@
include_package_data=True,
install_requires=[
"munkres>=1.0.6",
"numpy>=1.16.0,<2.0.0",
"numpy>=1.16.0,<1.20.0",
"scipy>=1.2.0,<2.0.0",
"pandas>=0.25.0,<2.0.0",
"tqdm>=4.33.0,<5.0.0",
"scikit-learn>=0.20.2,<0.22.0",
"scikit-learn>=0.20.2,<0.25.0",
"torch>=1.2.0,<2.0.0",
"tensorboard>=1.14.0,<2.0.0",
"networkx>=2.2,<2.4",
Expand Down