Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions dmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ docker:
# "- <<: *base_image" as used below.
- &base_image
name: deepomatic-client-python
variant: 2.7
variant: '2.7'
root_image: python:2.7
copy_files:
- requirements.txt
Expand All @@ -28,13 +28,13 @@ docker:
- deploy/install.sh
# Nothing changes comparing to above, except 'variant' and 'root_image'
- <<: *base_image
variant: 3.4
variant: '3.4'
root_image: python:3.4
- <<: *base_image
variant: 3.5
variant: '3.5'
root_image: python:3.5
- <<: *base_image
variant: 3.6
variant: '3.6'
root_image: python:3.6


Expand All @@ -47,10 +47,10 @@ services:
dockerfile: deploy/Dockerfile
target: dev
base_image_variant:
- 2.7
- 3.4
- 3.5
- 3.6
- '2.7'
- '3.4'
- '3.5'
- '3.6'
tests:
commands:
- LOG_LEVEL=DEBUG pytest --junit-xml=junit.xml --cov=. --cov-report=xml:coverage.xml --cov-report html:cover -vv /app/tests
Expand All @@ -73,7 +73,7 @@ services:
context: .
dockerfile: deploy/Dockerfile
target: build
base_image_variant: 3.6
base_image_variant: '3.6'
tests:
# TODO follow up on https://github.com/Deepomatic/dmake/issues/311
data_volumes:
Expand All @@ -96,7 +96,7 @@ services:
target: runtime-py2
# only used by dmake shell; bypassed by runtime-py2 Dockerfile target
base_image_variant:
- 2.7
- '2.7'
tests:
data_volumes:
- container_volume: /dist/
Expand All @@ -117,7 +117,7 @@ services:
target: runtime-py3
# only used by dmake shell; bypassed by runtime-py3 Dockerfile target
base_image_variant:
- 3.6
- '3.6'
tests:
data_volumes:
- container_volume: /dist/
Expand Down