Merge branch 'main' into update_ecdsa_library

Author: tiwarishubham635

.github/workflows/lint-python.yml

@@ -13,4 +13,4 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - run: pip install --user ruff
-      - run: ruff --ignore="E722,F40,F841" --line-length=320 --target-version=py37 .
+      - run: ruff check --ignore="E722,F40,F841" --line-length=320 --target-version=py37 .

.github/workflows/test-and-deploy.yml

@@ -17,7 +17,7 @@ jobs:
     timeout-minutes: 20
     strategy:
       matrix:
-        python-version: [ '2.7', '3.5', '3.6', '3.7', '3.8', '3.9', '3.10', '3.11' ]
+        python-version: [ '3.9', '3.10', '3.11', '3.12' , '3.13']
     env:
       DOCKER_LOGIN: ${{ secrets.DOCKER_USERNAME && secrets.DOCKER_AUTH_TOKEN }}
     steps:
@@ -31,6 +31,11 @@ jobs:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_AUTH_TOKEN }}
 
+      - name: Install Docker Compose
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y docker-compose
+
       - name: Build & Test
         run: make test-docker version=${{ matrix.python-version }}
 

CHANGELOG.md

@@ -1,6 +1,16 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+[2025-05-05] Version 6.12.0
+---------------------------
+**Library - Chore**
+- [PR #1098](https://github.com/sendgrid/sendgrid-python/pull/1098): Add werkzeug package to setup file. Thanks to [@gopidesupavan](https://github.com/gopidesupavan)!
+- [PR #1099](https://github.com/sendgrid/sendgrid-python/pull/1099): install docker-compose. Thanks to [@tiwarishubham635](https://github.com/tiwarishubham635)!
+
+**Library - Feature**
+- [PR #1087](https://github.com/sendgrid/sendgrid-python/pull/1087): add support for python3.12 and 3.13. Thanks to [@meysam81](https://github.com/meysam81)!
+
+
 [2023-12-01] Version 6.11.0
 ---------------------------
 **Library - Feature**

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (C) 2023, Twilio SendGrid, Inc. <help@twilio.com>
+Copyright (C) 2025, Twilio SendGrid, Inc. <help@twilio.com>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

Makefile

@@ -6,13 +6,11 @@ venv: clean
 	virtualenv --python=python venv
 
 install: venv
+	. venv/bin/activate; pip install -r test/requirements.txt
 	. venv/bin/activate; python setup.py install
 	. venv/bin/activate; pip install -r requirements.txt
 
-test-install: install
-	. venv/bin/activate; pip install -r test/requirements.txt
-
-test: test-install
+test: install
 	. venv/bin/activate; coverage run -m unittest discover -s test/unit
 
 test-integ: test

sendgrid/version.py

@@ -1 +1 @@
-__version__ = '6.11.0'
+__version__ = '6.12.0'

setup.py

@@ -10,7 +10,11 @@
 def getRequires():
     deps = [
         'python_http_client>=3.2.1',
-        'starkbank-ecdsa>=2.0.1'
+        'starkbank-ecdsa>=2.0.1',
+        "werkzeug>=0.11.15,<1.0.0 ; python_version < '3.0'",
+        "werkzeug>=0.15.0,<2.0.0 ; python_version >= '3.0' and python_version < '3.6'",
+        "werkzeug>=2.0.0,<3.0.0 ; python_version >= '3.6' and python_version < '3.11'",
+        "werkzeug>=3.0.0 ; python_version >= '3.11'"
     ]
     return deps
 
@@ -41,5 +45,7 @@ def getRequires():
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',
         'Programming Language :: Python :: 3.11',
+        'Programming Language :: Python :: 3.12',
+        'Programming Language :: Python :: 3.13',
     ]
 )

test/requirements.txt

@@ -5,3 +5,4 @@ coverage
 mock
 itsdangerous==1.1.0
 markupsafe==1.1.1
+setuptools

tox.ini

@@ -4,7 +4,7 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = py27, py34, py35, py36, py37
+envlist = py27, py34, py35, py36, py37, py38, py39, py310, py311, py312, py313
 
 [testenv]
 commands = coverage erase
@@ -39,3 +39,33 @@ basepython = python3.6
 commands = {[testenv]commands}
 deps = {[testenv]deps}
 basepython = python3.7
+
+[testenv:py38]
+commands = {[testenv]commands}
+deps = {[testenv]deps}
+basepython = python3.8
+
+[testenv:py39]
+commands = {[testenv]commands}
+deps = {[testenv]deps}
+basepython = python3.9
+
+[testenv:py310]
+commands = {[testenv]commands}
+deps = {[testenv]deps}
+basepython = python3.10
+
+[testenv:py311]
+commands = {[testenv]commands}
+deps = {[testenv]deps}
+basepython = python3.11
+
+[testenv:py312]
+commands = {[testenv]commands}
+deps = {[testenv]deps}
+basepython = python3.12
+
+[testenv:py313]
+commands = {[testenv]commands}
+deps = {[testenv]deps}
+basepython = python3.13