Simdem v2 Merge

.circleci/config.yml

@@ -30,9 +30,4 @@ jobs:
           name: run tests
           command: |
             . venv/bin/activate
-            python main.py test test
-
-      - store_artifacts:
-          path: test-reports
-          destination: test-reports
-
+            python setup.py test

.gitignore

@@ -1,12 +1,112 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+env/
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*,cover
+.hypothesis/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# IPython Notebook
+.ipynb_checkpoints
+
+# pyenv
+.python-version
+
+# celery beat schedule file
+celerybeat-schedule
+
+# dotenv
+.env
+
+# virtualenv
+.venv/
+venv/
+ENV/
+
+# Spyder project settings
+.spyderproject
+
+# Rope project settings
+.ropeproject
+
+# Other
+.vscode
+simdem-env
+hello_world
+.simdem
+||||||| merged common ancestors
 *~
 \#*
 .#*
 env.local.json
 !demo_scripts/simdem/variables/env.local.json
 !demo_scripts/test/env.local.json
 !/env.local.json
-*.log
 
 # Python
-__pycache__
-simdem-env/
+simdem-env/
+env.local.json
+!demo_scripts/simdem/variables/env.local.json
+!demo_scripts/test/env.local.json
+!/env.local.json
+*.log

Dockerfile

@@ -0,0 +1,18 @@
+FROM python:3
+
+WORKDIR /usr/src/app
+RUN apt-get update
+
+COPY requirements.txt ./
+
+RUN pip install --no-cache-dir -r requirements.txt
+
+COPY . .
+
+RUN pip install -v -e .
+
+# The default prompt is # which throws off the initialization
+RUN echo 'export PS1="$ "' >> /root/.bashrc
+
+CMD [ "simdem" ]
+

LICENSE

@@ -19,4 +19,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE

MANIFEST.in

@@ -0,0 +1 @@
+include LICENSE

Makefile

@@ -0,0 +1,5 @@
+init:
+	pip3 install -r requirements.txt
+
+test:
+	python3 setup.py nosetests