Skip to content

Commit af4eb41

Browse files
purple4reinapurple4reina
committed
Hardcode version to avoid import of importlib.metadata.
1 parent f9aca11 commit af4eb41

4 files changed

Lines changed: 12 additions & 10 deletions

File tree

‎datadog_lambda/__init__.py‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,7 @@
1212

1313
# The minor version corresponds to the Lambda layer version.
1414
# E.g.,, version 0.5.0 gets packaged into layer version 5.
15-
try:
16-
import importlib.metadata as importlib_metadata
17-
except ModuleNotFoundError:
18-
import importlib_metadata
19-
20-
__version__ = importlib_metadata.version(__name__)
21-
22-
15+
from datadog_lambda.version import __version__ # noqa: E402 F401
2316
from datadog_lambda.logger import initialize_logging # noqa: E402
2417

2518

‎datadog_lambda/version.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
__version__ = "5.92.0"

‎scripts/publish_prod.sh‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,11 @@ if [ "$CONT" != "y" ]; then
5353
echo "Skipping updating package.json version"
5454
else
5555
echo
56-
echo "Replacing version in pyproject.toml"
56+
echo "Replacing version in pyproject.toml and datadog_lambda/version.py"
5757
echo
5858

5959
poetry version ${NEW_VERSION}
60+
echo "__version__ = \"${NEW_VERSION}\"" > datadog_lambda/version.py
6061
fi
6162

6263
echo
@@ -110,7 +111,7 @@ if [ "$CONT" != "y" ]; then
110111
else
111112
echo
112113
echo 'Publishing updates to github'
113-
git commit pyproject.toml -m "Bump version to ${NEW_VERSION}"
114+
git commit pyproject.toml datadog_lambda/version.py -m "Bump version to ${NEW_VERSION}"
114115
git push origin main
115116
git tag "v$LAYER_VERSION"
116117
git push origin "refs/tags/v$LAYER_VERSION"

‎tests/test_version.py‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
import importlib.metadata
2+
from datadog_lambda import __version__
3+
4+
5+
def test_version():
6+
# test version in __init__ matches version in pyproject.toml
7+
assert importlib.metadata.version("datadog-lambda") == __version__

0 commit comments

Comments
 (0)