From 59b3c5eb10e900cd709d2cc4fcb9c3894b03d4ad Mon Sep 17 00:00:00 2001 From: Mario Sergio Date: Wed, 15 Jul 2020 14:48:34 -0300 Subject: [PATCH] new branch default: main --- README.md | 2 +- contrib/deploy.sh | 2 +- jarbas/README.md | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index fd551a4bd..095831fb4 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![Build Status](https://img.shields.io/travis/okfn-brasil/serenata-de-amor/master.svg)](https://travis-ci.org/okfn-brasil/serenata-de-amor) +[![Build Status](https://img.shields.io/travis/okfn-brasil/serenata-de-amor/main.svg)](https://travis-ci.org/okfn-brasil/serenata-de-amor) [![Code Climate](https://img.shields.io/codeclimate/maintainability-percentage/okfn-brasil/serenata-de-amor.svg)](https://codeclimate.com/github/okfn-brasil/serenata-de-amor) [![Test Coverage](https://img.shields.io/codeclimate/coverage/okfn-brasil/serenata-de-amor.svg)](https://codeclimate.com/github/okfn-brasil/serenata-de-amor/test_coverage) [![Donate](https://img.shields.io/badge/donate-apoia.se-EB4A3B.svg)](https://apoia.se/serenata) diff --git a/contrib/deploy.sh b/contrib/deploy.sh index 7482016ee..a359667b8 100755 --- a/contrib/deploy.sh +++ b/contrib/deploy.sh @@ -1,6 +1,6 @@ export CURRENT_DIR=$(pwd) cd /opt/serenata-de-amor -git pull origin master +git pull origin main docker-compose -f docker-compose.yml -f docker-compose.prod.yml pull docker-compose -f docker-compose.yml -f docker-compose.prod.yml stop docker-compose -f docker-compose.yml -f docker-compose.prod.yml run --rm django python manage.py collectstatic --no-input diff --git a/jarbas/README.md b/jarbas/README.md index b072366a1..cb46dba80 100644 --- a/jarbas/README.md +++ b/jarbas/README.md @@ -2,7 +2,7 @@ [Jarbas](http://jarbas.serenata.ai/) is part of [Serenata de Amor](http://github.com/okfn-brasil/serenata-de-amor) — we fight corruption with data science. -Jarbas is in charge of making data from [CEAP](https://github.com/okfn-brasil/serenata-de-amor/blob/master/CONTRIBUTING.md#more-about-the-quota-for-exercising-parliamentary-activity-ceap) more accessible. In the near future Jarbas will show what [Rosie](https://github.com/okfn-brasil/serenata-de-amor/tree/master/rosie) thinks of each reimbursement made for our congresspeople. +Jarbas is in charge of making data from [CEAP](https://github.com/okfn-brasil/serenata-de-amor/blob/main/CONTRIBUTING.md#more-about-the-quota-for-exercising-parliamentary-activity-ceap) more accessible. In the near future Jarbas will show what [Rosie](https://github.com/okfn-brasil/serenata-de-amor/tree/main/rosie) thinks of each reimbursement made for our congresspeople. ## Table of Contents @@ -228,8 +228,8 @@ $ docker-compose run --rm django python manage.py suspicions /mnt/data/suspicion $ docker-compose run --rm django python manage.py tweets ``` -If you're interesting in having a database full of data you can get the datasets running [Rosie](https://github.com/okfn-brasil/serenata-de-amor/tree/master/rosie). -To add a fresh new `reimbursements.xz` or `suspicions.xz` brewed by [Rosie](https://github.com/okfn-brasil/serenata-de-amor/tree/master/rosie), or a `companies.xz` you've got from the [toolbox](https://github.com/okfn-brasil/serenata-toolbox), you just need copy these files to `contrib/data` and refer to them inside the container from the path `/mnt/data/`. +If you're interesting in having a database full of data you can get the datasets running [Rosie](https://github.com/okfn-brasil/serenata-de-amor/tree/main/rosie). +To add a fresh new `reimbursements.xz` or `suspicions.xz` brewed by [Rosie](https://github.com/okfn-brasil/serenata-de-amor/tree/main/rosie), or a `companies.xz` you've got from the [toolbox](https://github.com/okfn-brasil/serenata-toolbox), you just need copy these files to `contrib/data` and refer to them inside the container from the path `/mnt/data/`. #### Creating search vector @@ -299,7 +299,7 @@ $ python manage.py companies $ python manage.py tweets ``` -There are sample files to seed yout database inside `contrib/data/`. You can get full datasets running [Rosie](https://github.com/okfn-brasil/serenata-de-amor/tree/master/rosie) or directly with the [toolbox](https://github.com/okfn-brasil/serenata-toolbox). +There are sample files to seed yout database inside `contrib/data/`. You can get full datasets running [Rosie](https://github.com/okfn-brasil/serenata-de-amor/tree/main/rosie) or directly with the [toolbox](https://github.com/okfn-brasil/serenata-toolbox). #### Creating search vector