Skip to content

Commit

Permalink
Merge pull request #1108 from mathbunnyru/asalikhov/fix_yaml_codestyle
Browse files Browse the repository at this point in the history
Fix yaml files codestyle
  • Loading branch information
parente authored Jun 15, 2020
2 parents c094bb7 + cf02126 commit 947a715
Show file tree
Hide file tree
Showing 6 changed files with 36 additions and 29 deletions.
1 change: 1 addition & 0 deletions .hadolint.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
ignored:
- DL3006
- DL3008
1 change: 1 addition & 0 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
# .readthedocs.yml
# Read the Docs configuration file
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
Expand Down
52 changes: 27 additions & 25 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,46 +1,48 @@
---
dist: bionic
language: python
python:
- 3.7
- 3.7
sudo: required
services:
- docker
- docker

jobs:
include:
include:
- stage: diff-test
install:
- pip install --upgrade pip
- make dev-env
- make lint-install
- pip install --upgrade pip
- make dev-env
- make lint-install
script:
- set -e
- if [ $(make n-docs-diff) -ne 0 ]; then make docs; fi;
- if [ $(make n-other-diff) -ne 0 ]; then make lint-build-test-all DARGS="--build-arg TEST_ONLY_BUILD=1"; fi;
- set -e
- if [ $(make n-docs-diff) -ne 0 ]; then make docs; fi;
- if [ $(make n-other-diff) -ne 0 ]; then make lint-build-test-all DARGS="--build-arg TEST_ONLY_BUILD=1"; fi;
- stage: push-tx
install:
- pip install --upgrade pip
- make dev-env
script:
- if [ $(make n-docs-diff DIFF_RANGE=$TRAVIS_COMMIT_RANGE) -ne 0 ]; then make tx-en; fi;
- pip install --upgrade pip
- make dev-env
script:
- if [ $(make n-docs-diff DIFF_RANGE=$TRAVIS_COMMIT_RANGE) -ne 0 ]; then make tx-en; fi;
- stage: full-test
install:
- pip install --upgrade pip
- make dev-env
- make lint-install
- pip install --upgrade pip
- make dev-env
- make lint-install
script:
- set -e
- make docs
- make lint-build-test-all DARGS="--build-arg TEST_ONLY_BUILD=1"
- set -e
- make docs
- make lint-build-test-all DARGS="--build-arg TEST_ONLY_BUILD=1"

stages:
- name: diff-test
if: type = pull_request
- name: push-tx
if: type = push AND branch = master
- name: full-test
if: type = cron AND branch = master
- name: diff-test
if: type = pull_request
- name: push-tx
if: type = push AND branch = master
- name: full-test
if: type = cron AND branch = master

env:
global:
# yamllint disable-line
secure: JDQKgB1laaenzmEGI9gduwK/iS0030qsl62njJg3jib0R8wxBi2OeetEdoGl9m4NFsqqnp0OO7nm4rzGfuwjL1A38flSlXOTxhjm/hvo3vmnqVu5lDcdk9+IRkafnfd3Dyd86tLxRVETOqZwCLmdNkB2fmQII8du5IIqbJuUGp8DrG7kVMf3NBr9rjkZRfByQrgG4s1NXuT61VvpWMPJAOhcrImuHBheVJDEV0U3n6Xavd7Wo+pAHrHU8exvYTZ1IzZMbHc6K0iC/NpCHcH9+9DAeLDk/q1aDNqbTExnQevOHZzNqgHC2qFOlN4jfy/TLYLpLXtUismneBBqVSK3iZso3Vqy2BRXWgouI+Tt+08ffocy9XPwEzSwkgPgDlFVUikPOy5imwjpDb13RMIyMY4CKlSOdQx2rH2kPkZ0MJJPcki3KGuGl3qRvqyblMn+lZvjAu6WVLZfo7EtcxsQ0ZZxbAbGoUVl27FHg+UvIfC0I3wEcZIp7oED47Q8s0MdCijD3AwkRPvx/iyp3J0A42su7kkOooFcmUItEIqegQJ4Aki1FBv2i5vHmBobClktytZceLsKvzCeLjMpL9HcUVfUaJDKRwtUYIozpYeBnac+E6J1s6glcqLrXIHWez8N6SzokBa6SPqdtODdzzk5OJupByub6CYWsRXvxIQ7/wI=
5 changes: 3 additions & 2 deletions examples/docker-compose/notebook/letsencrypt-notebook.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
# Copyright (c) Jupyter Development Team.
# Distributed under the terms of the Modified BSD License.

Expand All @@ -9,8 +10,8 @@ services:
image: my-notebook
container_name: ${NAME}
volumes:
- "work:/home/jovyan/work"
- "secrets:/etc/letsencrypt"
- "work:/home/jovyan/work"
- "secrets:/etc/letsencrypt"
ports:
- "${PORT}:8888"
environment:
Expand Down
3 changes: 2 additions & 1 deletion examples/docker-compose/notebook/notebook.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
# Copyright (c) Jupyter Development Team.
# Distributed under the terms of the Modified BSD License.

Expand All @@ -9,7 +10,7 @@ services:
image: my-notebook
container_name: ${NAME}
volumes:
- "work:/home/jovyan/work"
- "work:/home/jovyan/work"
ports:
- "${PORT}:8888"

Expand Down
3 changes: 2 additions & 1 deletion examples/docker-compose/notebook/secure-notebook.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
# Copyright (c) Jupyter Development Team.
# Distributed under the terms of the Modified BSD License.

Expand All @@ -9,7 +10,7 @@ services:
image: my-notebook
container_name: ${NAME}
volumes:
- "work:/home/jovyan/work"
- "work:/home/jovyan/work"
ports:
- "${PORT}:8888"
environment:
Expand Down

0 comments on commit 947a715

Please sign in to comment.