From c84c8575326f8cb90c4677b4eb01884c90f691d2 Mon Sep 17 00:00:00 2001 From: Miro Cupak Date: Sun, 25 Mar 2018 22:27:57 +0200 Subject: [PATCH] Remove Proto3/Avro things, close #146 --- .gitignore | 15 --- .travis.yml | 2 +- CONTRIBUTING.md | 13 +-- README.md | 25 +---- pom.xml | 286 ------------------------------------------------ 5 files changed, 4 insertions(+), 337 deletions(-) delete mode 100644 pom.xml diff --git a/.gitignore b/.gitignore index 2810639b..894eaeeb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,3 @@ -*.py[cod] -target -*~ -#* -doc/source/schemas/*.avpr -build - #********** windows template********** # Windows image file caches @@ -41,7 +34,6 @@ $RECYCLE.BIN/ #********** emacs template********** -*~ \#*\# /.emacs.desktop /.emacs.desktop.lock @@ -62,16 +54,9 @@ tramp Session.vim -#********** maven template********** - -target/ - #********** Travis CI ********** !.travis.yml #********** IntelliJ files ****** *.iml - -#********** Dependency files ******** -src/avro-schema-test-base diff --git a/.travis.yml b/.travis.yml index 11ad398e..34ec363d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ branches: - master - develop script: -- nosetests -v $VIRTUAL_ENV/src/avro-schema-test-base +- notifications: slack: secure: RmyIMB6tA868r+dHECJ566r0+TCB6pHvg9PygNiM5ye+iX4I+CFKMoGzjeMVtuLI80MSzzoaB+PU6TczlhzdbJBALqiV74AQCoNGqswJzJCkJX7HDGk8LVFSsnpwClRLLLVgvBApGDS0ViRfGqsew8CJ8VR5BMDiU53z3Of4JHc= diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d66ab8c7..47c2ee9f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -6,7 +6,7 @@ There are two ways to contribute - via issues, which are used for discussion, an ## Issues -The project's [Issues Page](https://github.com/ga4gh/beacon-team/issues) is a forum to discuss both major and minor issues related to developing the Beacon API. It also serves as the means for collaborating with the group and discussing contributions that will ultimately lead to changes to the API. See the [Issue](#issue_resolution) section below for specifics on how issues are resolved by the community. +The project's [Issues Page](https://github.com/ga4gh-beacon/specification/issues) is a forum to discuss both major and minor issues related to developing the Beacon API. It also serves as the means for collaborating with the group and discussing contributions that will ultimately lead to changes to the API. See the [Issue](#issue_resolution) section below for specifics on how issues are resolved by the community. ## Pull Requests @@ -38,17 +38,6 @@ We sometimes waive the time constraint for cosmetic-only changes -- use good jud The project will strive for full consensus on everything until it runs into a problem with this model. -## Syntax Style and Conventions - -The current code conventions for the source files are as follows: - -- Use two-space indentation, and no tabs. -- Hard-wrap code to 80 characters per line. -- Use `UpperCamelCase` for object or record names. -- Use `lowerCamelCase` for attribute or method names. -- Use `CONSTANT_CASE` for global and constant values. -- Comments: Please use the OpenAPI description for addition information - ## Gitflow Workflow Our workflow is based on [Gitflow](https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow), which defines a strict branching model designed around the project release. This workflow uses two branches to record the history of the project. The master branch stores the official release history, and the develop branch serves as an integration branch for features. Aside from these two main branches, the workflow utilizes topic and release branches. diff --git a/README.md b/README.md index 7d49ab78..c4a2bfd7 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,4 @@ -# Beacon Schemas [![](https://travis-ci.org/ga4gh/beacon-team.svg?branch=develop)](https://travis-ci.org/ga4gh/beacon-team) [![](https://img.shields.io/badge/license-Apache%202-blue.svg)](https://raw.githubusercontent.com/ga4gh/beacon-team/develop/LICENSE) [![](https://beacon-team-slackin.herokuapp.com/badge.svg)](https://beacon-team-slackin.herokuapp.com/) [![](https://raw.githubusercontent.com/ZenHubIO/support/master/zenhub-badge.png)](https://zenhub.com) - +# Beacon API specification [![](https://travis-ci.org/ga4gh-beacon/specification.svg?branch=develop)](https://travis-ci.org/ga4gh-beacon/specification) [![](https://img.shields.io/badge/license-Apache%202-blue.svg)](https://raw.githubusercontent.com/ga4gh-beacon/specification/develop/LICENSE) [![](https://beacon-team-slackin.herokuapp.com/badge.svg)](https://beacon-team-slackin.herokuapp.com/) Specification Status: @@ -7,30 +6,10 @@ Specification Status: - - 4.0.0 - org.ga4gh - beacon-schemas - jar - 0.4.0-SNAPSHOT - - Beacon Schemas - Beacon data models and APIs - https://github.com/ga4gh/beacon-team - 2014 - - Global Alliance for Genomics and Health - http://genomicsandhealth.org - - - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - - - - - scm:git:https://github.com/ga4gh/beacon-team - scm:git:https://github.com/ga4gh/beacon-team - https://github.com/ga4gh/beacon-team - - - - - GA4GH developers - https://github.com/orgs/ga4gh/people - Global Alliance Data Working Group - http://ga4gh.org/ - - - - - 1.4.0.Final - - 3.0.0 - 3.5.1 - 2.8.2 - 1.4.1 - 1.6 - 2.5.2 - 3.0.2 - 2.10.4 - 2.5.3 - 3.0.1 - 3.5.1 - 3.0.1 - 2.19.1 - 1.5.0 - 0.5.0 - - [1.6,) - [3.1.0,) - 3.0.0 - - UTF-8 - UTF-8 - - - - 3.0 - - - - - - kr.motd.maven - os-maven-plugin - ${os.maven.version} - - - - - - - org.apache.maven.plugins - maven-clean-plugin - ${maven.clean.plugin.version} - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven.compiler.plugin.version} - - - org.apache.maven.plugins - maven-deploy-plugin - ${maven.deploy.plugin.version} - - - org.apache.maven.plugins - maven-enforcer-plugin - ${maven.enforcer.plugin.version} - - - org.apache.maven.plugins - maven-gpg-plugin - ${maven.gpg.plugin.version} - - - org.apache.maven.plugins - maven-install-plugin - ${maven.install.plugin.version} - - - org.apache.maven.plugins - maven-jar-plugin - ${maven.jar.plugin.version} - - - org.apache.maven.plugins - maven-javadoc-plugin - ${maven.javadoc.plugin.version} - - true - true - true - - - - org.apache.maven.plugins - maven-release-plugin - ${maven.release.plugin.version} - - true - false - release - deploy - - - - org.apache.maven.plugins - maven-resources-plugin - ${maven.resources.plugin.version} - - - org.apache.maven.plugins - maven-site-plugin - ${maven.site.plugin.version} - - - org.apache.maven.plugins - maven-source-plugin - ${maven.source.plugin.version} - - - org.apache.maven.plugins - maven-surefire-plugin - ${maven.surefire.plugin.version} - - - org.codehaus.mojo - exec-maven-plugin - ${maven.exec.plugin.version} - - - org.xolstice.maven.plugins - protobuf-maven-plugin - ${protobuf.plugin.version} - - - - - - - org.apache.maven.plugins - maven-enforcer-plugin - - - enforce-java - - enforce - - - - - ${maven.enforcer.maven.version} - - - ${maven.enforcer.jdk.version} - - - - - - - - org.xolstice.maven.plugins - protobuf-maven-plugin - - com.google.protobuf:protoc:${proto.version}:exe:${os.detected.classifier} - - - - - compile - compile-python - - - - - - - - - - - com.google.protobuf - protobuf-java - ${proto.version} - - - - - - - com.google.protobuf - protobuf-java - - - - - - ossrh - https://oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - - - - release - - - - org.apache.maven.plugins - maven-gpg-plugin - - - sign-artifacts - verify - - sign - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - attach-javadocs - - jar - - - - - - org.apache.maven.plugins - maven-source-plugin - - - attach-sources - - jar-no-fork - - - - - - - - -