Skip to content

Commit

Permalink
Merge pull request #4 from SubstraFoundation/dev
Browse files Browse the repository at this point in the history
0.0.9
  • Loading branch information
GuillaumeCisco authored Nov 5, 2019
2 parents 0f7ab01 + 6d5b33a commit 892242d
Show file tree
Hide file tree
Showing 375 changed files with 13,189 additions and 9,704 deletions.
18 changes: 0 additions & 18 deletions .cicd/agent-kaniko.yaml

This file was deleted.

22 changes: 0 additions & 22 deletions .cicd/agent-python.yaml

This file was deleted.

9 changes: 9 additions & 0 deletions .flake8
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
[flake8]
max-line-length = 120
ignore = E402, W504, F403, F405
exclude = backend/substrapp/migrations/*,
backend/substrapp/tests/assets.py,
backend/backend/settings/*,
backend/node/migrations/*,
backend/medias/*,
.env, .venv
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
# the repo. Unless a later match takes precedence,
# @global-owner1 and @global-owner2 will be requested for
# review when someone opens a pull request.
* @camillemarini @GuillaumeCisco
* @inalgnu @GuillaumeCisco @Kelvin-M @samlesu
30 changes: 7 additions & 23 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -106,29 +106,13 @@ venv.bak/
# idea files
.idea

#secret files
SECRET

# conf from substra-network
substrabac/substrapp/**/conf

**/medias/*

# ledger binary files
bin
# vscode files
.vscode/

dryrun

# test files
substrabac/substrabac/description.md
substrabac/substrabac/metrics.py
# secret files
SECRET

# docker database dir
postgres-data
# substra-backend files
docker/docker-compose-dynamic.yaml

network.json
benin_malin
# file for testing data creation with django command
data.json

**/medias/*
backend/node/nodes/*
46 changes: 46 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
language: python

python:
- '3.7'

cache: pip

branches:
only:
- master
- dev

env:
- DJANGO_SETTINGS_MODULE=backend.settings.test

addons:
snaps:
- name: helm
confinement: classic
channel: stable

before_script:
- helm init --client-only

install: pip install -r backend/requirements.txt

script:
- helm lint charts/substra-backend
- cd backend
- pip install flake8
- flake8
- coverage run manage.py test

after_script:
- 'if ! git diff --quiet --exit-code $TRAVIS_COMMIT_RANGE charts; then CHART_CHANGED="true"; else CHART_CHANGED="false"; fi'
- 'if [ "$CHART_CHANGED" == "true" -a "$TRAVIS_PULL_REQUEST" == "false" ]; then helm dep update charts/substra-backend; fi'
- 'if [ "$CHART_CHANGED" == "true" -a "$TRAVIS_PULL_REQUEST" == "false" ]; then helm package charts/substra-backend; fi'
- 'if [ "$CHART_CHANGED" == "true" -a "$TRAVIS_PULL_REQUEST" == "false" ]; then git config --global user.email "[email protected]"; fi'
- 'if [ "$CHART_CHANGED" == "true" -a "$TRAVIS_PULL_REQUEST" == "false" ]; then git config --global user.name "Travis CI"; fi'
- 'if [ "$CHART_CHANGED" == "true" -a "$TRAVIS_PULL_REQUEST" == "false" ]; then git clone https://${GH_TOKEN}@github.com/SubstraFoundation/charts.git substra-charts; fi'
- 'if [ "$CHART_CHANGED" == "true" -a "$TRAVIS_PULL_REQUEST" == "false" ]; then mv hlf-k8s-* substra-charts/; fi'
- 'if [ "$CHART_CHANGED" == "true" -a "$TRAVIS_PULL_REQUEST" == "false" ]; then cd substra-charts; fi'
- 'if [ "$CHART_CHANGED" == "true" -a "$TRAVIS_PULL_REQUEST" == "false" ]; then helm repo index .; fi'
- 'if [ "$CHART_CHANGED" == "true" -a "$TRAVIS_PULL_REQUEST" == "false" ]; then git add .; fi'
- 'if [ "$CHART_CHANGED" == "true" -a "$TRAVIS_PULL_REQUEST" == "false" ]; then git commit --message "Travis build: $TRAVIS_BUILD_NUMBER"; fi'
- 'if [ "$CHART_CHANGED" == "true" -a "$TRAVIS_PULL_REQUEST" == "false" ]; then git push --quiet --set-upstream origin master; fi'
110 changes: 0 additions & 110 deletions Jenkinsfile

This file was deleted.

Loading

0 comments on commit 892242d

Please sign in to comment.