Skip to content

Commit 3f93ccb

Browse files
committed
fix versioning in cmake/python
1 parent a252655 commit 3f93ccb

File tree

3 files changed

+8
-35
lines changed

3 files changed

+8
-35
lines changed

.github/workflows/build-test.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,9 @@ on:
1515

1616
pull_request:
1717
push:
18-
branches:
19-
[main]
18+
branches: [main]
2019

21-
## Paste this snippet into the workflow file to enable tmate debugging
20+
## Paste this snippet into the workflow file to enable tmate debugging
2221
# - name: Setup tmate session
2322
# uses: mxschmitt/action-tmate@v3
2423
# if:
@@ -170,6 +169,7 @@ jobs:
170169
- name: pip install the package
171170
run: |
172171
python -m pip install .[test]
172+
python -c "import geant4_python_application; print(geant4_python_application.version)"
173173
174174
# test ability to download datasets in one job and use the cache in the others
175175
- name: Cache Geant4 Datasets

CMakeLists.txt

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -5,34 +5,7 @@ if (NOT DEFINED SKBUILD_PROJECT_NAME)
55
set(SKBUILD_PROJECT_NAME geant4-python-application)
66
endif ()
77

8-
if (NOT DEFINED SKBUILD_PROJECT_VERSION)
9-
# IDE
10-
set(SKBUILD_PROJECT_VERSION 0.0.0.ide)
11-
endif ()
12-
13-
string(REGEX MATCHALL "[^.]+" SKBUILD_PROJECT_VERSION_COMPONENTS
14-
"${SKBUILD_PROJECT_VERSION}")
15-
list(GET SKBUILD_PROJECT_VERSION_COMPONENTS 0 SKBUILD_PROJECT_VERSION_MAJOR)
16-
list(GET SKBUILD_PROJECT_VERSION_COMPONENTS 1 SKBUILD_PROJECT_VERSION_MINOR)
17-
list(GET SKBUILD_PROJECT_VERSION_COMPONENTS 2 SKBUILD_PROJECT_VERSION_PATCH)
18-
list(LENGTH SKBUILD_PROJECT_VERSION_COMPONENTS version_components_length)
19-
if (version_components_length GREATER 3)
20-
list(GET SKBUILD_PROJECT_VERSION_COMPONENTS 3
21-
SKBUILD_PROJECT_VERSION_SUFFIX)
22-
else ()
23-
set(SKBUILD_PROJECT_VERSION_SUFFIX "")
24-
endif ()
25-
26-
# join version components (cannot put suffix in 'project')
27-
string(
28-
CONCAT SKBUILD_PROJECT_VERSION_NO_SUFFIX ${SKBUILD_PROJECT_VERSION_MAJOR}
29-
"." ${SKBUILD_PROJECT_VERSION_MINOR} "."
30-
${SKBUILD_PROJECT_VERSION_PATCH})
31-
32-
project(
33-
${SKBUILD_PROJECT_NAME}
34-
LANGUAGES CXX
35-
VERSION ${SKBUILD_PROJECT_VERSION_NO_SUFFIX})
8+
project(${SKBUILD_PROJECT_NAME} LANGUAGES CXX)
369

3710
set(PYTHON_MODULE_NAME _geant4_application)
3811

src/geant4_python_application/__init__.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
from __future__ import annotations
22

33
from geant4_python_application._geant4_application import (
4-
__doc__,
5-
__version__,
64
awkward_version,
75
geant4_version,
86
pybind11_version,
97
)
8+
from geant4_python_application._version import version, version_tuple
109
from geant4_python_application.application import Application
1110
from geant4_python_application.detector import Detector
1211
from geant4_python_application.files.datasets import data_directory, install_datasets
1312
from geant4_python_application.files.directories import application_directory
1413
from geant4_python_application.gdml import basic_gdml
1514

16-
version = __version__
15+
__version__ = version
16+
__version__tuple__ = version_tuple
1717

1818
__all__ = [
19-
"__doc__",
2019
"__version__",
20+
"__version__tuple__",
2121
"geant4_version",
2222
"awkward_version",
2323
"pybind11_version",

0 commit comments

Comments
 (0)