Skip to content

Commit

Permalink
Merge pull request okfn-brasil#530 from okfn-brasil/change-default-br…
Browse files Browse the repository at this point in the history
…anch

New branch default: main
  • Loading branch information
sergiomario authored Jul 18, 2020
2 parents bdc5057 + 59b3c5e commit 9e76e2e
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion contrib/deploy.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down
8 changes: 4 additions & 4 deletions jarbas/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -299,7 +299,7 @@ $ python manage.py companies <path to companies.xz>
$ 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

Expand Down

0 comments on commit 9e76e2e

Please sign in to comment.