Merge pull request #27 from CovertLab/growth-paper

Update to latest model version

.dockerignore

@@ -3,11 +3,14 @@
 /.idea
 /docs
 /user
+/stubs
+/.mypy_cache
+/.benchmarks
 
 # Compiled source #
 ###################
 *.pyc
-__pycache__
+**/__pycache__/
 
 # OS generated files #
 ######################
@@ -29,6 +32,7 @@ coverage.xml
 nosetests.xml
 nosetests.*.xml
 .pytest_cache
+/unittests.xml
 
 # IPython notebook files #
 ##########################
@@ -37,6 +41,8 @@ nosetests.*.xml
 # Output files #
 ################
 /out
+/colony/out
+reconstruction/ecoli/scripts/nca/out/
 
 # Cached sim data #
 ###################
@@ -106,6 +112,9 @@ reconstruction/ecoli/dataclasses/process/two_component_system_odes_fitter.py
 *.hdf
 *.tar.gz
 /build/
+/.mypy_cache/
+secrets.*
+reconstruction/ecoli/scripts/nca/data/regulon-db/*.tsv
 
 # LaTeX compilation files #
 ###########################

.gcloudignore

@@ -0,0 +1 @@
+#!include:.dockerignore

.gitignore

@@ -1,13 +1,21 @@
+# A temporary copy to upload to Cloud Build. Don't .dockerignore it.
+/cloud/docker/runtime/requirements.txt
+
 # Compiled source #
 ###################
 *.pyc
+__pycache__
 
 # OS generated files #
 ######################
 .DS_Store
 .DS_Store?
 ._*
 
+# git source info to copy into Docker Images #
+##############################################
+/source-info/
+
 # VIM temp files #
 ##################
 *.swp
@@ -22,18 +30,17 @@ coverage.xml
 nosetests.xml
 nosetests.*.xml
 .pytest_cache
+/unittests.xml
 
 # IPython notebook files #
 ##########################
 .ipynb_checkpoints
 
 # Output files #
 ################
-out
-out/*
-!out/out.txt
-!out/images.html
-!out/makeHtml.py
+/out
+/colony/out
+reconstruction/ecoli/scripts/nca/out/
 
 # Cached sim data #
 ###################
@@ -72,23 +79,23 @@ user/*
 # kernprof.py output #
 ######################
 *.lprof
+*.prof
 
 # pyenv python version #
 ########################
 .python-version
 
-# files created from templates #
-################################
-/my_launchpad*.yaml
-/my_qadapter*.yaml
+# personal config files #
+#########################
+/*.yaml
 
 # Fireworks output #
 ####################
 launcher_*
 block_*
 FW.json
 
-# Fitter output #
+# Parca output #
 #################
 reconstruction/ecoli/dataclasses/process/equilibrium_odes.py
 reconstruction/ecoli/dataclasses/process/two_component_system_odes.py
@@ -107,7 +114,11 @@ reconstruction/ecoli/dataclasses/process/two_component_system_odes_fitter.py
 *.pickle
 *.log
 *.hdf
+*.tar.gz
 /build/
+/.mypy_cache/
+secrets.*
+reconstruction/ecoli/scripts/nca/data/regulon-db/*.tsv
 
 # PyCharm files #
 #################
@@ -120,6 +131,7 @@ reconstruction/ecoli/dataclasses/process/two_component_system_odes_fitter.py
 .idea/libraries
 .idea/codeStyleSettings.xml
 .idea/codeStyles/codeStyleConfig.xml
+.idea/inspectionProfiles/profiles_settings.xml
 
 # Potentially OK if editing it to project-jdk-name="Python 2.7" works:
 .idea/misc.xml
@@ -135,7 +147,18 @@ reconstruction/ecoli/dataclasses/process/two_component_system_odes_fitter.py
 
 # Gradle:
 .idea/gradle.xml
-.idea/libraries
 
 # Mongo Explorer plugin:
 .idea/mongoSettings.xml
+
+# LaTeX compilation files #
+###########################
+*.aux
+*.bbl
+*.blg
+*.fdb_latexmk
+*.fls
+*.synctex.gz
+
+# VSCode:
+.vscode/

Makefile

@@ -1,15 +1,29 @@
-.PHONY: compile, clean
+.PHONY: compile, clean, recompile
 
 compile:
-	python2.7 setup.py build_ext --inplace
+	python setup.py build_ext --inplace
 	rm -fr build
 
+# The reconstruction/ecoli/dataclasses/process/*.py files were generated by
+#  write_ode_file.py in Parca code.
+# Fireworks writes launcher_20* and block_20*.
+# `aesara-cache clear` clears the current $(aesara-cache) cache, not others, and
+# leaves 3 small *.delete.me dirs for later in case they're in use, esp. on NFS.
 clean:
-	rm -fr fixtures
+	rm -fr fixtures cache
 	(cd reconstruction/ecoli/dataclasses/process && rm -f equilibrium_odes.py two_component_system_odes*.py)
-	find . -not \( -path ./out -prune \) -not \( -path ./.git -prune \) -name "*.cPickle" -exec rm -fr {} \;
 	find . -name "*.pyc" -exec rm -rf {} \;
 	find . -name "*.o" -exec rm -fr {} \;
 	find . -name "*.so" -exec rm -fr {} \;
 	rm -fr build
 	rm -fr launcher_20* block_20*
+	if [ "`aesara-cache | xargs du -sm | cut -f1`" -gt 30 ]; then \
+		echo "Clearing the aesara-cache since it's larger than threshold."; \
+		aesara-cache clear; \
+	fi
+
+# Delete just the *.so libraries then (re)compile them.
+# This is useful when switching to a different Python virtualenv.
+recompile:
+	find . -name "*.so" -delete
+	make compile