Skip to content

Commit 8731d93

Browse files
committed
Merge branch 'release/v0.13.14'
2 parents 7774777 + d64f8f7 commit 8731d93

62 files changed

Lines changed: 155 additions & 62 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
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.13.14]](https://github.com/thoth-pub/thoth/releases/tag/v0.13.14) - 2025-10-14
10+
### Changed
11+
- [708](https://github.com/thoth-pub/thoth/pull/708) - Replace ISBN parsing library with [`isbn`](https://crates.io/crates/isbn)
12+
913
## [[0.13.13]](https://github.com/thoth-pub/thoth/releases/tag/v0.13.13) - 2025-06-05
1014
### Changed
1115
- [691](https://github.com/thoth-pub/thoth/issues/691) - Require a license for full KBART output, fall back to work\_id for KBART title ID if no DOI available

Cargo.lock

Lines changed: 17 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "thoth"
3-
version = "0.13.13"
3+
version = "0.13.14"
44
authors = ["Javier Arias <javi@thoth.pub>", "Ross Higman <ross@thoth.pub>"]
55
edition = "2021"
66
license = "Apache-2.0"
@@ -15,11 +15,11 @@ maintenance = { status = "actively-developed" }
1515
members = ["thoth-api", "thoth-api-server", "thoth-app", "thoth-app-server", "thoth-client", "thoth-errors", "thoth-export-server"]
1616

1717
[dependencies]
18-
thoth-api = { version = "=0.13.13", path = "thoth-api", features = ["backend"] }
19-
thoth-api-server = { version = "=0.13.13", path = "thoth-api-server" }
20-
thoth-app-server = { version = "=0.13.13", path = "thoth-app-server" }
21-
thoth-errors = { version = "=0.13.13", path = "thoth-errors" }
22-
thoth-export-server = { version = "=0.13.13", path = "thoth-export-server" }
18+
thoth-api = { version = "=0.13.14", path = "thoth-api", features = ["backend"] }
19+
thoth-api-server = { version = "=0.13.14", path = "thoth-api-server" }
20+
thoth-app-server = { version = "=0.13.14", path = "thoth-app-server" }
21+
thoth-errors = { version = "=0.13.14", path = "thoth-errors" }
22+
thoth-export-server = { version = "=0.13.14", path = "thoth-export-server" }
2323
clap = { version = "4.5.32", features = ["cargo", "env"] }
2424
dialoguer = { version = "0.11.0", features = ["password"] }
2525
dotenv = "0.15.0"

Dockerfile

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,24 @@
1-
ARG MUSL_IMAGE=clux/muslrust:1.86.0-stable
2-
3-
FROM ${MUSL_IMAGE} as build
1+
FROM rust:1.90.0
42

53
ARG THOTH_GRAPHQL_API=https://api.thoth.pub
64
ARG THOTH_EXPORT_API=https://export.thoth.pub
75
ENV THOTH_GRAPHQL_API=${THOTH_GRAPHQL_API}
86
ENV THOTH_EXPORT_API=${THOTH_EXPORT_API}
97

8+
# Install build dependencies
9+
RUN apt-get update && apt-get install -y \
10+
libssl-dev \
11+
pkg-config \
12+
&& rm -rf /var/lib/apt/lists/*
13+
1014
# Get source
1115
COPY . .
1216

13-
# Build Thoth for release
17+
# Build Thoth for release from source
1418
RUN cargo build --release
1519

16-
# Switch to minimal image for run time
17-
FROM scratch
18-
19-
# Get thoth and diesel binaries
20-
COPY --from=build \
21-
/volume/target/x86_64-unknown-linux-musl/release/thoth /
22-
23-
# Get CA certificates
24-
COPY --from=build \
25-
/etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
20+
# Move the binary to root for easier access
21+
RUN mv target/release/thoth /thoth
2622

2723
# Expose thoth's default ports
2824
EXPOSE 8080

thoth-api-server/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "thoth-api-server"
3-
version = "0.13.13"
3+
version = "0.13.14"
44
authors = ["Javier Arias <javi@thoth.pub>", "Ross Higman <ross@thoth.pub>"]
55
edition = "2021"
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.13.13", path = "../thoth-api", features = ["backend"] }
13-
thoth-errors = { version = "=0.13.13", path = "../thoth-errors" }
12+
thoth-api = { version = "=0.13.14", path = "../thoth-api", features = ["backend"] }
13+
thoth-errors = { version = "=0.13.14", path = "../thoth-errors" }
1414
actix-web = "4.10"
1515
actix-cors = "0.7.1"
1616
actix-http = "3.10.0"

thoth-api/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "thoth-api"
3-
version = "0.13.13"
3+
version = "0.13.14"
44
authors = ["Javier Arias <javi@thoth.pub>", "Ross Higman <ross@thoth.pub>"]
55
edition = "2021"
66
license = "Apache-2.0"
@@ -25,10 +25,10 @@ backend = [
2525
]
2626

2727
[dependencies]
28-
thoth-errors = { version = "=0.13.13", path = "../thoth-errors" }
28+
thoth-errors = { version = "=0.13.14", path = "../thoth-errors" }
2929
actix-web = { version = "4.10", optional = true }
3030
argon2rs = { version = "0.2.5", optional = true }
31-
isbn2 = "0.4.0"
31+
isbn = "0.6.0"
3232
chrono = { version = "0.4.40", features = ["serde"] }
3333
deadpool-redis = { version = "0.20.0", optional = true }
3434
diesel = { version = "2.2.8", features = ["postgres", "uuid", "chrono", "r2d2", "64-column-tables", "serde_json"], optional = true }

thoth-api/src/model/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use chrono::{DateTime, TimeZone, Utc};
2-
use isbn2::Isbn13;
2+
use isbn::Isbn13;
33
use serde::{Deserialize, Serialize};
44
use std::fmt;
55
use std::str::FromStr;

thoth-app-server/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "thoth-app-server"
3-
version = "0.13.13"
3+
version = "0.13.14"
44
authors = ["Javier Arias <javi@thoth.pub>", "Ross Higman <ross@thoth.pub>"]
55
edition = "2021"
66
license = "Apache-2.0"

thoth-app/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "thoth-app"
3-
version = "0.13.13"
3+
version = "0.13.14"
44
authors = ["Javier Arias <javi@thoth.pub>", "Ross Higman <ross@thoth.pub>"]
55
edition = "2021"
66
license = "Apache-2.0"
@@ -29,8 +29,8 @@ semver = "1.0.26"
2929
serde = { version = "1.0", features = ["derive"] }
3030
serde_json = "1.0"
3131
uuid = { version = "1.16.0", features = ["serde", "v4", "js"] }
32-
thoth-api = { version = "=0.13.13", path = "../thoth-api" }
33-
thoth-errors = { version = "=0.13.13", path = "../thoth-errors" }
32+
thoth-api = { version = "=0.13.14", path = "../thoth-api" }
33+
thoth-errors = { version = "=0.13.14", path = "../thoth-errors" }
3434

3535
[build-dependencies]
3636
dotenv = "0.15.0"

thoth-app/src/component/admin.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
#![allow(clippy::unnecessary_operation)]
2+
13
use thoth_api::account::model::AccountDetails;
24
use yew::html;
35
use yew::prelude::*;

0 commit comments

Comments
 (0)