Merge branch 'respect-config-for-search-api-endpoints-#283' of github…

….com:ral-facilities/datagateway-api into respect-config-for-search-api-endpoints-#283
ral-facilities · Nov 23, 2021 · c029aae · c029aae
2 parents 1ba2b5e + 0edfb2e
commit c029aae
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 <!--next-version-placeholder-->
 
+## v2.0.0 (2021-11-22)
+### Breaking
+* Adding breaking change to correct the version bump which didn't happen when merging #285  ([`44c48e8`](https://github.com/ral-facilities/datagateway-api/commit/44c48e8b772147bfcf395d1430e067730d66df44))
+
+### Documentation
+* Adjust versioning documentation ([`44c48e8`](https://github.com/ral-facilities/datagateway-api/commit/44c48e8b772147bfcf395d1430e067730d66df44))
+
 ## v1.1.0 (2021-11-19)
 ### Feature
 * Add unimplemented endpoint definitions for search API #257 ([`d0e52d9`](https://github.com/ral-facilities/datagateway-api/commit/d0e52d96dd3b94ce54dcc9b81969e777a196922a))

diff --git a/README.md b/README.md
@@ -314,10 +314,7 @@ fix: fix bug found with count endpoints #issue-number
 feat: add endpoints for search API #issue-number
 
 # Commit which introduces a breaking change for users
-BREAKING CHANGE: change format of `config.json`, the previous version is no longer supported #issue-number
-
-# You can also use `BREAKING CHANGE:` in the additional information if the commit also adds a new feature, like so:
-feat: my new feature #issue-number
+<commit-type>: change format of `config.json`, the previous version is no longer supported #issue-number
 
 BREAKING CHANGE: this feature means X functionality has been removed
 ```

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "datagateway-api"
-version = "1.1.0"
+version = "2.0.0"
 description = "ICAT API to interface with the DataGateway"
 license = "Apache-2.0"
 readme = "README.md"