From 772a9ea0ed5add2823a0c5c331693d32ac994485 Mon Sep 17 00:00:00 2001 From: Thomas Schaffter Date: Mon, 17 May 2021 13:57:55 -0700 Subject: [PATCH] Release 1.1.1 (#8) * Start update * Run npm run generate:server:latest * Bump project version to 1.1.1 * Update Lock threads workflow --- CODE_OF_CONDUCT.md => .github/CODE_OF_CONDUCT.md | 0 CONTRIBUTING.md => .github/CONTRIBUTING.md | 2 +- .github/workflows/lock.yml | 2 +- .gitignore | 1 - README.md | 7 ++++--- docker-compose.yml | 2 +- openapitools.json | 7 +++++++ server/openapi_server/controllers/tool_controller.py | 6 +++--- server/openapi_server/openapi/openapi.yaml | 10 ++++++---- 9 files changed, 23 insertions(+), 14 deletions(-) rename CODE_OF_CONDUCT.md => .github/CODE_OF_CONDUCT.md (100%) rename CONTRIBUTING.md => .github/CONTRIBUTING.md (99%) create mode 100644 openapitools.json diff --git a/CODE_OF_CONDUCT.md b/.github/CODE_OF_CONDUCT.md similarity index 100% rename from CODE_OF_CONDUCT.md rename to .github/CODE_OF_CONDUCT.md diff --git a/CONTRIBUTING.md b/.github/CONTRIBUTING.md similarity index 99% rename from CONTRIBUTING.md rename to .github/CONTRIBUTING.md index f1b1545..a17399c 100644 --- a/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -126,7 +126,7 @@ channel that best matches the topic of your request. -[Code of Conduct]: https://github.com/nlpsandbox/date-annotator-example/blob/develop/CODE_OF_CONDUCT.md +[Code of Conduct]: https://github.com/nlpsandbox/date-annotator-example/blob/develop/.github/CODE_OF_CONDUCT.md [upstream remote]: https://help.github.com/en/articles/configuring-a-remote-for-a-fork [reaction]: https://github.blog/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/ [docs site]: https://github.com/nlpsandbox/nlpsandbox-website-synapse diff --git a/.github/workflows/lock.yml b/.github/workflows/lock.yml index a1d5c74..13f1619 100644 --- a/.github/workflows/lock.yml +++ b/.github/workflows/lock.yml @@ -1,4 +1,4 @@ -name: 'Lock Threads' +name: Lock threads on: schedule: diff --git a/.gitignore b/.gitignore index 17f2e91..97ead2d 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,3 @@ node_modules/ .env dist.yaml openapi.yaml -openapitools.json \ No newline at end of file diff --git a/README.md b/README.md index 76b5522..a857ad3 100644 --- a/README.md +++ b/README.md @@ -21,8 +21,8 @@ note. ### Specification -- ID Annotator API version: 1.1.0 -- Tool version: 1.1.0 +- ID Annotator API version: 1.1.1 +- Tool version: 1.1.1 - Docker image: [nlpsandbox/id-annotator-example] ## Model @@ -238,7 +238,7 @@ its performance on public and private datasets. ## Contributing Thinking about contributing to this project? Get started by reading our -[Contributor Guide](CONTRIBUTING.md). +[Contributor Guide]. ## License @@ -258,3 +258,4 @@ Thinking about contributing to this project? Get started by reading our [nlpsandbox/nlpsandbox-schemas]: https://github.com/nlpsandbox/nlpsandbox-schemas [semantic versioning]: https://semver.org/ [OpenAPITools/openapi-generator]: https://github.com/OpenAPITools/openapi-generator +[Contributor Guide]: .github/CONTRIBUTING.md diff --git a/docker-compose.yml b/docker-compose.yml index 96bf917..183d5cc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.8" services: id-annotator: - image: nlpsandbox/id-annotator-example:1.1.0 + image: nlpsandbox/id-annotator-example:1.1.1 build: context: server dockerfile: Dockerfile diff --git a/openapitools.json b/openapitools.json new file mode 100644 index 0000000..d2fdbae --- /dev/null +++ b/openapitools.json @@ -0,0 +1,7 @@ +{ + "$schema": "node_modules/@openapitools/openapi-generator-cli/config.schema.json", + "spaces": 2, + "generator-cli": { + "version": "5.1.1" + } +} diff --git a/server/openapi_server/controllers/tool_controller.py b/server/openapi_server/controllers/tool_controller.py index 8347667..2ce14d2 100644 --- a/server/openapi_server/controllers/tool_controller.py +++ b/server/openapi_server/controllers/tool_controller.py @@ -13,15 +13,15 @@ def get_tool(): # noqa: E501 """ tool = Tool( name="id-annotator-example", - version="1.1.0", + version="1.1.1", license=License.APACHE_2_0, repository="github:nlpsandbox/id-annotator-example", description="Example implementation of the NLP Sandbox ID Annotator", - author="The NLP Sandbox Team", + author="NLP Sandbox Team", author_email="thomas.schaffter@sagebionetworks.org", url="https://github.com/nlpsandbox/id-annotator-example", type="nlpsandbox:id-annotator", - api_version="1.1.0" + api_version="1.1.1" ) return tool, 200 diff --git a/server/openapi_server/openapi/openapi.yaml b/server/openapi_server/openapi/openapi.yaml index 5d3df26..1c35da4 100644 --- a/server/openapi_server/openapi/openapi.yaml +++ b/server/openapi_server/openapi/openapi.yaml @@ -27,7 +27,7 @@ info: name: Apache 2.0 url: https://github.com/nlpsandbox/nlpsandbox-schemas/blob/develop/LICENSE title: NLP Sandbox ID Annotator API - version: 1.1.0 + version: 1.1.1 x-logo: url: https://nlpsandbox.github.io/nlpsandbox-schemas/logo.png servers: @@ -412,7 +412,7 @@ components: authorEmail: author@example.com url: https://example.com type: nlpsandbox:date-annotator - apiVersion: 1.1.0 + apiVersion: 1.1.1 properties: name: description: The tool name @@ -483,7 +483,7 @@ components: authorEmail: author@example.com url: https://example.com type: nlpsandbox:date-annotator - apiVersion: 1.1.0 + apiVersion: 1.1.1 - name: awesome-nlp-tool version: 1.0.6 license: apache-2.0 @@ -493,7 +493,7 @@ components: authorEmail: author@example.com url: https://example.com type: nlpsandbox:date-annotator - apiVersion: 1.1.0 + apiVersion: 1.1.1 properties: tools: description: A list of tools @@ -520,4 +520,6 @@ components: - ssn - vehicle type: string + required: + - idType type: object