Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions .github/workflows/system-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
persist-credentials: false
repository: 'DataDog/system-tests'
# Automatically managed, use scripts/update-system-tests-version to update
ref: '04070bed4dd644284690650abe291e632eb27cd9'
ref: 'f3752de0abce8bd5e7625577a105eb8af53bb8ce'

- name: Download wheels to binaries directory
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
Expand Down Expand Up @@ -94,7 +94,8 @@ jobs:
persist-credentials: false
repository: 'DataDog/system-tests'
# Automatically managed, use scripts/update-system-tests-version to update
ref: '04070bed4dd644284690650abe291e632eb27cd9'
ref: 'f3752de0abce8bd5e7625577a105eb8af53bb8ce'


- name: Build runner
uses: ./.github/actions/install_runner
Expand Down Expand Up @@ -279,7 +280,7 @@ jobs:
persist-credentials: false
repository: 'DataDog/system-tests'
# Automatically managed, use scripts/update-system-tests-version to update
ref: '04070bed4dd644284690650abe291e632eb27cd9'
ref: 'f3752de0abce8bd5e7625577a105eb8af53bb8ce'
- name: Download wheels to binaries directory
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
with:
Expand Down
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ variables:
DD_VPA_TEMPLATE: "vpa-template-cpu-p70-10percent-2x-oom-min-cap"
# CI_DEBUG_SERVICES: "true"
# Automatically managed, use scripts/update-system-tests-version to update
SYSTEM_TESTS_REF: "04070bed4dd644284690650abe291e632eb27cd9"
SYSTEM_TESTS_REF: "f3752de0abce8bd5e7625577a105eb8af53bb8ce"

default:
interruptible: true
Expand Down
14 changes: 2 additions & 12 deletions ddtrace/version.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,3 @@
def get_version() -> str:
try:
from ._version import version

return version
except ImportError:
from importlib.metadata import version as ilm_version

try:
return ilm_version("ddtrace")
except ModuleNotFoundError:
# package is not installed
return "dev"
# Hardcoded version for this branch
return "3.14.5"
4 changes: 4 additions & 0 deletions tests/tracer/test_version.py
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
import sys

import mock
import pytest

from ddtrace.version import get_version
from tests.tracer import _version # noqa: F401 -> we need to import it so that it can be swapped with the test module


@pytest.mark.skip("Disabled for 3.14 branch since we are hardcoding the version")
def test_get_version_from_version_file():
with mock.patch.dict(sys.modules, {"ddtrace._version": sys.modules["tests.tracer._version"]}):
assert get_version() == "my_test_version_from_generated_file"


@pytest.mark.skip("Disabled for 3.14 branch since we are hardcoding the version")
def test_get_version_from_importlib_metadata():
with mock.patch.dict(sys.modules, {"ddtrace._version": None}):
version_str = "importlib.metadata.version"
Expand All @@ -19,6 +22,7 @@ def test_get_version_from_importlib_metadata():
mock_get_version.assert_called_with("ddtrace")


@pytest.mark.skip("Disabled for 3.14 branch since we are hardcoding the version")
def test_get_version_dev_fallback():
with mock.patch.dict(sys.modules, {"ddtrace._version": None}):
version_str = "importlib.metadata.version"
Expand Down
Loading