Merge pull request #101 from TUDelft-CITG/updated_examples_2

Updated examples 2

.circleci/config.yml

@@ -13,11 +13,11 @@ jobs:
           command: |
             docker exec -it openclsim bash -c "pip install -r test-requirements.txt"
             docker exec -it openclsim bash -c "pip install coverage coverage-badge"
-      
+
       - run:
           name: Run tests
           command: |
-            docker exec -it openclsim bash -c "python setup.py test"
+            docker exec -it openclsim bash -c "pytest"
             docker cp openclsim:/OpenCLSim/htmlcov /tmp/artifacts
 
       # - run:
@@ -26,16 +26,16 @@ jobs:
       #       docker exec -it openclsim bash -c "pip install sphinx"
       #       docker exec -it openclsim bash -c "python setup.py docs"
       #       docker cp openclsim:/OpenCLSim/docs/_build/html /tmp/artifacts/docs
-          
+
       - run:
           name: Generate coverage badge
           command: |
             docker exec -it openclsim bash -c "coverage-badge -o coverage.svg"
             docker cp openclsim:/OpenCLSim/coverage.svg /tmp/artifacts/
-          
+
       - store_artifacts:
           path: /tmp/artifacts
-    
+
 workflows:
   version: 2
   build:

Dockerfile

@@ -4,9 +4,10 @@ FROM continuumio/miniconda3:4.6.14
 ADD . /OpenCLSim
 WORKDIR /OpenCLSim
 
-RUN conda install numpy pandas nomkl pyproj
+RUN conda install numpy pandas nomkl pyproj shapely setuptools
 
 RUN pip install --upgrade pip && \
+    pip install -r requirements.txt && \
     pip install -r test-requirements.txt && \
     pip install -r additional-requirements.txt && \
     pip install -e .

README.md

@@ -2,7 +2,7 @@
 [![License: MIT](https://img.shields.io/badge/License-MIT-informational.svg)](https://github.com/TUDelft-CITG/OpenCLSim/blob/master/LICENSE.txt)
 [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.3730615.svg)](https://doi.org/10.5281/zenodo.3730615)
 
-[![CircleCI](https://circleci.com/gh/TUDelft-CITG/OpenCLSim.svg?style=svg&circle-token=fc95d870dc21fdf11e1ebc02f9defcd99212197a)](https://circleci.com/gh/TUDelft-CITG/OpenCLSim)
+[![TUDelft-CITG](https://circleci.com/gh/TUDelft-CITG/OpenCLSim.svg?style=shield&circle-token=fc95d870dc21fdf11e1ebc02f9defcd99212197a)](https://circleci.com/gh/TUDelft-CITG/OpenCLSim)
 [![Coverage](https://artifact-getter.herokuapp.com/get_coverage_badge?circle_url=https://circleci.com/gh/TUDelft-CITG/OpenCLSim&circle_token=3b00333d4fe20c813bd9bc81ce2e1d4f5fae987aoutput=str)](https://artifact-getter.herokuapp.com/get_coverage_report?circle_url=https://circleci.com/gh/TUDelft-CITG/OpenCLSim&circle_token=3b00333d4fe20c813bd9bc81ce2e1d4f5fae987a)
 
 # OpenCLSim