Skip to content

Commit

Permalink
Merge pull request #369 from ga4gh/release/drs-1.2.0
Browse files Browse the repository at this point in the history
DRS Release 1.2.0 into master

Merging following Sept 27th Cloud WS call
  • Loading branch information
Jeremy Adams authored Sep 27, 2021
2 parents 2425439 + 1c21ea2 commit eb3df1a
Show file tree
Hide file tree
Showing 105 changed files with 1,226 additions and 8,626 deletions.
20 changes: 20 additions & 0 deletions .spec-docs.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"docsRoot": "docs",
"defaultBranch": "master",
"branchPathBase": "preview",
"redocTheme": "ga4gh",
"buildPages": [
{
"apiSpecPath": "openapi/data_repository_service.openapi.yaml",
"htmlOutfile": "index.html",
"yamlOutfile": "openapi.yaml",
"jsonOutfile": "openapi.json"
},
{
"apiSpecPath": "pages/more-background-on-compact-identifiers/openapi.yaml",
"htmlOutfile": "more-background-on-compact-identifiers.html",
"yamlOutfile": "more-background-on-compact-identifiers.yaml",
"jsonOutfile": "more-background-on-compact-identifiers.json"
}
]
}
70 changes: 8 additions & 62 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
dist: trusty
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
Expand All @@ -18,69 +12,21 @@ branches:
- "/^release\\/\\d+\\.\\d+(\\.\\d+)?$/"
- "/^release\\/(drs-)?\\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 && 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

# the build process from James Eddy adapted from the WES repo
- stage: build_pages
language: java
jdk: oraclejdk8
before_install:
- chmod +x gradlew
- chmod +x scripts/fetchpages.sh
- chmod +x scripts/stagepages.sh
- stage: build_docs
language: node_js
node_js:
- "12"
before_script:
- npm install -g @redocly/openapi-cli && npm install -g redoc-cli
- npm install -g @ga4gh/[email protected]
script:
- "./scripts/fetchpages.sh"
- "./gradlew installSwagger buildSwagger asciidoctor"
- "./scripts/stagepages.sh"
before_deploy:
- "mv misc/.gitignore .gitignore"
- gh-openapi-docs
deploy:
provider: pages
skip_cleanup: true
keep_history: true
github-token: $GITHUB_TOKEN
on:
all_branches: true

# 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-repository-service-schemas
user: david4096
password:
secure: LlQn8ZBAb5ekujHnoDrmzrmXaM6TpyzByNHPH4FTbbdnJ8lkDPb/ZhYvdmqrOvXPQg81/IoYKlIvP7fY9kc3oGUJ2IXhcPFqiw8njsRE5Qaebp+YppQO7C3IWGlHoZtXNtC608ZSA4x0oneNeNy+Y8KYnqKbmOlbuvrYRlNYfe9/8z7yLPH8wdmp0GyvbViedr3p7PXhtQVUKAgPpgjffZnSA7P/Y6AdkvjHHv2xMAzWP/QmOFWZNxUXjg0miR0K7eGFeGBNMM/+QsVXrGOu/TCtPtJ4JXyD86nzrZUbsOluyAblxwGlrv05se5ImVhR210OC5zvSW2902y/lxCw5uek+xg4/tcSA1ckshxLeu02GfDygCktMUtqtKVIZ+qvU7H4dEQ6Jnz9yBvZW5M6V94Ew3wBFy0RB5I9k3MMQY21FdynIUEZzBgJbOChCbmlIDT1varBHvWBiwg8EwPOVuJt1CsOoptJxUsoJND4tAOPIvXMNI17qGJ+VWAVMVNn7cVUuhEeGXwQF4urrkFBA7WIYOp6O9R8Ipg6WnQdxVdnqb3NsEc19SRdFXQ82SYibKfIZxjpdmYVgKzTYsJGMhfG6fTw9D4JABhggfgShsnByrFtbbkn/9g64jXDOjwPLeRXwXYZe6ZV6M69PDWdo0o326Qq/OHBG5eU7z2plNI=

before_install:
- python setup.py sdist
- pip install dist/ga4gh_drs_schemas-*.tar.gz
- npm install -g swagger2openapi
script:
- make schemas
#- nosetests python/
- ga4gh_drs_client
Loading

0 comments on commit eb3df1a

Please sign in to comment.