diff --git a/.github/workflows/cli.yml b/.github/workflows/cli.yml index fa52501d9..8a5a2ff2f 100644 --- a/.github/workflows/cli.yml +++ b/.github/workflows/cli.yml @@ -111,7 +111,7 @@ jobs: run: | export PATH="${PATH}:${HOME}/bin" - version=$(dasel select -p toml -s ".package.version" -f "packages/nextclade/Cargo.toml") + version=$(dasel select -p toml -s ".workspace.package.version" -f "Cargo.toml") if [[ "$version" =~ (rc|beta|alpha) ]]; then export DATA_FULL_DOMAIN="https://data.master.clades.nextstrain.org/v3" fi diff --git a/CHANGELOG.md b/CHANGELOG.md index 36b5170e4..32721f2e5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +## Nextclade 3.2.1 + +### Nextclade CLI + +#### Fix "Dataset not found" error when using `nextclade dataset get` with `--tag` argument. + +This fixes a bug in the dataset filtering logic causing "Dataset not found" error when even correct name and tag were requested using `nextclade dataset get` with `--tag` argument. + + ## Nextclade 3.2.0 ### General diff --git a/Cargo.lock b/Cargo.lock index 1ac825c18..781ce6f71 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1711,7 +1711,7 @@ dependencies = [ [[package]] name = "nextclade" -version = "3.2.0" +version = "3.2.1" dependencies = [ "assert2", "atty", @@ -1774,7 +1774,7 @@ dependencies = [ [[package]] name = "nextclade-cli" -version = "3.2.0" +version = "3.2.1" dependencies = [ "assert2", "clap", @@ -1816,7 +1816,7 @@ dependencies = [ [[package]] name = "nextclade-web" -version = "3.2.0" +version = "3.2.1" dependencies = [ "assert2", "chrono", diff --git a/Cargo.toml b/Cargo.toml index 54c504304..81c2b325f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,7 +12,7 @@ exclude = [ [workspace.package] name = "nextclade" -version = "3.2.0" +version = "3.2.1" description = "Alignment, mutation calling, phylogenetic placement, clade assignment and quality control checks for viral genetic sequences. Library module." repository = "https://github.com/nextstrain/nextclade" documentation = "https://docs.nextstrain.org/projects/nextclade/en/stable/" diff --git a/scripts/cli_get_data_full_domain.sh b/scripts/cli_get_data_full_domain.sh index fbdc9eea3..6cacc1fc6 100755 --- a/scripts/cli_get_data_full_domain.sh +++ b/scripts/cli_get_data_full_domain.sh @@ -16,7 +16,7 @@ THIS_DIR="$( : "${1:?Branch name is required as the first argument.}" -version=$(dasel select -p toml -s ".package.version" -f "packages/nextclade-cli/Cargo.toml") +version=$(dasel select -p toml -s ".workspace.package.version" -f "Cargo.toml") prerel=$("${THIS_DIR}/semver" get prerel "${version}" | cut -d '.' -f 1) branch="${1}" diff --git a/scripts/publish_docker b/scripts/publish_docker index e57be2b68..181d941bd 100755 --- a/scripts/publish_docker +++ b/scripts/publish_docker @@ -41,7 +41,7 @@ declare -a BASE_IMAGES=( "debian" ) -version=$(dasel select -p toml -s ".package.version" -f "packages/nextclade-cli/Cargo.toml") +version=$(dasel select -p toml -s ".workspace.package.version" -f "Cargo.toml") version_major=$("${THIS_DIR}/semver" get major "${version}") release_type=$("${THIS_DIR}/semver" get prerel "${version}" | cut -d '.' -f 1) release_type=${release_type:=latest} diff --git a/scripts/publish_github b/scripts/publish_github index 177d02f18..bf13442a6 100755 --- a/scripts/publish_github +++ b/scripts/publish_github @@ -56,7 +56,7 @@ done [ -z "$repo" ] && echo "--repo is required" >/dev/stderr && exit 1 [ -z "$git_sha" ] && echo "--git_sha is required" >/dev/stderr && exit 1 -version=$(dasel select -p toml -s ".package.version" -f "packages/nextclade-cli/Cargo.toml") +version=$(dasel select -p toml -s ".workspace.package.version" -f "Cargo.toml") release_type=$("${THIS_DIR}/semver" get prerel "${version}" | cut -d '.' -f 1) prerelease_flag=${release_type:+--prerelease} diff --git a/scripts/release b/scripts/release index 598ae8d8a..432740b4c 100755 --- a/scripts/release +++ b/scripts/release @@ -82,7 +82,7 @@ if [ "$1" == "cli" ]; then echo "Bumping package versions in 'Cargo.toml' files" cargo set-version --workspace --bump="${2:-}" >/dev/null - version=$(dasel select -r toml -w - -s ".package.version" -f "packages/nextclade/Cargo.toml") + version=$(dasel select -r toml -w - -s ".workspace.package.version" -f "Cargo.toml") echo "Running \`cargo build\` to update 'Cargo.lock' file" cargo build --quiet >/dev/null