Skip to content

Commit

Permalink
Prep for v0.9.0
Browse files Browse the repository at this point in the history
  • Loading branch information
lewismc committed Mar 29, 2023
1 parent 86a0974 commit 98468a8
Show file tree
Hide file tree
Showing 9 changed files with 16 additions and 16 deletions.
6 changes: 3 additions & 3 deletions openapi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ info:
url: https://www.apache.org/licenses/LICENSE-2.0
termsOfService: TODO
title: tagbase-server API
version: v0.8.0
version: v0.9.0
servers:
- description: Local development tagbase-server
url: https://localhost/tagbase/api/v0.8.0
url: https://localhost/tagbase/api/v0.9.0
- description: ICCAT Test tagbase-server
url: https://162.13.162.49/tagbase/api/v0.8.0
url: https://162.13.162.49/tagbase/api/v0.9.0
tags:
- description: Ingestion operations.
name: ingest
Expand Down
2 changes: 1 addition & 1 deletion services/fswatch/post.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ while true
do
filename="${line##*/}"
echo "Contents of $PATH_TO_CHECK changed; Processing: $line"
curl -X 'POST' tagbase_server:5433/tagbase/api/v0.8.0/ingest?filename="$filename" -H 'accept: application/json' -T $line
curl -X 'POST' tagbase_server:5433/tagbase/api/v0.9.0/ingest?filename="$filename" -H 'accept: application/json' -T $line
done
done
2 changes: 1 addition & 1 deletion services/nginx/config/nginx.conf
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ http {
}

location /docs {
proxy_pass http://tagbase_server/tagbase/api/v0.8.0/ui;
proxy_pass http://tagbase_server/tagbase/api/v0.9.0/ui;
proxy_set_header Origin http://127.0.0.1;
proxy_hide_header Access-Control-Allow-Origin;
add_header Access-Control-Allow-Origin $http_origin;
Expand Down
2 changes: 1 addition & 1 deletion services/nginx/proxy/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ <h1>Navigation</h1>
<ul>
<li><b><a href="./docs" target="_blank">/docs</a></b>: visualize and interact with tagbase-server REST APIs.</li>
<li><b><a href="./pgadmin4" target="_blank">/pgadmin4</a></b>: administration and development platform for Tagbase PostGIS instances.</li>
<li><b><a href="./tagbase/api/v0.8.0" target="_blank">/tagbase/v0.8.0</a></b>: REST API base path.</li>
<li><b><a href="./tagbase/api/v0.9.0" target="_blank">/tagbase/v0.9.0</a></b>: REST API base path.</li>
</ul>

<h1>Documentation and Support</h1>
Expand Down
4 changes: 2 additions & 2 deletions tagbase_server/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ python3 -m tagbase_server
and open your browser to here:

```
http://localhost:8080/v0.8.0/ui/
http://localhost:8080/v0.9.0/ui/
```

Your OpenAPI definition lives here:

```
http://localhost:8080/v0.8.0/openapi.json
http://localhost:8080/v0.9.0/openapi.json
```

To launch the integration tests, use tox:
Expand Down
2 changes: 1 addition & 1 deletion tagbase_server/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from setuptools import setup, find_packages

NAME = "tagbase_server"
VERSION = "v0.8.0"
VERSION = "v0.9.0"

with open("README.md", "r") as fh:
long_description = fh.read()
Expand Down
6 changes: 3 additions & 3 deletions tagbase_server/tagbase_server/openapi/openapi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ info:
url: https://www.apache.org/licenses/LICENSE-2.0
termsOfService: TODO
title: tagbase-server API
version: v0.8.0
version: v0.9.0
servers:
- description: Local development tagbase-server
url: https://localhost/tagbase/api/v0.8.0
url: https://localhost/tagbase/api/v0.9.0
- description: ICCAT Test tagbase-server
url: https://162.13.162.49/tagbase/api/v0.8.0
url: https://162.13.162.49/tagbase/api/v0.9.0
tags:
- description: Ingestion operations.
name: ingest
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ def test_ingest_etuff_get(self):
"Accept": "application/json",
}
response = self.client.open(
"/tagbase/api/v0.8.0/ingest",
"/tagbase/api/v0.9.0/ingest",
method="GET",
headers=headers,
query_string=query_string,
Expand Down
6 changes: 3 additions & 3 deletions tagbase_server/tagbase_server/test/test_tags_controller.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ def test_get_tag(self):
"Accept": "application/json",
}
response = self.client.open(
"/tagbase/api/v0.8.0/tags/{tag_id}".format(tag_id=3),
"/tagbase/api/v0.9.0/tags/{tag_id}".format(tag_id=3),
method="GET",
headers=headers,
)
Expand All @@ -32,7 +32,7 @@ def test_list_tags(self):
"Accept": "application/json",
}
response = self.client.open(
"/tagbase/api/v0.8.0/tags", method="GET", headers=headers
"/tagbase/api/v0.9.0/tags", method="GET", headers=headers
)
self.assert500(response, "Response body is : " + response.data.decode("utf-8"))

Expand All @@ -49,7 +49,7 @@ def test_put_tag(self):
("solution_id", 2),
]
response = self.client.open(
"/tagbase/api/v0.8.0/tags/{tag_id}/subs/{sub_id}".format(
"/tagbase/api/v0.9.0/tags/{tag_id}/subs/{sub_id}".format(
tag_id=3, sub_id=6
),
method="PUT",
Expand Down

0 comments on commit 98468a8

Please sign in to comment.