-
Notifications
You must be signed in to change notification settings - Fork 53
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Overview: DRS as it was when we started the transition from DOS * Rename DOS to DRS, strip data prefix (closes #192) This also closes #196. This commit begins the rename of the Data Object Service to the Data Repository Service within the codebase. It also removes the data- prefix from data bundles and data objects. * Begin adoption of HubFlow Further work required, see #206 * Bump version to v0.6.0 * Setting up documentation build system (#199) This documentation build system automates builds of Swagger and HTML/PDF documentation using adapted code originally developed by @jaeddy for ga4gh/workflow-execution-service-schemas. * making the doc links more clear, also want to trigger TravisCI * trying to get develop to build but not deploy to PyPI * I think this is better, we only deploy when the branch is master. I need to check with Natan and see if this will work for release tags (which we do want deployed to PyPI). * adds data-bundle checksum test (closes #119) (+5 squashed commits) Squashed commits: [327cdd2] Update python/test/test_server.py Co-Authored-By: rshreya <[email protected]> [c9fcd75] Update python/test/test_server.py as per review suggestion Co-Authored-By: rshreya <[email protected]> [285509f] fix per PR review [c8a3bf7] removed unused variable [42c1275] added databundles checksum test * quick fix * Update CONTRIBUTING.md * Update CONTRIBUTING.md * Update CONTRIBUTING.md * Update CONTRIBUTING.md * trying to correctly match feature branches * Update CONTRIBUTING.md * include doc changes from the January hackathon (#231) * update the doc intro in front_matter.adoc (from the shared doc) * add back_matter.adoc * add a new "Motivation" appendix, with figure[123] cartoons (from the shared doc) * update staging code to a) support images and b) fix a bug in deploy to master * Updating release branch info with HubFlow reference. * I added a simplified PR voting process based on #225 * small update on format * updating the travis build info to use common account * trying to correct failed build for a PR * fixing syntax * updating travis to get release branches to build * removing an attribute causing error * updating to 0.0.1 of DRS * adding a note about 1.0.0 and transition from DOS * updating david S's docs
- Loading branch information
1 parent
8a68cee
commit f79884f
Showing
44 changed files
with
5,929 additions
and
788 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,60 +1,62 @@ | ||
| language: python | ||
|
|
||
| python: | ||
| - '2.7' | ||
| - '3.6' | ||
|
|
||
| # Specifying `branches.only = ['master']` can cause tagged builds to | ||
| # not deploy. See travis-ci/travis-ci#2498 and travis-ci/travis-ci#1675. | ||
| # We can fix this by only build master and branches/tags that follow the | ||
| # format x.y.z. | ||
| branches: | ||
| only: | ||
| - master | ||
| - /^\d+\.\d+(\.\d+)?(-\S*)?$/ | ||
|
|
||
| - master | ||
| - develop | ||
| - "/^\\d+\\.\\d+(\\.\\d+)?(-\\S*)?$/" | ||
| - "/^feature\\/issue-\\d+(-\\S*)?$/" | ||
| - "/^release\\/\\d+\\.\\d+(\\.\\d+)?$/" | ||
| stages: | ||
| - linting | ||
| - test | ||
| # The deploy stage only has `deploy` actions which will only run on commits to master | ||
| # (and not pull requests). That said, we still explicitly skip this stage because | ||
| # if we don't, Travis will only stop execution once the build stage has already been | ||
| # set up. If we skip the deploy stage for pull requests at the stage level, we can | ||
| # shave off a couple minutes of runtime. | ||
| - name: deploy | ||
| if: type != pull_request | ||
|
|
||
| - linting | ||
| - test | ||
| - name: deploy | ||
| if: type != pull_request && branch = "master" | ||
| jobs: | ||
| include: | ||
| # If the linting stage fails, then none of the other stages will run. | ||
| - stage: linting | ||
| python: '3.6' | ||
| script: | ||
| # Travis will install requirements.txt by default | ||
| - flake8 --select=E121,E123,E126,E226,E24,E704,W503,W504 --ignore=E501 app.py tests | ||
|
|
||
| # Deploy to PyPI on every tagged commit | ||
| - stage: deploy | ||
| python: '3.6' | ||
| script: ignore | ||
| before_install: ignore | ||
| deploy: | ||
| - provider: pypi | ||
| on: | ||
| tags: true | ||
| branch: master | ||
| python: '3.6' | ||
| repo: ga4gh/data-object-service-schemas | ||
| user: david4096 | ||
| password: | ||
| secure: LlQn8ZBAb5ekujHnoDrmzrmXaM6TpyzByNHPH4FTbbdnJ8lkDPb/ZhYvdmqrOvXPQg81/IoYKlIvP7fY9kc3oGUJ2IXhcPFqiw8njsRE5Qaebp+YppQO7C3IWGlHoZtXNtC608ZSA4x0oneNeNy+Y8KYnqKbmOlbuvrYRlNYfe9/8z7yLPH8wdmp0GyvbViedr3p7PXhtQVUKAgPpgjffZnSA7P/Y6AdkvjHHv2xMAzWP/QmOFWZNxUXjg0miR0K7eGFeGBNMM/+QsVXrGOu/TCtPtJ4JXyD86nzrZUbsOluyAblxwGlrv05se5ImVhR210OC5zvSW2902y/lxCw5uek+xg4/tcSA1ckshxLeu02GfDygCktMUtqtKVIZ+qvU7H4dEQ6Jnz9yBvZW5M6V94Ew3wBFy0RB5I9k3MMQY21FdynIUEZzBgJbOChCbmlIDT1varBHvWBiwg8EwPOVuJt1CsOoptJxUsoJND4tAOPIvXMNI17qGJ+VWAVMVNn7cVUuhEeGXwQF4urrkFBA7WIYOp6O9R8Ipg6WnQdxVdnqb3NsEc19SRdFXQ82SYibKfIZxjpdmYVgKzTYsJGMhfG6fTw9D4JABhggfgShsnByrFtbbkn/9g64jXDOjwPLeRXwXYZe6ZV6M69PDWdo0o326Qq/OHBG5eU7z2plNI= | ||
|
|
||
| - stage: linting | ||
| python: '3.6' | ||
| script: | ||
| - flake8 --select=E121,E123,E126,E226,E24,E704,W503,W504 --ignore=E501 app.py | ||
| tests | ||
| - stage: build_pages | ||
| language: java | ||
| jdk: oraclejdk8 | ||
| before_install: | ||
| - chmod +x gradlew | ||
| - chmod +x scripts/fetchpages.sh | ||
| - chmod +x scripts/stagepages.sh | ||
| script: | ||
| - "./scripts/fetchpages.sh" | ||
| - "./gradlew installSwagger buildSwagger asciidoctor" | ||
| - "./scripts/stagepages.sh" | ||
| deploy: | ||
| provider: pages | ||
| skip-cleanup: true | ||
| github-token: "$GITHUB_TOKEN" | ||
| on: | ||
| all_branches: true | ||
| - stage: deploy | ||
| python: '3.6' | ||
| script: ignore | ||
| before_install: ignore | ||
| deploy: | ||
| - provider: pypi | ||
| on: | ||
| tags: true | ||
| branch: master | ||
| python: '3.6' | ||
| repo: ga4gh/data-repository-service-schemas | ||
| user: ga4gh-cloud-workstream | ||
| password: | ||
| secure: O3xHQwUG2pEhU0FXmeaWzDY70iRz0J+LeXGhyH9UJz84WCSSfmwEyxH4gJlucHLEmUBV+nuwxbe6vRzN2jiO34qSXrdSV7fippw2ZCuYM+hwOz0rB42B0fUVqMBIMjAusKdoumaeOS15spOV+06qSAtzB+bhI0ZqhSEFy7yeX1qIdx33bJUSqB73r9be+gndafXG9vK2lqz0C8tMA3cYFze6alX3vde8dWYuTeq65XhXyqrwELhCMTVTYQmHit9Y7qMqcJdb5a/O/Q8QcmhxiowxfZXqzXtRKfAFaukq1FobG05WYVcz3Uwsog6EVkqlQ9WZ7LNv2ZskLRut+o/bq2zuYGoiEtjLu4SVaPQrgRrcAf4HisMx6elJIjQffNjaaZTJ89kMJq8lGV/t+HfBSEUwxU6gK3ueDIAHDLbnaPbGTPs8bBNo2XZ+7rRU3xCkiDB/ZwOktuwguGFBSOA7UT129JOp8yQ3y4G2SvwwMNo7KUKr2R4PDY5q6FG2XoZZqJHOkPP/iOvy3e+3gpUg3tGYxsQF2XJaarvzqOfkrHMMnlKmCrkcueVeIRyxbMfp/FylxAL4D4AY6xdM2Otl7+hZjB49ZruoRitoa+N5w6AEG0CaIQoJWQ3k2UIGektjdhrDszJS47Q65efjiO93XEcUiEXh2bM4KJfYDxHI13M= | ||
| before_install: | ||
| - python setup.py sdist | ||
| - pip install dist/ga4gh_dos_schemas-*.tar.gz | ||
| - pip install dist/ga4gh_drs_schemas-*.tar.gz | ||
| - npm install -g swagger2openapi | ||
|
|
||
| script: | ||
| - make schemas | ||
| - nosetests python/ | ||
| - ga4gh_dos_client | ||
| - ga4gh_drs_client |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.