diff --git a/constraints.txt b/constraints.txt index 247daa922..1a1d5a06e 100644 --- a/constraints.txt +++ b/constraints.txt @@ -18,4 +18,4 @@ # Then, when the change has been accepted at the schemas repository # you can change this to point back at the master branch! git+git://github.com/david4096/ga4gh-client.git@protobuf31#egg=ga4gh_client -git+git://github.com/david4096/schemas.git@protobuf31#egg=ga4gh_schemas +git+git://github.com/david4096/schemas.git@pipfixes#egg=ga4gh_schemas diff --git a/requirements.txt b/requirements.txt index 84a79999e..920ea4d77 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,10 +12,9 @@ # way to resolve our internal dependencies. During development, # the constraints file will point at the current master branch # of the respective module. --c constraints.txt +ga4gh-client ga4gh-common==0.0.5 ga4gh-schemas -ga4gh-client Werkzeug==0.11.5 MarkupSafe==0.23 diff --git a/tools/travis-install-protoc.sh b/tools/travis-install-protoc.sh index ae0af24e4..c7fdd51e1 100755 --- a/tools/travis-install-protoc.sh +++ b/tools/travis-install-protoc.sh @@ -4,7 +4,7 @@ # bash tools/travis-install-protoc.sh 3.0.0-beta-3.1 # - +# From https://github.com/ga4gh/schemas/blob/667978e7dd3bfc6d10bfd5c1d64a395c5741e313/tools/travis-install-protoc.sh # make bash more robust. set -beEux -o pipefail