From 95fee4bbf8307b7e21cd69037f51e7cb899ced05 Mon Sep 17 00:00:00 2001 From: Thomas Schaffter Date: Mon, 17 May 2021 14:19:09 -0700 Subject: [PATCH] Release 1.1.1 (#3) * Start update * Run npm run generate:server:latest * Bump project version to 1.1.1 --- CODE_OF_CONDUCT.md => .github/CODE_OF_CONDUCT.md | 0 CONTRIBUTING.md => .github/CONTRIBUTING.md | 2 +- .gitignore | 1 - README.md | 7 ++++--- docker-compose.yml | 2 +- openapitools.json | 7 +++++++ package-lock.json | 2 +- server/.openapi-generator/VERSION | 2 +- server/openapi_server/controllers/tool_controller.py | 6 +++--- server/openapi_server/openapi/openapi.yaml | 10 +++++----- 10 files changed, 23 insertions(+), 16 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/.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 89c71f9..1f25ab1 100644 --- a/README.md +++ b/README.md @@ -20,8 +20,8 @@ note. ### Specification -- Date Annotator API version: 1.1.0 -- Tool version: 1.1.0 +- Date Annotator API version: 1.1.1 +- Tool version: 1.1.1 - Docker image: [nlpsandbox/covid-symptom-annotator-example] ## Model @@ -237,7 +237,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 @@ -257,3 +257,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 195a904..b7f6bbb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.8" services: date-annotator: - image: nlpsandbox/date-annotator-example:1.1.0 + image: nlpsandbox/date-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/package-lock.json b/package-lock.json index b0a8789..5978590 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "date-annotator-example", + "name": "covid-symptom-annotator-example", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/server/.openapi-generator/VERSION b/server/.openapi-generator/VERSION index acf69b4..3bff059 100644 --- a/server/.openapi-generator/VERSION +++ b/server/.openapi-generator/VERSION @@ -1 +1 @@ -5.1.0 \ No newline at end of file +5.1.1 \ No newline at end of file diff --git a/server/openapi_server/controllers/tool_controller.py b/server/openapi_server/controllers/tool_controller.py index bf5dbea..4abbdff 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="covid-symptom-annotator-example", - version="1.1.0", + version="1.1.1", license=License.APACHE_2_0, repository="github:nlpsandbox/covid-symptom-annotator-example", description="Example of the NLP Sandbox COVID Symptom Annotator", - author="The NLP Sandbox Team", + author="NLP Sandbox Team", author_email="team@nlpsandbox.io", url="https://github.com/nlpsandbox/covid-symptom-annotator-example", type="nlpsandbox:covid-symptom-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 1306bce..31c75dd 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 COVID Symptom Annotator API - version: 1.1.0 + version: 1.1.1 x-logo: url: https://nlpsandbox.github.io/nlpsandbox-schemas/logo.png servers: @@ -276,7 +276,7 @@ components: note: identifier: awesome-note text: | - On 12/26/2020, Ms. Chloe Price met with Dr. Prescott in Seattle. She's had a dry cough for almost a week now. + The patient had a dry cough and fever or chills yesterday. He is also experiencing new loss of taste today and three days ago. type: loinc:LP29684-5 patientId: awesome-patient properties: @@ -415,7 +415,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 @@ -486,7 +486,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 @@ -496,7 +496,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