Skip to content

Commit

Permalink
Merge pull request #52 from CartoDB/1.0.0
Browse files Browse the repository at this point in the history
1.0.0
  • Loading branch information
alrocar committed Jun 9, 2017
2 parents 584da36 + a968c79 commit eb538ed
Show file tree
Hide file tree
Showing 88 changed files with 6,354 additions and 652 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -62,3 +62,7 @@ target/
*.swp
secret.py
env

.idea/*
.DS_Store
*variables.sh
14 changes: 14 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
language: python
python:
- '2.7'
- '3.4'
- '3.5'
- '3.6'
- nightly
before_script:
- cp tests/secret.py.example tests/secret.py
install:
- pip install .
- pip install -r requirements.txt
- pip install -r test_requirements.txt
script: pytest
9 changes: 8 additions & 1 deletion CONTRIBUTORS
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
Javier Santana <jsantana@vizzuality.com>
mapbutcher (https://github.com/mapbutcher)
mapbutcher <mapbutcher@mapbutcher.com>
Daniel Carrion <daniel@cartodb.com>
Javier G. Sogo <jgsogo@gmail.com>
Rohan Sharan <sharanrohan@berkeley.edu>
Alberto Romeu <alrocar@cartodb.com>
Andy Eschbacher <eschbacher@cartodb.com>
Oriol Boix <oboix@carto.com>
Jorge Sanz <jsanz@carto.com>
David Medina <dmed256@gmail.com>
Javier Domingo <javierdo1@gmail.com> (external reviewer)

0 comments on commit eb538ed

Please sign in to comment.