Skip to content

Commit

Permalink
Merge pull request #40 from david4096/remove_proto
Browse files Browse the repository at this point in the history
Remove proto, add tests, error responses
  • Loading branch information
bwalsh authored Feb 16, 2018
2 parents 5348b5b + 603366c commit 272aed2
Show file tree
Hide file tree
Showing 26 changed files with 1,610 additions and 1,552 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Don't include the python package's copy of the swagger
python/ga4gh/dos/data_object_service.swagger.yaml

# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
Expand Down
8 changes: 1 addition & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,12 @@
language: python
python:
- '2.7'
cache:
directories:
- "/tmp/proto3.2.0"
before_install:
- sudo apt-get update -qq
- bash tools/travis-install-protoc.sh 3.2.0
- export PATH=/tmp/proto3.2.0/bin:$PATH
- pip install . --process-dependency-links
- pip install -r python/dev-requirements.txt
script:
- cwltool
- sh tools/prepare_swagger.sh
- nosetests python
- flake8 python
- ga4gh_dos_client
deploy:
Expand Down
7 changes: 0 additions & 7 deletions CWLFile

This file was deleted.

21 changes: 5 additions & 16 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -106,23 +106,12 @@ ga4gh_dos_demo
Building Documents
------------------

Make sure you have Docker installed for your platform and the `cwltool`.
The schemas are editable as OpenAPI 2 YAML files. To generate OpenAPI 3 descriptions install
swagger2openapi and run the following:

virtualenv env
source env/bin/activate
pip install -r python/dev-requirements.txt

You can generate the [Swagger](http://swagger.io/) YAML from the Protocol Buffers:

cwltool CWLFile

Find the output in `data_objects_service.swagger.json` and this can be loaded in the [Swagger editor](http://swagger.io/swagger-editor/). Use the GitHub raw feature to generate a URL you can load.

When you're happy with the changes, checkin this file:

mv data_objects_service.swagger.json swagger/proto/

And commit your changes, pushing to the appropriate branch.
```
swagger2openapi -y openapi/data_object_service.swagger.yaml > openapi/data_object_service.openapi.yaml
```

How to contribute changes
-------------------------
Expand Down
Loading

0 comments on commit 272aed2

Please sign in to comment.