From 50e732743cf7cd67fa64d3993a84ecbad955782b Mon Sep 17 00:00:00 2001 From: Patrick Armstrong Date: Mon, 8 Jul 2024 15:16:27 -0700 Subject: [PATCH] Added default client version for docker builds We don't have git available inside the container for docker test/builds for the client, so we can fall back to a default version. --- client/pyproject.toml | 4 +++- client/test/test_queue.py | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/client/pyproject.toml b/client/pyproject.toml index 721cae4..6a147ef 100644 --- a/client/pyproject.toml +++ b/client/pyproject.toml @@ -59,6 +59,8 @@ datalake = "datalake.scripts.cli:cli" [tool.setuptools.packages.find] exclude = ["test"] +[tool.versioningit] +default-version = "0.0.0-dev" [tool.versioningit.format] distance = "{base_version}+{distance}.{vcs}{rev}" @@ -74,4 +76,4 @@ distance-dirty = "{base_version}+{distance}.{vcs}{rev}.dirty" addopts = "--cov=planet.mc_client --cov-config .coveragerc" markers = [ "slow: marks tests as slow (deselect with '-m \"not slow\"')" -] \ No newline at end of file +] diff --git a/client/test/test_queue.py b/client/test/test_queue.py index f9909e8..b4329f9 100644 --- a/client/test/test_queue.py +++ b/client/test/test_queue.py @@ -264,4 +264,4 @@ def test_threaded_uploader_exits(enqueuer, faulty_uploader, random_file, random_metadata, uploaded_file_validator): enqueuer.enqueue(random_file, **random_metadata) with pytest.raises(KeyboardInterrupt): - faulty_uploader.listen(timeout=0.1, workers=2) + faulty_uploader.listen(timeout=1.0, workers=2)