Skip to content

Commit 1303621

Browse files
committed
The salt-analytics.examples package now uses the same version as salt-analytics-framework
Signed-off-by: Pedro Algarvio <[email protected]>
1 parent c5d5c64 commit 1303621

File tree

4 files changed

+13
-3
lines changed

4 files changed

+13
-3
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@ dmypy.json
133133

134134
# Ignore the setuptools_scm auto-generated version module
135135
src/saf/version.py
136+
examples/src/saltext/safexamples/version.py
136137

137138
# Ignore CI generated artifacts
138139
artifacts/

changelog/68.improvement.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Several improvements to the project
2+
3+
* The `salt-analytics.examples` package now uses the same version as `salt-analytics-framework`

examples/pyproject.toml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
[build-system]
2-
requires = ["setuptools>=50.3.2", "wheel", "setuptools-declarative-requirements"]
2+
requires = ["setuptools>=50.3.2", "wheel", "setuptools-declarative-requirements", "setuptools_scm[toml]>=3.4"]
33
build-backend = "setuptools.build_meta"
44

5+
[tool.setuptools_scm]
6+
root = "../"
7+
write_to = "examples/src/saltext/safexamples/version.py"
8+
write_to_template = "# pylint: skip-file\n\n__version__ = \"{version}\""
9+
510
[tool.black]
611
line-length = 100

examples/src/saltext/safexamples/__init__.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import pathlib
99

1010
PACKAGE_ROOT = pathlib.Path(__file__).resolve().parent
11+
1112
try:
1213
from .version import __version__
1314
except ImportError: # pragma: no cover
@@ -17,15 +18,15 @@
1718
from importlib.metadata import version
1819

1920
with contextlib.suppress(PackageNotFoundError):
20-
__version__ = version(__name__)
21+
__version__ = version("salt-analytics.examples")
2122

2223
except ImportError:
2324
try:
2425
from pkg_resources import DistributionNotFound
2526
from pkg_resources import get_distribution
2627

2728
with contextlib.suppress(DistributionNotFound):
28-
__version__ = get_distribution(__name__).version
29+
__version__ = get_distribution("salt-analytics.examples").version
2930

3031
except ImportError:
3132
# pkg resources isn't even available?!

0 commit comments

Comments
 (0)