Skip to content

Commit 0321d51

Browse files
committed
Fix merge conflicts
2 parents d9d807f + 917236e commit 0321d51

File tree

6 files changed

+7
-8
lines changed

6 files changed

+7
-8
lines changed

.github/workflows/api_test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ on:
1313

1414
jobs:
1515
test:
16-
runs-on: ubuntu-latest
16+
runs-on: ubuntu-22.04
1717
env:
1818
POETRY_VERSION: 1.3.0
1919
strategy:

.github/workflows/pdoc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ concurrency:
2525
cancel-in-progress: true
2626
jobs:
2727
build:
28-
runs-on: ubuntu-latest
28+
runs-on: ubuntu-22.04
2929
env:
3030
POETRY_VERSION: 1.3.0
3131
PYTHON_VERSION: "3.10"

.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77

88
jobs:
99
pypi_release:
10-
runs-on: ubuntu-latest
10+
runs-on: ubuntu-22.04
1111
env:
1212
POETRY_VERSION: 1.3.0
1313
PYTHON_VERSION: "3.10"

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ concurrency:
2525
cancel-in-progress: true
2626
jobs:
2727
test:
28-
runs-on: ubuntu-latest
28+
runs-on: ubuntu-22.04
2929
env:
3030
POETRY_VERSION: 1.3.0
3131
strategy:

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "schematicpy"
3-
version = "24.11.2"
3+
version = "24.12.1"
44
description = "Package for biomedical data model and metadata ingress management"
55
authors = [
66
"Milen Nikolov <milen.nikolov@sagebase.org>",

schematic/version.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
"""Sets the version of the package"""
2-
import importlib.metadata
3-
4-
__version__ = importlib.metadata.version("schematicpy")
2+
# Version hardcoded see https://sagebionetworks.jira.com/browse/SCHEMATIC-229
3+
__version__ = "24.12.1"

0 commit comments

Comments
 (0)