Merge branch 'master' into 'Branch1'

# Conflicts:
#   .gitlab-ci.yml

.gitlab-ci.yml

-stages:
-  - test
-  - deploy
+image: "python:3.7"
 
-test:
-  stage: test
-  script:
-  # this configures Django application to use attached postgres database that is run on `postgres` host
-  - export DATABASE_URL=postgres://postgres:@postgres:5432/python-test-app
-  - apt-get update -qy
-  - apt-get install -y python-dev python-pip
+before_script:
+    - python --version
     - pip install -r requirements.txt
-  - python manage.py test
 
-staging:
-  stage: deploy
-  script:
-  - apt-get update -qy
-  - apt-get install -y ruby-dev
-  - gem install dpl
-  - dpl --provider=heroku --app=gitlab-ci-python-test-staging --api-key=$HEROKU_STAGING_API_KEY
-  only:
-  - master
+stages:
+    - kehitystesti
     
-production:
-  stage: deploy
+kokeilutesti:
+    stage: kehitystesti
     script:
-  - apt-get update -qy
-  - apt-get install -y ruby-dev
+    - python bayesian_adapted_gmm_for_background_extraction.py
\ No newline at end of file
-  - gem install dpl
-  - dpl --provider=heroku --app=gitlab-ci-python-test-prod --api-key=$HEROKU_PRODUCTION_API_KEY
-  only:
-  - tags
\ No newline at end of file