diff --git a/.travis.yml b/.travis.yml index 56bd6e11e312a4ff5f2501b0bed166cb0960e9ea..0e5e5053ef030eb3cbd7ea866d0dfb2464e3e545 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,22 +3,19 @@ cache: directories: - "$HOME/.cache" - "$HOME/.ccache" -env: - - PYTHON_VERSION=2.7 - - PYTHON_VERSION=3.5 before_install: - ccache -s - export PATH=/usr/lib/ccache:${PATH} - wget https://package-data.enthought.com/edm/rh5_x86_64/1.9/edm_1.9.2_linux_x86_64.sh && bash ./edm_1.9.2_linux_x86_64.sh -b -f -p $HOME - export PATH=${HOME}/edm/bin:${PATH} - edm install -y -e force-bootstrap click setuptools - - edm run -e force-bootstrap -- python -m ci build-env --python-version ${PYTHON_VERSION} + - edm run -e force-bootstrap -- python -m ci build-env script: - - edm run -e force-bootstrap -- python -m ci flake8 --python-version ${PYTHON_VERSION} - - edm run -e force-bootstrap -- python -m ci test --python-version ${PYTHON_VERSION} - - edm run -e force-bootstrap -- python -m ci docs --python-version ${PYTHON_VERSION} + - edm run -e force-bootstrap -- python -m ci flake8 + - edm run -e force-bootstrap -- python -m ci test + - edm run -e force-bootstrap -- python -m ci docs after_success: - - edm run -e force-bootstrap -- python -m ci coverage --python-version ${PYTHON_VERSION} + - edm run -e force-bootstrap -- python -m ci coverage - edm run -e force-bootstrap -- pip install codecov - edm run -e force-bootstrap -- codecov - bash <(curl -s https://codecov.io/bash) diff --git a/CHANGES.rst b/CHANGES.rst index 45557577e4a19e77593e937414f0c2f0d7ed8277..c36856440dcd131d01e52176a8ba5b2cf4086bd6 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -4,6 +4,7 @@ FORCE BDSS Changelog Release 0.3.0 ------------- +- Removed support for python2 (#179) Release 0.2.0 ------------- diff --git a/ci/__main__.py b/ci/__main__.py index 39c3237934e177e32bbd59f3c5211ec3d7bc6c0d..0f203b0a0497b6600c00a20e8a519db3d9c57848 100644 --- a/ci/__main__.py +++ b/ci/__main__.py @@ -1,8 +1,8 @@ import click from subprocess import check_call -DEFAULT_PYTHON_VERSION = "2.7" -PYTHON_VERSIONS = ["2.7", "3.5"] +DEFAULT_PYTHON_VERSION = "3.5" +PYTHON_VERSIONS = ["3.5"] CORE_DEPS = [ "distribute_remove==1.0.0-4", diff --git a/doc/source/installation.rst b/doc/source/installation.rst index 33b71b5ff699e730f1b6a03a9a7e9c7c5188fad0..65c5eacca6edf3d665bbcd9d82877145ba7dc86b 100644 --- a/doc/source/installation.rst +++ b/doc/source/installation.rst @@ -7,24 +7,24 @@ git repositories:: git clone https://github.com/force-h2020/force-wfmanager git clone https://github.com/force-h2020/force-bdss-plugin-enthought-example -The last repository is optional, but recommended if you want to practice +The last repository is optional, but recommended if you want to practice writing plugins. -Next, download EDM package manager, and create a bootstrap environment:: +Next, download EDM package manager, and create a bootstrap environment. +We assume the bootstrap environment is the default one (called ``edm``):: wget https://package-data.enthought.com/edm/rh5_x86_64/1.9/edm_1.9.2_linux_x86_64.sh && bash ./edm_1.9.2_linux_x86_64.sh -b -f -p $HOME export PATH=${HOME}/edm/bin:${PATH} - edm environments create --version 3.5 force - edm install -y -e force-bootstrap click setuptools - edm shell --environment=force-bootstrap + edm install --version 3.5 -y pyyaml click setuptools + edm shell -Verify that your prompt changes to add "(force-bootstrap)". +Verify that your prompt changes to add "(edm)". Installation of the force BDSS runtime environment is performed with the following command:: python -m ci build-env -This will create another edm environment called ``force-py27``. +This will create another edm environment called ``force-py35``. To install the workflow manager:: @@ -40,7 +40,7 @@ and (optional, but recommended), the example plugins:: Now you can enter the deployed environment and invoke the programs:: - edm shell -e force-py27 + edm shell -e force-py35 # Invokes the workflow manager UI force_wfmanager # Invokes the CLI BDSS evaluator