Skip to content

Commit 6bff4c7

Browse files
Merge pull request #1042 from VWS-Python/docker-push-fix
Try to fix Docker build issue with setuptools-scm
2 parents 9767fae + 9585486 commit 6bff4c7

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

CHANGELOG.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ Changelog
44
Next
55
----
66

7+
2021.12.26.2
8+
------------
9+
710
2021.12.26
811
------------
912

pyproject.toml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,11 @@ ignore_path = [
181181

182182
[tool.setuptools_scm]
183183

184+
# We use a fallback version like
185+
# https://github.com/pypa/setuptools_scm/issues/77 so that we do not
186+
# error in the Docker build stage of the release pipeline.
187+
fallback_version = "FALLBACK_VERSION"
188+
184189

185190
[tool.pydocstyle]
186191
# We do not have summary lines, care about "mood", or need sections with

setup.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,6 @@ def _get_dependencies(requirements_file: Path) -> list[str]:
3232
)
3333

3434
setup(
35-
# We use a dictionary with a fallback version rather than "True"
36-
# like https://github.com/pypa/setuptools_scm/issues/77 so that we do not
37-
# error in Docker.
38-
# use_scm_version={'fallback_version': 'FALLBACK_VERSION'},
3935
setup_requires=SETUP_REQUIRES,
4036
install_requires=INSTALL_REQUIRES,
4137
extras_require={'dev': DEV_REQUIRES},

0 commit comments

Comments
 (0)