diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index f064c62..683b9b5 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -148,6 +148,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} windows_build: + if: false # disable for now because is broken name: Build Windows command line runs-on: windows-2019 steps: diff --git a/CHANGELOG.md b/CHANGELOG.md index df9f7c8..e9dbcb9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,6 +29,9 @@ this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm reads, then push that call up to the parent node. Code still works as normal on the existing (soon to be old) panels. +- When reporting panel version in JSON file and stderr logging, only had + the "main" version of the collection of panels, eg "20220705" for tb. + Changed to also report the specific panel used, eg "20220705/202206". ## [0.12.2] diff --git a/setup.py b/setup.py index d90d8fd..b896268 100644 --- a/setup.py +++ b/setup.py @@ -97,7 +97,7 @@ def read(*names, **kwargs): setup( name="mykrobe", - version="0.12.2", + version="0.13.0", license="MIT", description="Antibiotic resistance prediction in minutes", author="Phelim Bradley", diff --git a/src/mykrobe/cmds/amr.py b/src/mykrobe/cmds/amr.py index 76e778b..552112e 100755 --- a/src/mykrobe/cmds/amr.py +++ b/src/mykrobe/cmds/amr.py @@ -169,7 +169,7 @@ def ref_data_from_args(args): "lineage_json": species_dir.json_file("lineage"), "ncbi_names_json": species_dir.json_file("ncbi_names"), "kmer": species_dir.kmer(), - "version": species_dir.version(), + "version": species_dir.version() + "/" + species_dir.panel_name, "species_phylo_group": species_dir.species_phylo_group(), }