Skip to content

Remove importlib.metadata dependency #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 20, 2021
Merged
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
5 changes: 5 additions & 0 deletions awslambdaric/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
"""
Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
"""

__version__ = "1.2.2"
12 changes: 2 additions & 10 deletions awslambdaric/lambda_runtime_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,14 @@
import http
import http.client
import sys

try:
from importlib import metadata
except ImportError:
# Running on pre-3.8 Python; use importlib-metadata package
import importlib_metadata as metadata
from awslambdaric import __version__


def _user_agent():
py_version = (
f"{sys.version_info.major}.{sys.version_info.minor}.{sys.version_info.micro}"
)
try:
pkg_version = metadata.version("awslambdaric")
except:
pkg_version = "unknown"
pkg_version = __version__
return f"aws-lambda-python/{py_version}-{pkg_version}"


Expand Down
3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import platform
from subprocess import check_call, check_output
from setuptools import Extension, find_packages, setup
from awslambdaric import __version__


def get_curl_extra_linker_flags():
Expand Down Expand Up @@ -68,7 +69,7 @@ def read_requirements(req="base.txt"):

setup(
name="awslambdaric",
version="1.2.1",
version=__version__,
author="Amazon Web Services",
description="AWS Lambda Runtime Interface Client for Python",
long_description=read("README.md"),
Expand Down
6 changes: 6 additions & 0 deletions tests/test_lambda_runtime_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,14 @@
import http.client
import unittest.mock
from unittest.mock import MagicMock, patch
from awslambdaric import __version__


from awslambdaric.lambda_runtime_client import (
LambdaRuntimeClient,
LambdaRuntimeClientError,
InvocationRequest,
_user_agent,
)


Expand Down Expand Up @@ -205,6 +208,9 @@ def test_invalid_addr(self):
runtime_client = LambdaRuntimeClient("::::")
runtime_client.post_init_error("error")

def test_lambdaric_version(self):
self.assertTrue(_user_agent().endswith(__version__))


class TestLambdaRuntimeClientError(unittest.TestCase):
def test_constructor(self):
Expand Down