Security fixes and python 2.7.16 bug-fix update

agent/README.md

@@ -4,7 +4,7 @@ Distributed simulation of whole cell agents relative to a shared environment.
 
 ## Setup
 
-The simulation is written in [Python 2.7.15](https://www.python.org/), and depends on [Kafka](https://kafka.apache.org/) for mediating communication between the different processes.
+The simulation is written in [Python 2.7](https://www.python.org/), and depends on [Kafka](https://kafka.apache.org/) for mediating communication between the different processes.
 
 Kafka is a message passing system that allows decoupling of message senders and message receivers. It does this by providing two abstractions, a Consumer and a Producer. A Consumer can subscribe to any number of "topics" it will receive messages on, and a Producer can send to any topics it wishes. Topics are communication "channels" between processes that otherwise do not need to know who is sending and receiving these messages.
 

cloud/docker/runtime/Dockerfile

@@ -15,12 +15,14 @@
 #     > gcloud builds submit --timeout=2h --tag gcr.io/allen-discovery-center-mcovert/wcm-runtime .
 #     > rm requirements.txt
 
-# DO NOT USE python:2.7.15-alpine since the simulation math comes out different!
+# DO NOT USE an alpine base since the simulation math comes out different!
 FROM python:2.7.16
 
 RUN apt-get update \
     && apt-get install -y glpk-utils libglpk-dev glpk-doc swig python-cvxopt \
-        gfortran llvm cmake ncurses-dev libreadline7 libreadline-dev
+        gfortran llvm cmake ncurses-dev libreadline7 libreadline-dev nano
+
+RUN echo "alias ls='ls --color=auto'" >> ~/.bashrc
 
 # Install openblas v0.3.5 (not buggy v0.3.3).
 # Future: Install openblas-dev via apt-get.
@@ -47,7 +49,7 @@ ENV CVXOPT_BUILD_GLPK=1 \
 
 # Install all the pips within one Docker layer and don't cache the downloads.
 COPY requirements.txt /
-RUN pip install --no-cache-dir 'numpy==1.14.5' --no-binary numpy \
+RUN pip install --no-cache-dir 'numpy==1.14.6' --no-binary numpy \
     && pip install --no-cache-dir -r requirements.txt --no-binary numpy,scipy,cvxopt
 
 CMD ["/bin/bash"]

docs/create-pyenv.md

@@ -65,7 +65,7 @@ This page goes through the Python environment setup steps in more detail and wit
 2. Install the required version of Python via `pyenv`, and _remember to enable it as a shared library_ so Theano can call into it:
 
    ```bash
-   PYTHON_CONFIGURE_OPTS="--enable-shared" pyenv install 2.7.15
+   PYTHON_CONFIGURE_OPTS="--enable-shared" pyenv install 2.7.16
    ```
 
 
@@ -75,7 +75,7 @@ This page goes through the Python environment setup steps in more detail and wit
 
    ```bash
    cd ~/dev/wcEcoli  # or wherever you cloned the `wcEcoli` project to
-   pyenv local 2.7.15
+   pyenv local 2.7.16
    pyenv virtualenv wcEcoli2
    pyenv local wcEcoli2
    ```
@@ -204,7 +204,7 @@ This page goes through the Python environment setup steps in more detail and wit
    nosetests
    ```
 
-   If the unit tests fail with an error message saying the loader can't load `.../pyenv/versions/.../lib/libpython2.7.a`, that means you didn't successfully `--enable-shared` when installing python. Go back to that step, run `PYTHON_CONFIGURE_OPTS="--enable-shared" pyenv install 2.7.15 --force`, and repeat all the steps after it.
+   If the unit tests fail with an error message saying the loader can't load `.../pyenv/versions/.../lib/libpython2.7.a`, that means you didn't successfully `--enable-shared` when installing python. Go back to that step, run `PYTHON_CONFIGURE_OPTS="--enable-shared" pyenv install 2.7.16 --force`, and repeat all the steps after it.
 
 
 ## Sherlock SCRATCH directory setup

requirements.txt

@@ -9,12 +9,12 @@
 #
 ## Install the required version of Python via pyenv, and remember to enable it as
 ## a shared library:
-#   PYTHON_CONFIGURE_OPTS="--enable-shared" pyenv install 2.7.15
+#   PYTHON_CONFIGURE_OPTS="--enable-shared" pyenv install 2.7.16
 #
 ## Create the "wcEcoli2" python virtual environment and select it for your project
 ## directory:
 #   cd ~/dev/wcEcoli
-#   pyenv local 2.7.15
+#   pyenv local 2.7.16
 #   pyenv virtualenv wcEcoli2
 #   pyenv local wcEcoli2
 #
@@ -36,7 +36,7 @@
 #    include_dirs = /usr/local/opt/openblas/include
 #
 ## Install NumPy and SciPy, linked to this OpenBLAS thanks to ~/.numpy-site.cfg:
-#   pip install numpy==1.14.5 scipy==1.0.1 --no-binary numpy,scipy --force-reinstall
+#   pip install numpy==1.14.6 scipy==1.0.1 --no-binary numpy,scipy --force-reinstall
 #
 ## Install the packages listed in this file:
 #   CVXOPT_BUILD_GLPK=1 pip install -r requirements.txt --no-binary numpy,scipy,cvxopt
@@ -88,7 +88,7 @@ ipython==5.7.0  # 6.0+ are for Python 3
 ipython-genutils==0.2.0
 isort==4.3.4
 itsdangerous==0.24
-Jinja2==2.10
+Jinja2==2.10.1
 jsonschema==2.6.0
 jupyter-core==4.4.0
 kiwisolver==1.0.1
@@ -106,7 +106,7 @@ mpmath==1.0.0
 multiprocess==0.70.6.1
 nbformat==4.4.0
 nose==1.3.7
-numpy==1.14.5
+numpy==1.14.6
 optlang==1.4.2
 osqp==0.4.1
 packaging==17.1
@@ -131,10 +131,10 @@ pytest==3.6.3
 pytest-benchmark==3.1.1
 python-dateutil==2.7.3
 pytz==2018.5
-PyYAML==3.13
-requests==2.19.1
+PyYAML==5.1
+requests==2.21.0
 ruamel.ordereddict==0.4.13
-ruamel.yaml==0.15.43
+ruamel.yaml==0.15.94
 scandir==1.7
 scipy==1.0.1
 scs==2.0.2
@@ -152,8 +152,9 @@ toolz==0.9.0
 tornado==5.0.2
 tqdm==4.23.0
 traitlets==4.3.2
+typing==3.6.6
 Unum==4.1.4
-urllib3==1.23
+urllib3==1.24.2
 virtualenv>=16.4.1
 virtualenv-clone>=0.5.1
 virtualenvwrapper>=4.8.4

runscripts/fireworks/fw_queue.py

@@ -253,7 +253,7 @@ def get_environment(variable, default):
 
 # Create launchpad
 with open(LAUNCHPAD_FILE) as f:
-	lpad = LaunchPad(**yaml.load(f))
+	lpad = LaunchPad(**yaml.safe_load(f))
 
 # Store list of FireWorks
 wf_fws = []

runscripts/jenkins/ecoli-pull-request.sh

@@ -11,7 +11,7 @@ pyenv local wcEcoli2
 make clean
 make compile
 
-PYTHONPATH=$PWD:$PYTHONPATH nosetests -a 'smalltest' --with-xunit --with-coverage --cover-package=wholecell --cover-xml
+PYTHONPATH=$PWD:$PYTHONPATH nosetests --with-xunit --with-coverage --cover-package=wholecell --cover-xml
 
 sh runscripts/jenkins/fireworks-config.sh $HOST $NAME $PORT $PASSWORD
 

runscripts/reconstruction/build_complexation_reactions.py

@@ -177,7 +177,7 @@ def fixCompartments(reaction, ourLocations):
 idMass.update(rnaMass)
 ourLocations = getMonomerLocationsFromOurData()
 
-jsonData = yaml.load(open(ECOCYC_DUMP, "r"))
+jsonData = yaml.safe_load(open(ECOCYC_DUMP, "r"))
 reactionDataFiltered = removeBlaclistedReactions(jsonData["complexations"])
 idLocation = getLocations(reactionDataFiltered)
 getMasses(idMass, reactionDataFiltered)

runscripts/reconstruction/reaction_enzymes.py

@@ -72,7 +72,7 @@ def addFilteredEntries(rxnNamesEnzymes):
 reactionStoich = getReactionStoich()
 reactionReversibility = getReactionReversibility()
 
-jsonData = yaml.load(open(ECOCYC_DUMP, "r"))
+jsonData = yaml.safe_load(open(ECOCYC_DUMP, "r"))
 
 rxnNamesEnzymes = dict([(x["name"], x["annotation"]["enzymes"]) for x in jsonData["reactions"] if "enzymes" in x["annotation"]])
 

runscripts/reconstruction/update_proteins_location.py

@@ -47,7 +47,7 @@ def getLocationDifferences(ourLocations, ecocycLocations):
 
 
 
-jsonData = yaml.load(open(ECOCYC_DUMP, "r"))
+jsonData = yaml.safe_load(open(ECOCYC_DUMP, "r"))
 
 ourLocations = getMonomerLocationsFromOurData()
 ecocycLocations = getMonomerLocationsFromEcocyc(jsonData["complexations"])