Skip to content

Commit

Permalink
Merge branch 'release/v0.11.15'
Browse files Browse the repository at this point in the history
  • Loading branch information
ja573 committed Jan 18, 2024
2 parents a3daf14 + de2374d commit f9cb0f6
Show file tree
Hide file tree
Showing 15 changed files with 45 additions and 39 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [[0.11.15]](https://github.com/thoth-pub/thoth/releases/tag/v0.11.15) - 2024-01-18
### Changed
- [536](https://github.com/thoth-pub/thoth/issues/536) - Rename "SciELO" location platform to "SciELO Books"

## [[0.11.14]](https://github.com/thoth-pub/thoth/releases/tag/v0.11.14) - 2024-01-18
### Changed
- [#467](https://github.com/thoth-pub/thoth/issues/467), [#403](https://github.com/thoth-pub/thoth/issues/403), [#536](https://github.com/thoth-pub/thoth/issues/536) - Expand the list of location platforms with: GoogleBooks, InternetArchive, ScienceOpen, and Scielo
Expand Down
16 changes: 8 additions & 8 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "thoth"
version = "0.11.14"
version = "0.11.15"
authors = ["Javier Arias <[email protected]>", "Ross Higman <[email protected]>"]
edition = "2018"
license = "Apache-2.0"
Expand All @@ -16,11 +16,11 @@ maintenance = { status = "actively-developed" }
members = ["thoth-api", "thoth-api-server", "thoth-app", "thoth-app-server", "thoth-client", "thoth-errors", "thoth-export-server"]

[dependencies]
thoth-api = { version = "0.11.14", path = "thoth-api", features = ["backend"] }
thoth-api-server = { version = "0.11.14", path = "thoth-api-server" }
thoth-app-server = { version = "0.11.14", path = "thoth-app-server" }
thoth-errors = { version = "0.11.14", path = "thoth-errors" }
thoth-export-server = { version = "0.11.14", path = "thoth-export-server" }
thoth-api = { version = "0.11.15", path = "thoth-api", features = ["backend"] }
thoth-api-server = { version = "0.11.15", path = "thoth-api-server" }
thoth-app-server = { version = "0.11.15", path = "thoth-app-server" }
thoth-errors = { version = "0.11.15", path = "thoth-errors" }
thoth-export-server = { version = "0.11.15", path = "thoth-export-server" }
clap = { version = "4.4.7", features = ["cargo", "env"] }
dialoguer = { version = "0.11.0", features = ["password"] }
dotenv = "0.15.0"
Expand Down
6 changes: 3 additions & 3 deletions thoth-api-server/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "thoth-api-server"
version = "0.11.14"
version = "0.11.15"
authors = ["Javier Arias <[email protected]>", "Ross Higman <[email protected]>"]
edition = "2018"
license = "Apache-2.0"
Expand All @@ -9,8 +9,8 @@ repository = "https://github.com/thoth-pub/thoth"
readme = "README.md"

[dependencies]
thoth-api = { version = "0.11.14", path = "../thoth-api", features = ["backend"] }
thoth-errors = { version = "0.11.14", path = "../thoth-errors" }
thoth-api = { version = "0.11.15", path = "../thoth-api", features = ["backend"] }
thoth-errors = { version = "0.11.15", path = "../thoth-errors" }
actix-web = "4.4.1"
actix-cors = "0.7.0"
actix-identity = "0.6.0"
Expand Down
4 changes: 2 additions & 2 deletions thoth-api/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "thoth-api"
version = "0.11.14"
version = "0.11.15"
authors = ["Javier Arias <[email protected]>", "Ross Higman <[email protected]>"]
edition = "2018"
license = "Apache-2.0"
Expand All @@ -16,7 +16,7 @@ maintenance = { status = "actively-developed" }
backend = ["diesel", "diesel-derive-enum", "diesel_migrations", "futures", "actix-web"]

[dependencies]
thoth-errors = { version = "0.11.14", path = "../thoth-errors" }
thoth-errors = { version = "0.11.15", path = "../thoth-errors" }
actix-web = { version = "4.4.1", optional = true }
argon2rs = "0.2.5"
isbn2 = "0.4.0"
Expand Down
1 change: 1 addition & 0 deletions thoth-api/migrations/v0.11.15/down.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ALTER TYPE location_platform RENAME VALUE 'SciELO Books' TO 'SciELO';
1 change: 1 addition & 0 deletions thoth-api/migrations/v0.11.15/up.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ALTER TYPE location_platform RENAME VALUE 'SciELO' TO 'SciELO Books';
12 changes: 6 additions & 6 deletions thoth-api/src/model/location/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,9 @@ pub enum LocationPlatform {
#[cfg_attr(feature = "backend", db_rename = "ScienceOpen")]
#[strum(serialize = "ScienceOpen")]
ScienceOpen,
#[cfg_attr(feature = "backend", db_rename = "SciELO")]
#[strum(serialize = "SciELO")]
Scielo,
#[cfg_attr(feature = "backend", db_rename = "SciELO Books")]
#[strum(serialize = "SciELO Books")]
ScieloBooks,
#[cfg_attr(feature = "backend", db_rename = "Other")]
#[default]
Other,
Expand Down Expand Up @@ -179,7 +179,7 @@ fn test_locationplatform_display() {
"Internet Archive"
);
assert_eq!(format!("{}", LocationPlatform::ScienceOpen), "ScienceOpen");
assert_eq!(format!("{}", LocationPlatform::Scielo), "SciELO");
assert_eq!(format!("{}", LocationPlatform::ScieloBooks), "SciELO Books");
assert_eq!(format!("{}", LocationPlatform::Other), "Other");
}

Expand Down Expand Up @@ -239,8 +239,8 @@ fn test_locationplatform_fromstr() {
LocationPlatform::ScienceOpen
);
assert_eq!(
LocationPlatform::from_str("SciELO").unwrap(),
LocationPlatform::Scielo
LocationPlatform::from_str("SciELO Books").unwrap(),
LocationPlatform::ScieloBooks
);
assert_eq!(
LocationPlatform::from_str("Other").unwrap(),
Expand Down
2 changes: 1 addition & 1 deletion thoth-app-server/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "thoth-app-server"
version = "0.11.14"
version = "0.11.15"
authors = ["Javier Arias <[email protected]>", "Ross Higman <[email protected]>"]
edition = "2018"
license = "Apache-2.0"
Expand Down
6 changes: 3 additions & 3 deletions thoth-app/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "thoth-app"
version = "0.11.14"
version = "0.11.15"
authors = ["Javier Arias <[email protected]>", "Ross Higman <[email protected]>"]
edition = "2018"
license = "Apache-2.0"
Expand Down Expand Up @@ -41,5 +41,5 @@ uuid = { version = "0.8.2", features = ["serde", "v4"] }
# `getrandom` is a dependency of `uuid`, we need to explicitly import and include the `js` feature to enable wasm
# https://docs.rs/getrandom/latest/getrandom/#webassembly-support
getrandom = { version = "0.2", features = ["js"] }
thoth-api = { version = "0.11.14", path = "../thoth-api" }
thoth-errors = { version = "0.11.14", path = "../thoth-errors" }
thoth-api = { version = "0.11.15", path = "../thoth-api" }
thoth-errors = { version = "0.11.15", path = "../thoth-errors" }
2 changes: 1 addition & 1 deletion thoth-app/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"start_url": "/?homescreen=1",
"background_color": "#ffffff",
"theme_color": "#ffdd57",
"version": "0.11.14",
"version": "0.11.15",
"icons": [
{
"src": "\/android-icon-36x36.png",
Expand Down
6 changes: 3 additions & 3 deletions thoth-client/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "thoth-client"
version = "0.11.14"
version = "0.11.15"
authors = ["Javier Arias <[email protected]>", "Ross Higman <[email protected]>"]
edition = "2018"
license = "Apache-2.0"
Expand All @@ -9,8 +9,8 @@ repository = "https://github.com/thoth-pub/thoth"
readme = "README.md"

[dependencies]
thoth-api = {version = "0.11.14", path = "../thoth-api" }
thoth-errors = {version = "0.11.14", path = "../thoth-errors" }
thoth-api = {version = "0.11.15", path = "../thoth-api" }
thoth-errors = {version = "0.11.15", path = "../thoth-errors" }
graphql_client = "0.13.0"
chrono = { version = "0.4.31", features = ["serde"] }
reqwest = { version = "0.11", features = ["json"] }
Expand Down
2 changes: 1 addition & 1 deletion thoth-client/assets/schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -17524,7 +17524,7 @@
"deprecationReason": null,
"description": null,
"isDeprecated": false,
"name": "SCIELO"
"name": "SCIELO_BOOKS"
},
{
"deprecationReason": null,
Expand Down
2 changes: 1 addition & 1 deletion thoth-errors/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "thoth-errors"
version = "0.11.14"
version = "0.11.15"
authors = ["Javier Arias <[email protected]>", "Ross Higman <[email protected]>"]
edition = "2018"
license = "Apache-2.0"
Expand Down
8 changes: 4 additions & 4 deletions thoth-export-server/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "thoth-export-server"
version = "0.11.14"
version = "0.11.15"
authors = ["Javier Arias <[email protected]>", "Ross Higman <[email protected]>"]
edition = "2018"
license = "Apache-2.0"
Expand All @@ -9,9 +9,9 @@ repository = "https://github.com/thoth-pub/thoth"
readme = "README.md"

[dependencies]
thoth-api = { version = "0.11.14", path = "../thoth-api" }
thoth-errors = { version = "0.11.14", path = "../thoth-errors" }
thoth-client = { version = "0.11.14", path = "../thoth-client" }
thoth-api = { version = "0.11.15", path = "../thoth-api" }
thoth-errors = { version = "0.11.15", path = "../thoth-errors" }
thoth-client = { version = "0.11.15", path = "../thoth-client" }
actix-web = "4.4.1"
actix-cors = "0.7.0"
cc_license = "0.1.0"
Expand Down

0 comments on commit f9cb0f6

Please sign in to comment.