Fix merge conflicts

Sage-Bionetworks · Dec 16, 2024 · 0321d51 · 0321d51
2 parents d9d807f + 917236e
commit 0321d51
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 8 deletions.
diff --git a/.github/workflows/api_test.yml b/.github/workflows/api_test.yml
@@ -13,7 +13,7 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     env:
       POETRY_VERSION:  1.3.0
     strategy:

diff --git a/.github/workflows/pdoc.yml b/.github/workflows/pdoc.yml
@@ -25,7 +25,7 @@ concurrency:
   cancel-in-progress: true
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     env:
       POETRY_VERSION:  1.3.0
       PYTHON_VERSION: "3.10"

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   pypi_release:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     env:
       POETRY_VERSION:  1.3.0
       PYTHON_VERSION: "3.10"

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -25,7 +25,7 @@ concurrency:
   cancel-in-progress: true
 jobs:
   test:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     env:
       POETRY_VERSION:  1.3.0
     strategy:

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "schematicpy"
-version = "24.11.2"
+version = "24.12.1"
 description = "Package for biomedical data model and metadata ingress management"
 authors = [
     "Milen Nikolov <milen.nikolov@sagebase.org>",

diff --git a/schematic/version.py b/schematic/version.py
@@ -1,4 +1,3 @@
 """Sets the version of the package"""
-import importlib.metadata
-
-__version__ = importlib.metadata.version("schematicpy")
+# Version hardcoded see https://sagebionetworks.jira.com/browse/SCHEMATIC-229
+__version__ = "24.12.1"