Skip to content

Commit f9cb0f6

Browse files
ja573ja573
committed
Merge branch 'release/v0.11.15'
2 parents a3daf14 + de2374d commit f9cb0f6

File tree

15 files changed

+45
-39
lines changed

15 files changed

+45
-39
lines changed

‎CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
66

77
## [Unreleased]
88

9+
## [[0.11.15]](https://github.com/thoth-pub/thoth/releases/tag/v0.11.15) - 2024-01-18
10+
### Changed
11+
- [536](https://github.com/thoth-pub/thoth/issues/536) - Rename "SciELO" location platform to "SciELO Books"
12+
913
## [[0.11.14]](https://github.com/thoth-pub/thoth/releases/tag/v0.11.14) - 2024-01-18
1014
### Changed
1115
- [#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

‎Cargo.lock

+8-8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "thoth"
3-
version = "0.11.14"
3+
version = "0.11.15"
44
authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
55
edition = "2018"
66
license = "Apache-2.0"
@@ -16,11 +16,11 @@ maintenance = { status = "actively-developed" }
1616
members = ["thoth-api", "thoth-api-server", "thoth-app", "thoth-app-server", "thoth-client", "thoth-errors", "thoth-export-server"]
1717

1818
[dependencies]
19-
thoth-api = { version = "0.11.14", path = "thoth-api", features = ["backend"] }
20-
thoth-api-server = { version = "0.11.14", path = "thoth-api-server" }
21-
thoth-app-server = { version = "0.11.14", path = "thoth-app-server" }
22-
thoth-errors = { version = "0.11.14", path = "thoth-errors" }
23-
thoth-export-server = { version = "0.11.14", path = "thoth-export-server" }
19+
thoth-api = { version = "0.11.15", path = "thoth-api", features = ["backend"] }
20+
thoth-api-server = { version = "0.11.15", path = "thoth-api-server" }
21+
thoth-app-server = { version = "0.11.15", path = "thoth-app-server" }
22+
thoth-errors = { version = "0.11.15", path = "thoth-errors" }
23+
thoth-export-server = { version = "0.11.15", path = "thoth-export-server" }
2424
clap = { version = "4.4.7", features = ["cargo", "env"] }
2525
dialoguer = { version = "0.11.0", features = ["password"] }
2626
dotenv = "0.15.0"

‎thoth-api-server/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "thoth-api-server"
3-
version = "0.11.14"
3+
version = "0.11.15"
44
authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
55
edition = "2018"
66
license = "Apache-2.0"
@@ -9,8 +9,8 @@ repository = "https://github.com/thoth-pub/thoth"
99
readme = "README.md"
1010

1111
[dependencies]
12-
thoth-api = { version = "0.11.14", path = "../thoth-api", features = ["backend"] }
13-
thoth-errors = { version = "0.11.14", path = "../thoth-errors" }
12+
thoth-api = { version = "0.11.15", path = "../thoth-api", features = ["backend"] }
13+
thoth-errors = { version = "0.11.15", path = "../thoth-errors" }
1414
actix-web = "4.4.1"
1515
actix-cors = "0.7.0"
1616
actix-identity = "0.6.0"

‎thoth-api/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "thoth-api"
3-
version = "0.11.14"
3+
version = "0.11.15"
44
authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
55
edition = "2018"
66
license = "Apache-2.0"
@@ -16,7 +16,7 @@ maintenance = { status = "actively-developed" }
1616
backend = ["diesel", "diesel-derive-enum", "diesel_migrations", "futures", "actix-web"]
1717

1818
[dependencies]
19-
thoth-errors = { version = "0.11.14", path = "../thoth-errors" }
19+
thoth-errors = { version = "0.11.15", path = "../thoth-errors" }
2020
actix-web = { version = "4.4.1", optional = true }
2121
argon2rs = "0.2.5"
2222
isbn2 = "0.4.0"

‎thoth-api/migrations/v0.11.15/down.sql

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ALTER TYPE location_platform RENAME VALUE 'SciELO Books' TO 'SciELO';

‎thoth-api/migrations/v0.11.15/up.sql

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ALTER TYPE location_platform RENAME VALUE 'SciELO' TO 'SciELO Books';

‎thoth-api/src/model/location/mod.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@ pub enum LocationPlatform {
5757
#[cfg_attr(feature = "backend", db_rename = "ScienceOpen")]
5858
#[strum(serialize = "ScienceOpen")]
5959
ScienceOpen,
60-
#[cfg_attr(feature = "backend", db_rename = "SciELO")]
61-
#[strum(serialize = "SciELO")]
62-
Scielo,
60+
#[cfg_attr(feature = "backend", db_rename = "SciELO Books")]
61+
#[strum(serialize = "SciELO Books")]
62+
ScieloBooks,
6363
#[cfg_attr(feature = "backend", db_rename = "Other")]
6464
#[default]
6565
Other,
@@ -179,7 +179,7 @@ fn test_locationplatform_display() {
179179
"Internet Archive"
180180
);
181181
assert_eq!(format!("{}", LocationPlatform::ScienceOpen), "ScienceOpen");
182-
assert_eq!(format!("{}", LocationPlatform::Scielo), "SciELO");
182+
assert_eq!(format!("{}", LocationPlatform::ScieloBooks), "SciELO Books");
183183
assert_eq!(format!("{}", LocationPlatform::Other), "Other");
184184
}
185185

@@ -239,8 +239,8 @@ fn test_locationplatform_fromstr() {
239239
LocationPlatform::ScienceOpen
240240
);
241241
assert_eq!(
242-
LocationPlatform::from_str("SciELO").unwrap(),
243-
LocationPlatform::Scielo
242+
LocationPlatform::from_str("SciELO Books").unwrap(),
243+
LocationPlatform::ScieloBooks
244244
);
245245
assert_eq!(
246246
LocationPlatform::from_str("Other").unwrap(),

‎thoth-app-server/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "thoth-app-server"
3-
version = "0.11.14"
3+
version = "0.11.15"
44
authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
55
edition = "2018"
66
license = "Apache-2.0"

‎thoth-app/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "thoth-app"
3-
version = "0.11.14"
3+
version = "0.11.15"
44
authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
55
edition = "2018"
66
license = "Apache-2.0"
@@ -41,5 +41,5 @@ uuid = { version = "0.8.2", features = ["serde", "v4"] }
4141
# `getrandom` is a dependency of `uuid`, we need to explicitly import and include the `js` feature to enable wasm
4242
# https://docs.rs/getrandom/latest/getrandom/#webassembly-support
4343
getrandom = { version = "0.2", features = ["js"] }
44-
thoth-api = { version = "0.11.14", path = "../thoth-api" }
45-
thoth-errors = { version = "0.11.14", path = "../thoth-errors" }
44+
thoth-api = { version = "0.11.15", path = "../thoth-api" }
45+
thoth-errors = { version = "0.11.15", path = "../thoth-errors" }

‎thoth-app/manifest.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"start_url": "/?homescreen=1",
1010
"background_color": "#ffffff",
1111
"theme_color": "#ffdd57",
12-
"version": "0.11.14",
12+
"version": "0.11.15",
1313
"icons": [
1414
{
1515
"src": "\/android-icon-36x36.png",

‎thoth-client/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "thoth-client"
3-
version = "0.11.14"
3+
version = "0.11.15"
44
authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
55
edition = "2018"
66
license = "Apache-2.0"
@@ -9,8 +9,8 @@ repository = "https://github.com/thoth-pub/thoth"
99
readme = "README.md"
1010

1111
[dependencies]
12-
thoth-api = {version = "0.11.14", path = "../thoth-api" }
13-
thoth-errors = {version = "0.11.14", path = "../thoth-errors" }
12+
thoth-api = {version = "0.11.15", path = "../thoth-api" }
13+
thoth-errors = {version = "0.11.15", path = "../thoth-errors" }
1414
graphql_client = "0.13.0"
1515
chrono = { version = "0.4.31", features = ["serde"] }
1616
reqwest = { version = "0.11", features = ["json"] }

‎thoth-client/assets/schema.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -17524,7 +17524,7 @@
1752417524
"deprecationReason": null,
1752517525
"description": null,
1752617526
"isDeprecated": false,
17527-
"name": "SCIELO"
17527+
"name": "SCIELO_BOOKS"
1752817528
},
1752917529
{
1753017530
"deprecationReason": null,

‎thoth-errors/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "thoth-errors"
3-
version = "0.11.14"
3+
version = "0.11.15"
44
authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
55
edition = "2018"
66
license = "Apache-2.0"

‎thoth-export-server/Cargo.toml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "thoth-export-server"
3-
version = "0.11.14"
3+
version = "0.11.15"
44
authors = ["Javier Arias <javi@openbookpublishers.com>", "Ross Higman <ross@openbookpublishers.com>"]
55
edition = "2018"
66
license = "Apache-2.0"
@@ -9,9 +9,9 @@ repository = "https://github.com/thoth-pub/thoth"
99
readme = "README.md"
1010

1111
[dependencies]
12-
thoth-api = { version = "0.11.14", path = "../thoth-api" }
13-
thoth-errors = { version = "0.11.14", path = "../thoth-errors" }
14-
thoth-client = { version = "0.11.14", path = "../thoth-client" }
12+
thoth-api = { version = "0.11.15", path = "../thoth-api" }
13+
thoth-errors = { version = "0.11.15", path = "../thoth-errors" }
14+
thoth-client = { version = "0.11.15", path = "../thoth-client" }
1515
actix-web = "4.4.1"
1616
actix-cors = "0.7.0"
1717
cc_license = "0.1.0"

0 commit comments

Comments
 (0)