From 7ffcd32f82713c9e14bb1fbe46b504707ec40b29 Mon Sep 17 00:00:00 2001
From: Aboelhamd Mahmoud <aboelha@amazon.com>
Date: Thu, 19 Aug 2021 18:14:36 +0100
Subject: [PATCH 1/2] Remove importlib.metadata dependency

---
 awslambdaric/__init__.py              |  5 +++++
 awslambdaric/lambda_runtime_client.py | 12 ++----------
 setup.py                              |  3 ++-
 tests/test_lambda_runtime_client.py   |  6 ++++++
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/awslambdaric/__init__.py b/awslambdaric/__init__.py
index e69de29..2f798a6 100644
--- a/awslambdaric/__init__.py
+++ b/awslambdaric/__init__.py
@@ -0,0 +1,5 @@
+"""
+Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+"""
+
+__version__ = "1.2.2"
diff --git a/awslambdaric/lambda_runtime_client.py b/awslambdaric/lambda_runtime_client.py
index 70ff205..2066f6c 100644
--- a/awslambdaric/lambda_runtime_client.py
+++ b/awslambdaric/lambda_runtime_client.py
@@ -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}"
 
 
diff --git a/setup.py b/setup.py
index e8a910e..a005074 100644
--- a/setup.py
+++ b/setup.py
@@ -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():
@@ -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"),
diff --git a/tests/test_lambda_runtime_client.py b/tests/test_lambda_runtime_client.py
index 7b1bf66..814ca96 100644
--- a/tests/test_lambda_runtime_client.py
+++ b/tests/test_lambda_runtime_client.py
@@ -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,
 )
 
 
@@ -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):

From 18b108c2486d7d74e0aba409eb1fafe6e804f905 Mon Sep 17 00:00:00 2001
From: Carl Zogheib <11421173+carlzogh@users.noreply.github.com>
Date: Fri, 20 Aug 2021 12:04:52 +0300
Subject: [PATCH 2/2] Update __init__.py

---
 awslambdaric/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/awslambdaric/__init__.py b/awslambdaric/__init__.py
index 2f798a6..0d6494a 100644
--- a/awslambdaric/__init__.py
+++ b/awslambdaric/__init__.py
@@ -1,5 +1,5 @@
 """
-Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+Copyright 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 """
 
 __version__ = "1.2.2"