shacl2code 0.0.3__tar.gz → 0.0.4__tar.gz

{shacl2code-0.0.3 → shacl2code-0.0.4}/.github/workflows/publish.yaml

@@ -1,10 +1,18 @@
 ---
 name: Upload Python Package
 on:
-  - push
+  release:
+    types:
+      - published
 
 jobs:
+  test:
+    uses: ./.github/workflows/test.yaml
+
   deploy:
+    needs:
+      - test
+
     runs-on: ubuntu-latest
     permissions:
       id-token: write
@@ -25,12 +33,5 @@ jobs:
       - name: Build package
         run: python -m build
 
-      - name: Publish distribution to Test PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
-        with:
-          repository-url: https://test.pypi.org/legacy/
-          skip-existing: true
-
       - name: Publish distribution to PyPI
-        if: startsWith(github.ref, 'refs/tags')
         uses: pypa/gh-action-pypi-publish@release/v1

{shacl2code-0.0.3 → shacl2code-0.0.4}/.github/workflows/test.yaml

@@ -3,6 +3,7 @@ name: Test shacl2code
 on:
   - push
   - pull_request
+  - workflow_call
 
 jobs:
   build:

{shacl2code-0.0.3 → shacl2code-0.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: shacl2code
-Version: 0.0.3
+Version: 0.0.4
 Summary: Convert SHACL model file to code bindings
 Project-URL: Homepage, https://github.com/JPEWdev/shacl2code
 Project-URL: Repository, https://github.com/JPEWdev/shacl2code.git

{shacl2code-0.0.3 → shacl2code-0.0.4}/src/shacl2code/__init__.py

@@ -1,2 +1,3 @@
 from .model import Model
 from .main import main
+from .version import VERSION

{shacl2code-0.0.3 → shacl2code-0.0.4}/src/shacl2code/main.py

@@ -40,6 +40,12 @@ def main():
             else:
                 print(f"{k:{width}} - {v.HELP}")
 
+        return 0
+
+    def handle_version(args):
+        print(VERSION)
+        return 0
+
     parser = argparse.ArgumentParser(
         description=f"Convert JSON-LD model to python. Version {VERSION}"
     )
@@ -79,6 +85,9 @@ def main():
     )
     list_parser.set_defaults(func=handle_list)
 
+    version_parser = command_subparser.add_parser("version", help="Show version")
+    version_parser.set_defaults(func=handle_version)
+
     args = parser.parse_args()
 
     return args.func(args)

shacl2code-0.0.4/src/shacl2code/version.py

@@ -0,0 +1 @@
+VERSION = "0.0.4"

{shacl2code-0.0.3 → shacl2code-0.0.4}/tests/test_cli.py

@@ -6,6 +6,7 @@
 import subprocess
 
 from shacl2code.lang import LANGUAGES
+from shacl2code import VERSION
 
 
 def test_shacl2code_exists():
@@ -27,3 +28,17 @@ def test_lang_list():
     )
 
     assert sorted(p.stdout.splitlines()) == sorted(LANGUAGES.keys())
+
+
+def test_version():
+    """
+    Tests that the version subcommand works
+    """
+    p = subprocess.run(
+        ["shacl2code", "version"],
+        check=True,
+        stdout=subprocess.PIPE,
+        encoding="utf-8",
+    )
+
+    assert p.stdout.rstrip() == VERSION

shacl2code-0.0.3/src/shacl2code/version.py

@@ -1 +0,0 @@
-VERSION = "0.0.3"