From b751bb3b7c16431b20bf456a609aac3aad9be4d0 Mon Sep 17 00:00:00 2001 From: Peng Ren Date: Thu, 10 Apr 2025 20:06:52 -0400 Subject: [PATCH 1/5] Fix PEP 625 warning --- setup.py | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/setup.py b/setup.py index 1367cf8..105135a 100644 --- a/setup.py +++ b/setup.py @@ -22,7 +22,7 @@ } setup( - name="PyDynamoDB", + name="pydynamodb", version=VERSION, description="Python DB API 2.0 (PEP 249) client for Amazon DynamoDB", long_description=open(readme).read(), @@ -31,17 +31,17 @@ author="Peng Ren", author_email="passren9099@hotmail.com", license="MIT", - python_requires=">=3.7", + python_requires=">=3.8", classifiers=[ "Development Status :: 4 - Beta", "Intended Audience :: Developers", - 'Programming Language :: Python', "Programming Language :: Python", - 'Programming Language :: Python :: 3.8', - 'Programming Language :: Python :: 3.9', - 'Programming Language :: Python :: 3.10', - 'Programming Language :: Python :: 3.11', - 'Programming Language :: Python :: 3.12', + "Programming Language :: Python", + "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", + "Programming Language :: Python :: 3.12", "Operating System :: OS Independent", "License :: OSI Approved :: MIT License", ], @@ -51,9 +51,14 @@ "Source": "https://github.com/passren/PyDynamoDB", "Tracker": "https://github.com/passren/PyDynamoDB/issues", }, - packages=find_packages(include=[ - "pydynamodb", "pydynamodb.sql", "pydynamodb.sqlalchemy_dynamodb", "pydynamodb.superset_dynamodb" - ]), + packages=find_packages( + include=[ + "pydynamodb", + "pydynamodb.sql", + "pydynamodb.sqlalchemy_dynamodb", + "pydynamodb.superset_dynamodb", + ] + ), include_package_data=True, install_requires=install_requires, extras_require=extras_require, From 470e3e1efcc4fb741599fb5403aa539d3cd98132 Mon Sep 17 00:00:00 2001 From: Peng Ren Date: Thu, 10 Apr 2025 20:08:40 -0400 Subject: [PATCH 2/5] Bump 0.7.3 --- pydynamodb/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pydynamodb/__init__.py b/pydynamodb/__init__.py index 6c86da4..e457b23 100644 --- a/pydynamodb/__init__.py +++ b/pydynamodb/__init__.py @@ -6,7 +6,7 @@ if TYPE_CHECKING: from .connection import Connection -__version__: str = "0.7.2" +__version__: str = "0.7.3" # Globals https://www.python.org/dev/peps/pep-0249/#globals apilevel: str = "2.0" From b521f68fc61839788c87e9d08010ee5c4abb917e Mon Sep 17 00:00:00 2001 From: Peng Ren Date: Wed, 17 Sep 2025 15:44:30 -0400 Subject: [PATCH 3/5] update sonar and rename wrong file --- .github/workflows/release.yaml | 6 +++--- .github/workflows/run-test.yaml | 8 ++++---- pydynamodb/__init__.py | 2 +- .../superset_dynamodb/{pydnamodb.py => pydynamodb.py} | 0 tests/conftest.py | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) rename pydynamodb/superset_dynamodb/{pydnamodb.py => pydynamodb.py} (100%) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 52ff683..4a83775 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -14,9 +14,9 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Set up Python - uses: actions/setup-python@v5 + uses: actions/setup-python@v6 with: python-version: ${{ env.PYTHON_VERSION }} @@ -36,7 +36,7 @@ jobs: TWINE_USERNAME: ${{ secrets.TWINE_USERNAME }} TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }} - name: Release - uses: softprops/action-gh-release@v1 + uses: softprops/action-gh-release@v2 with: files: dist/* env: diff --git a/.github/workflows/run-test.yaml b/.github/workflows/run-test.yaml index 2b6b105..b71e440 100644 --- a/.github/workflows/run-test.yaml +++ b/.github/workflows/run-test.yaml @@ -23,9 +23,9 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Set up Python - uses: actions/setup-python@v5 + uses: actions/setup-python@v6 with: python-version: ${{ matrix.python-version }} - name: Install dependencies @@ -79,10 +79,10 @@ jobs: name: SonarCloud runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 with: fetch-depth: 0 - name: SonarCloud Scan - uses: SonarSource/sonarqube-scan-action@v5.1.0 + uses: SonarSource/sonarqube-scan-action@${{ vars.SONAR_SCAN_ACTION_VER }} env: SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} \ No newline at end of file diff --git a/pydynamodb/__init__.py b/pydynamodb/__init__.py index e457b23..fd1fa04 100644 --- a/pydynamodb/__init__.py +++ b/pydynamodb/__init__.py @@ -51,7 +51,7 @@ def __hash__(self): def connect(*args, **kwargs) -> "Connection": from .connection import Connection - from .superset_dynamodb.pydnamodb import SupersetCursor + from .superset_dynamodb.pydynamodb import SupersetCursor connector = kwargs.get("connector", None) if connector is not None and connector.lower() == "superset": diff --git a/pydynamodb/superset_dynamodb/pydnamodb.py b/pydynamodb/superset_dynamodb/pydynamodb.py similarity index 100% rename from pydynamodb/superset_dynamodb/pydnamodb.py rename to pydynamodb/superset_dynamodb/pydynamodb.py diff --git a/tests/conftest.py b/tests/conftest.py index ff13156..bdd77a7 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -187,7 +187,7 @@ def dict_cursor(request): @pytest.fixture def superset_cursor(request): - from pydynamodb.superset_dynamodb.pydnamodb import SupersetCursor + from pydynamodb.superset_dynamodb.pydynamodb import SupersetCursor yield from _cursor(SupersetCursor, request) From e49385be1a39629d3f52b6531d6932195069026a Mon Sep 17 00:00:00 2001 From: Peng Ren Date: Wed, 17 Sep 2025 16:21:51 -0400 Subject: [PATCH 4/5] fix action error --- .github/workflows/run-test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-test.yaml b/.github/workflows/run-test.yaml index b71e440..b4fc9d2 100644 --- a/.github/workflows/run-test.yaml +++ b/.github/workflows/run-test.yaml @@ -83,6 +83,6 @@ jobs: with: fetch-depth: 0 - name: SonarCloud Scan - uses: SonarSource/sonarqube-scan-action@${{ vars.SONAR_SCAN_ACTION_VER }} + uses: SonarSource/sonarqube-scan-action@${{ secrets.SONAR_SCAN_ACTION_VER }} env: SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} \ No newline at end of file From 40b5a5ee3869e4c7da308309109d06e6a2453bca Mon Sep 17 00:00:00 2001 From: Peng Ren Date: Wed, 17 Sep 2025 16:28:53 -0400 Subject: [PATCH 5/5] fix action error --- .github/workflows/run-test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-test.yaml b/.github/workflows/run-test.yaml index b4fc9d2..fbf0a60 100644 --- a/.github/workflows/run-test.yaml +++ b/.github/workflows/run-test.yaml @@ -83,6 +83,6 @@ jobs: with: fetch-depth: 0 - name: SonarCloud Scan - uses: SonarSource/sonarqube-scan-action@${{ secrets.SONAR_SCAN_ACTION_VER }} + uses: SonarSource/sonarqube-scan-action@v5.3.1 env: SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} \ No newline at end of file