Skip to content

Commit

Permalink
Update build to support Python 3.8 (snorkel-team#1628)
Browse files Browse the repository at this point in the history
* Bump scikit-learn version

* Update setup.py

Co-authored-by: Roman Yurchak <rth.yurchak@gmail.com>

* 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 <rth.yurchak@gmail.com>
Co-authored-by: Henry Ehrenberg <henry.ehrenberg@outlook.com>
  • Loading branch information
3 people authored and Andreas Kodewitz committed Jun 10, 2022
1 parent 8816ef6 commit 26618a1
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 10 deletions.
16 changes: 12 additions & 4 deletions .travis.yml
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
12 changes: 7 additions & 5 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#### 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
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
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
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",
Expand Down

0 comments on commit 26618a1

Please sign in to comment.