Skip to content

Commit

Permalink
Fix merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
thomasyu888 committed Dec 17, 2024
2 parents 0c59fae + 0321d51 commit ec7ea44
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/api_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:

jobs:
test:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
env:
POETRY_VERSION: 1.3.0
strategy:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pdoc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
11 changes: 5 additions & 6 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@ on:

jobs:
pypi_release:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
env:
POETRY_VERSION: 1.3.0
PYTHON_VERSION: "3.10"
if: github.event_name == 'push' && contains(github.ref, 'refs/tags')
steps:
#----------------------------------------------
Expand All @@ -18,10 +19,10 @@ jobs:
- name: Check out repository
uses: actions/checkout@v4

- name: Set up Python ${{ matrix.python-version }}
- name: Set up Python ${{ env.PYTHON_VERSION }}
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
python-version: ${{ env.PYTHON_VERSION }}

#----------------------------------------------
# install & configure poetry
Expand All @@ -48,10 +49,8 @@ jobs:
- name: Get current pushed tag
run: |
echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
echo ${{ env.RELEASE_VERSION }}
echo "$RELEASE_VERSION"
#----------------------------------------------
# override version tag
#----------------------------------------------
- name: Override version tag
run: poetry run python3 override_version.py
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>",
Expand Down
5 changes: 2 additions & 3 deletions schematic/version.py
Original file line number Diff line number Diff line change
@@ -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"

0 comments on commit ec7ea44

Please sign in to comment.