Skip to content

Merge pull request #2 from developmentseed/master #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Merge pull request #2 from developmentseed/master #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5804d2b
Merge pull request #1 from developmentseed/master
WillieShubert May 25, 2015
f2bd185
tweak travis, add to readme, remove secure key
Jun 12, 2015
d8185b5
Merge pull request #23 from OpenDustMap/travis
Jun 12, 2015
f93b6a8
Merge pull request #3 from developmentseed/develop
Jun 12, 2015
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
5 changes: 0 additions & 5 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,6 @@ branches:
only:
- master

env:
global:
- GH_REF=github.com/developmentseed/dustduino-server.git
- secure: CbzgND/x3QGeJmVIpLpjuHMn9SFuRkpyWL65KjLanM7k+h86JfmeYaOxnL/6yXYeh6klzYOq8lBQQZayfC9Pre0acrucNB0vyRBLfoW7zeUWeIuQ9Nz1JpjDNNtovDz19mpP8JxzsvzoWdIsfvT8hfeN1/P2a5V+lzZGn50c/9I=

install: echo 'no install'

script: echo 'no scripts'
Expand Down
8 changes: 7 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ A REST API for DustDuino air quality sensors

[![Deploy](https://www.herokucdn.com/deploy/button.png)](https://heroku.com/deploy)

For API documentation [click here](http://devseed.com/dustduino-server/).
For API documentation [click here](http://api.opendustmap.com).

## Deployment to Heroku

Expand Down Expand Up @@ -36,3 +36,9 @@ Start the server
```
python sensor_rest_api/manage.py runserver
```
## Docs Deployment

This project is set up with [Travis](https://travis-ci.org/) deploy scripts already included which will deploy documentation to `gh-pages`. To utilize these, you will need to enable the repo on the Travis system and include the following two environment variables.

- **GH_REF** - the URL of the repo, similar to `github.com/developmentseed/dustduino-server.git`
- **GH_TOKEN** - a GitHub personal access token available from https://github.com/settings/tokens