Skip to content

Commit

Permalink
Additional fixes to Python 3.6 CI
Browse files Browse the repository at this point in the history
  • Loading branch information
frreiss committed Oct 13, 2021
1 parent 38fedc5 commit 31da2ce
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 4 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# NOTE: This configuration is NOT CURRENTLY USED. CI/CI is run via Github Actions.
language: python

jobs:
Expand Down
4 changes: 2 additions & 2 deletions config/dev_reqs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ twine

# The following libraries are currently only used in our example notebooks
# but may also be called from related regression tests in the future.
nltk
# nltk # Moved to non_36_reqs.txt
# ray[default] # Moved to non_36_reqs.txt
feather
# feather # Moved to non_36_reqs.txt


3 changes: 3 additions & 0 deletions config/non_36_reqs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@
# Pip requirements file containing libraries needed for development and
# testing of this project that no longer work with Python 3.6
# This list will probably grow as libraries drop support.

nltk
ray[default]
feather

sphinx
sphinxcontrib-apidoc
Expand Down
15 changes: 13 additions & 2 deletions env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ fi
# END HACK
############################


################################################################################
# Create the environment if not using active

Expand Down Expand Up @@ -136,22 +137,27 @@ conda install -y -c conda-forge jupyterlab-git

# pip install with the project's requirements.txt so that any hard constraints
# on package versions are respected in the created environment.
echo "Installing from requirements.txt..."
pip install -r requirements.txt

# Additional layer of pip-installed stuff for running regression tests
echo "Installing from config/dev_reqs.txt..."
pip install -r config/dev_reqs.txt

# Additional layer of pip-installed stuff for running notebooks
echo "Installing from config/jupyter_reqs.txt..."
pip install -r config/jupyter_reqs.txt

# Additional layer of large packages
echo "Installing from config/big_reqs.txt..."
pip install -r config/big_reqs.txt

# Additional layer of packages that no longer work with Python 3.6
if ["${PYTHON_VERSION}" == "3.6"]; then
if [ "${PYTHON_VERSION}" == "3.6" ]; then
echo "Skipping packages in config/non_36_reqs.txt because Python version"
echo "is set to 3.6."
else
echo "Installing from config/non_36_reqs.txt..."
pip install -r config/non_36_reqs.txt
fi

Expand All @@ -176,7 +182,12 @@ jupyter labextension install --no-build @jupyter-widgets/jupyterlab-manager

# Elyra extensions to JupyterLab (enables git integration, debugger, workflow
# editor, table of contents, and other features)
pip install --upgrade --use-deprecated=legacy-resolver elyra
if [ "${PYTHON_VERSION}" == "3.6" ]; then
echo "Skipping Elyra extensions because Python version is set to 3.6."
else
pip install --upgrade --use-deprecated=legacy-resolver elyra
fi


# Build once after installing all the extensions, and skip minimization of the
# JuptyerLab resources, since we'll be running from the local machine.
Expand Down

0 comments on commit 31da2ce

Please sign in to comment.