Merge branch 'py3-only' into added-install-step

.travis.yml

@@ -3,22 +3,20 @@ 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 install
+    - 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)

CHANGES.rst

@@ -5,8 +5,8 @@ Release 0.3.0
 -------------
 
 - Installation now requires two separate steps to build the environment
-  and to install the bdss. (#180)
-
+  and to install the BDSS (#180)
+- Removed support for python2 (#179)
 
 Release 0.2.0
 -------------

ci/__main__.py

 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",

doc/source/installation.rst

@@ -10,21 +10,21 @@ git repositories::
 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 BDSS::
 
@@ -44,7 +44,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