Merge branch 'master' into async

Author: willarmiros

.github/workflows/IntegrationTesting.yaml

@@ -11,18 +11,18 @@ jobs:
 
     steps:
       - name: Pull in source code from aws-xray-sdk-python Github repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setup python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: '3.8'
 
       - name: Build X-Ray Python SDK
         run: python setup.py sdist
 
       - name: Upload SDK build artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: sdk-build-artifact
           path: .
@@ -33,15 +33,15 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Setup python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: '3.8'
 
       - name: Download X-Ray SDK build artifact
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           name: sdk-build-artifact
           path: ./sample-apps/flask
@@ -55,7 +55,7 @@ jobs:
         working-directory: ./sample-apps/flask
 
       - name: Upload WebApp with X-Ray SDK build artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: sdk-flask-build-artifact
           path: ./sample-apps/flask/deploy.zip
@@ -67,10 +67,10 @@ jobs:
 
     steps:
       - name: Checkout X-Ray SDK to get terraform source
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Download WebApp with X-Ray SDK build artifact
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           name: sdk-flask-build-artifact
 
@@ -85,7 +85,7 @@ jobs:
           aws-region: us-west-2
 
       - name: Setup Terraform
-        uses: hashicorp/setup-terraform@v1
+        uses: hashicorp/setup-terraform@v2
 
       - name: Terraform Init
         run: terraform init
@@ -109,7 +109,7 @@ jobs:
         working-directory: ./terraform
 
       - name: Upload terraform state files for destorying resources
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: terraform-state-artifact
           path: ./terraform
@@ -120,8 +120,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/setup-java@v1
+      - uses: actions/setup-java@v3
         with:
+          distribution: 'zulu'
           java-version: 14
 
       - name: Configure AWS Credentials
@@ -132,7 +133,7 @@ jobs:
           aws-region: us-west-2
 
       - name: Checkout test framework
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           repository: aws-observability/aws-otel-test-framework
           ref: terraform
@@ -148,7 +149,7 @@ jobs:
 
     steps:
       - name: Download terraform state artifact
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           name: terraform-state-artifact
 
@@ -160,7 +161,7 @@ jobs:
           aws-region: us-west-2
 
       - name: Setup Terraform
-        uses: hashicorp/setup-terraform@v1
+        uses: hashicorp/setup-terraform@v2
 
       - name: Terraform Init
         run: terraform init

.github/workflows/Release.yaml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout master branch
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Create Release
         id: create_release

.github/workflows/UnitTesting.yaml

@@ -28,10 +28,10 @@ jobs:
         testenv: [core, ext]
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setup Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ env[matrix.python-version] }}
 
@@ -40,7 +40,7 @@ jobs:
 
       - name: Cache tox environment
         # Preserves .tox directory between runs for faster installs
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: |
             .tox

.github/workflows/continuous-monitoring.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Configure AWS Credentials
         uses: aws-actions/configure-aws-credentials@v1
@@ -19,7 +19,7 @@ jobs:
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           aws-region: us-east-1
 
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v4
         with:
           python-version: '3.x'
 

setup.py

@@ -1,27 +1,11 @@
-import sys
-
 from setuptools import setup, find_packages
 from os import path
 from aws_xray_sdk.version import VERSION
 
 CURRENT_DIR = path.abspath(path.dirname(__file__))
 
-try:
-    from pypandoc import convert
-    read_md = lambda f: convert(f, 'rst')
-except ImportError:
-    read_md = lambda f: open(f, 'r').read()
-
-long_description = read_md(path.join(CURRENT_DIR, 'README.md'))
-
-INSTALL_REQUIRED_DEPS = [
-    'enum34;python_version<"3.4"',
-    'wrapt',
-    'botocore>=1.11.3',
-]
-
-if sys.version_info[0] == 2:
-    INSTALL_REQUIRED_DEPS.append("future")
+with open(path.join(CURRENT_DIR, 'README.md'), 'r') as f:
+    long_description = f.read()
 
 setup(
     name='aws-xray-sdk',
@@ -55,7 +39,12 @@
         'Programming Language :: Python :: 3.9',
     ],
 
-    install_requires=INSTALL_REQUIRED_DEPS,
+    install_requires=[
+        'enum34;python_version<"3.4"',
+        'wrapt',
+        'future;python_version<"3"',
+        'botocore>=1.11.3',
+    ],
 
     keywords='aws xray sdk',
 

tox.ini

@@ -100,7 +100,9 @@ deps =
     ext-django-4: Django >=4.0,<5.0
     ext-django: django-fake-model
 
-    ext-pynamodb: pynamodb >= 3.3.1
+    py{27,34,35}-ext-pynamodb: pynamodb >=3.3.1,<4.4
+    py{27,34,35}-ext-pynamodb: botocore <1.28
+    py{36,37,38,39}-ext-pynamodb: pynamodb >=3.3.1
 
     ext-psycopg2: psycopg2
     ext-psycopg2: testing.postgresql