Merge pull request #4 from mksanger/apply_suggested_standards

Apply suggested standards
wtsi-npg · Oct 26, 2022 · 40af322 · 40af322
2 parents 885b054 + 77e0685
commit 40af322
Show file tree

Hide file tree

Showing 7 changed files with 113 additions and 122 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -26,10 +26,6 @@ jobs:
   test:
     runs-on: ubuntu-latest
 
-    strategy:
-      matrix:
-        mysql-version: ["5.7", "8.0"]
-
     steps:
       - uses: actions/checkout@v3
 
@@ -46,6 +42,7 @@ jobs:
         run: |
           poetry env use '3.10'
           poetry install
+          poetry self add "poetry-dynamic_versioning[plugin]"
 
       - name: Run pytest
         run: |

diff --git a/bin/generate_pac_bio_id b/bin/generate_pac_bio_id
@@ -19,7 +19,7 @@
 # @author Michael Kubiak <[email protected]>
 
 import argparse
-from npg_id_generation import PacBioEntity
+from npg_id_generation.pac_bio import PacBioEntity
 
 parser = argparse.ArgumentParser(
     description="A script to generate a product id for a pac bio product from a given run and well"

diff --git a/npg_id_generation/__init__.py b/npg_id_generation/__init__.py
@@ -1 +0,0 @@
-from .main import PacBioEntity

diff --git a/npg_id_generation/main.py → npg_id_generation/pac_bio.py b/npg_id_generation/main.py → npg_id_generation/pac_bio.py
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "npg_id_generation"
-version = "0.1.0"
+version = "0.0.0"
 description = "Product ID generation."
 authors = ["Adam Blanchet <[email protected]>"]
 license = "GPL3-or-later"
@@ -14,9 +14,14 @@ pytest = "^7.1.2"
 black = "^22.6.0"
 flake8 = "^4.0.1"
 
+[tool.poetry-dynamic-versioning]
+enable = true
+pattern = '^((?P<epoch>\d+)!)?(?P<base>\d+(\.\d+)*)([-._]?((?P<stage>[a-zA-Z]+)[-._]?(?P<revision>\d+)?))?(\+(?P<tagged_metadata>.+))?$'
+format-jinja = "{% if distance == 0 %}{{ base }}{% else %}{{ base }}+{{ distance }}.{{ commit }}{% endif %}"
+
 [tool.poetry.scripts]
 generate_pac_bio_id = { reference = "bin/generate_pac_bio_id", type = "file", extras = [] }
 
 [build-system]
-requires = ["poetry-core>=1.0.0"]
-build-backend = "poetry.core.masonry.api"
+requires = ["poetry-core>=1.0.0", "poetry-dynamic-versioning"]
+build-backend = "poetry_dynamic_versioning.backend"
diff --git a/tests/test_hashing.py b/tests/test_hashing.py
@@ -21,7 +21,7 @@
 
 import pytest
 from pydantic import ValidationError
-from npg_id_generation.main import PacBioEntity
+from npg_id_generation.pac_bio import PacBioEntity
 
 
 def test_different_orderings():