Skip to content

Commit d56bc52

Browse files
committed
Snapshot release for colonies paper
1 parent 7e4cc9e commit d56bc52

File tree

678 files changed

+306171
-32876
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

678 files changed

+306171
-32876
lines changed

.dockerignore

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
/.idea
44
/docs
55
/user
6+
/stubs
67

78
# Compiled source #
89
###################
@@ -29,6 +30,7 @@ coverage.xml
2930
nosetests.xml
3031
nosetests.*.xml
3132
.pytest_cache
33+
/unittests.xml
3234

3335
# IPython notebook files #
3436
##########################
@@ -44,7 +46,9 @@ cached
4446

4547
# Fixtures #
4648
############
47-
/fixtures/
49+
fixtures/sim/*
50+
fixtures/kb/*
51+
fixtures/test/*
4852

4953
# C extensions #
5054
################

.gcloudignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#!include:.dockerignore

.gitignore

Lines changed: 27 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1+
# A temporary copy to upload to Cloud Build. Don't .dockerignore it.
2+
/cloud/docker/runtime/requirements.txt
3+
14
# Compiled source #
25
###################
36
*.pyc
7+
__pycache__
48

59
# OS generated files #
610
######################
@@ -22,18 +26,16 @@ coverage.xml
2226
nosetests.xml
2327
nosetests.*.xml
2428
.pytest_cache
29+
/unittests.xml
2530

2631
# IPython notebook files #
2732
##########################
2833
.ipynb_checkpoints
2934

3035
# Output files #
3136
################
32-
out
33-
out/*
34-
!out/out.txt
35-
!out/images.html
36-
!out/makeHtml.py
37+
/out
38+
/colony/out
3739

3840
# Cached sim data #
3941
###################
@@ -72,23 +74,23 @@ user/*
7274
# kernprof.py output #
7375
######################
7476
*.lprof
77+
*.prof
7578

7679
# pyenv python version #
7780
########################
7881
.python-version
7982

80-
# files created from templates #
81-
################################
82-
/my_launchpad*.yaml
83-
/my_qadapter*.yaml
83+
# personal config files #
84+
#########################
85+
/*.yaml
8486

8587
# Fireworks output #
8688
####################
8789
launcher_*
8890
block_*
8991
FW.json
9092

91-
# Fitter output #
93+
# Parca output #
9294
#################
9395
reconstruction/ecoli/dataclasses/process/equilibrium_odes.py
9496
reconstruction/ecoli/dataclasses/process/two_component_system_odes.py
@@ -107,7 +109,11 @@ reconstruction/ecoli/dataclasses/process/two_component_system_odes_fitter.py
107109
*.pickle
108110
*.log
109111
*.hdf
112+
*.tar.gz
110113
/build/
114+
/.pytype/
115+
/.mypy_cache/
116+
secrets.*
111117

112118
# PyCharm files #
113119
#################
@@ -120,6 +126,7 @@ reconstruction/ecoli/dataclasses/process/two_component_system_odes_fitter.py
120126
.idea/libraries
121127
.idea/codeStyleSettings.xml
122128
.idea/codeStyles/codeStyleConfig.xml
129+
.idea/inspectionProfiles/profiles_settings.xml
123130

124131
# Potentially OK if editing it to project-jdk-name="Python 2.7" works:
125132
.idea/misc.xml
@@ -135,7 +142,16 @@ reconstruction/ecoli/dataclasses/process/two_component_system_odes_fitter.py
135142

136143
# Gradle:
137144
.idea/gradle.xml
138-
.idea/libraries
139145

140146
# Mongo Explorer plugin:
141147
.idea/mongoSettings.xml
148+
149+
# LaTeX compilation files #
150+
###########################
151+
*.aux
152+
*.bbl
153+
*.blg
154+
*.fdb_latexmk
155+
*.fls
156+
*.synctex.gz
157+

.idea/codeStyles/Project.xml

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/inspectionProfiles/Project_Default.xml

Lines changed: 52 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/wcEcoli.iml

Lines changed: 4 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Makefile

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,23 @@
1-
.PHONY: compile, clean
1+
.PHONY: compile, clean, recompile
22

33
compile:
4-
python2.7 setup.py build_ext --inplace
4+
python setup.py build_ext --inplace
55
rm -fr build
66

7+
# The reconstruction/ecoli/dataclasses/process/*.py files were generated by
8+
# write_ode_file.py in Parca code.
9+
# Fireworks writes launcher_20* and block_20*.
710
clean:
811
rm -fr fixtures
912
(cd reconstruction/ecoli/dataclasses/process && rm -f equilibrium_odes.py two_component_system_odes*.py)
10-
find . -not \( -path ./out -prune \) -not \( -path ./.git -prune \) -name "*.cPickle" -exec rm -fr {} \;
1113
find . -name "*.pyc" -exec rm -rf {} \;
1214
find . -name "*.o" -exec rm -fr {} \;
1315
find . -name "*.so" -exec rm -fr {} \;
1416
rm -fr build
1517
rm -fr launcher_20* block_20*
18+
19+
# Delete just the *.so libraries then (re)compile them.
20+
# This is useful when switching to a different Python virtualenv.
21+
recompile:
22+
find . -name "*.so" -delete
23+
make compile

0 commit comments

Comments
 (0)