Merge pull request #125 from mailjet/refactor-client

Refactor client

Author: skupriienko

.github/dependabot.yml

@@ -5,7 +5,18 @@ updates:
     directory: "/"
     schedule:
       interval: "weekly"
+    open-pull-requests-limit: 10
     groups:
+      minor-and-patch:
+        update-types: [ "minor", "patch" ]
       python-packages:
         patterns:
           - "*"
+
+  # Enable version updates for GitHub Actions
+  - package-ecosystem: 'github-actions'
+    # Workflow files stored in the default location of `.github/workflows`
+    # You don't need to specify `/.github/workflows` for `directory`. You can use `directory: "/"`.
+    directory: '/'
+    schedule:
+      interval: 'weekly'

.github/workflows/commit_checks.yaml

@@ -3,25 +3,26 @@ name: CI
 
 on:
   push:
-    branches:
-      - main
+    branches: [master]
   pull_request:
+    branches: [master]
 
 permissions:
   contents: read
 
 jobs:
   pre-commit:
+    name: Lint & Format
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      - uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
+      - uses: actions/checkout@v6
+      - uses: actions/setup-python@v6
         with:
-          python-version: '3.12'  # Specify a Python version explicitly
+          python-version: '3.13'  # Specify a Python version explicitly
       - uses: pre-commit/action@2c7b3805fd2a0fd8c1884dcaebf91fc102a13ecd # v3.0.1
 
   test:
-    name: test py${{ matrix.python-version }} on ${{ matrix.os }}
+    name: Test py${{ matrix.python-version }} on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     defaults:
       run:
@@ -30,24 +31,36 @@ jobs:
       fail-fast: false
       matrix:
         os: ["ubuntu-latest", "macos-latest", "windows-latest"]
-        python-version: ["3.10", "3.11", "3.12", "3.13"]
+        python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
     env:
       MJ_APIKEY_PUBLIC: ${{ secrets.MJ_APIKEY_PUBLIC }}
       MJ_APIKEY_PRIVATE: ${{ secrets.MJ_APIKEY_PRIVATE }}
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0  # Get full history with tags (required for setuptools-scm)
-      - uses: conda-incubator/setup-miniconda@835234971496cad1653abb28a638a281cf32541f # v3.2.0
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: conda-incubator/setup-miniconda@fc2d68f6413eb2d87b895e92f8584b5b94a10167 # v3.3.0
         with:
           python-version: ${{ matrix.python-version }}
           channels: defaults
           show-channel-urls: true
           environment-file: environment.yaml
+          cache: 'pip'  # Drastically speeds up CI by caching pip dependencies
 
-      - name: Install the package
+      - name: Install dependencies and package
         run: |
+          python -m pip install --upgrade pip
           pip install .
           conda info
+
       - name: Test package imports
         run: python -c "import mailjet_rest"
+
+      - name: Install test dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install pytest
+
+      - name: Run unit tests
+        run: pytest tests/unit/ -v

.github/workflows/issue-triage.yml

@@ -14,7 +14,7 @@ jobs:
       issues: write
     steps:
       - name: Initial triage
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        uses: actions/github-script@v9
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |

.github/workflows/pr_validation.yml

@@ -2,7 +2,7 @@ name: PR Validation
 
 on:
   pull_request:
-    branches: [main]
+    branches: [master]
 
 permissions:
   contents: read
@@ -11,21 +11,23 @@ jobs:
   validate:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
       - name: Set up Python
-        uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
+        uses: actions/setup-python@v6
         with:
-          python-version: '3.12'
+          python-version: '3.13'
 
       - name: Build package
         run: |
-          pip install --upgrade build setuptools setuptools-scm
+          pip install --upgrade build setuptools setuptools-scm twine
           python -m build
+          twine check dist/*
 
-      - name: Test installation
+      - name: Test isolated installation
         run: |
+          # Install the built wheel to ensure packaging didn't miss files
           pip install dist/*.whl
-          python -c "from importlib.metadata import version; print(version('mailjet_rest'))"
+          python -c "import mailjet_rest; from importlib.metadata import version; print(f'Successfully installed v{version(\"mailjet_rest\")}')"

.github/workflows/publish.yml

@@ -12,20 +12,22 @@ permissions:
 
 jobs:
   publish:
+    name: Build and Publish to PyPI
     runs-on: ubuntu-latest
+
     permissions:
       id-token: write  # Required for trusted publishing
       contents: read
 
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@v6
         with:
-          fetch-depth: 0
+          fetch-depth: 0  # MANDATORY: Required for setuptools_scm to read the git tag
 
       - name: Set up Python
-        uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5.6.0
+        uses: actions/setup-python@v6
         with:
-          python-version: '3.12'
+          python-version: '3.13'
 
       - name: Install build tools
         run: pip install --upgrade build setuptools setuptools-scm twine
@@ -61,11 +63,15 @@ jobs:
           export SETUPTOOLS_SCM_PRETEND_VERSION=$VERSION
           python -m build
 
-      - name: Check dist
+      - name: Verify package (check dist)
         run: |
           ls -alh
           twine check dist/*
 
+      - name: Verify wheel contents
+        run: |
+          unzip -l dist/*.whl
+
       # Always publish to TestPyPI for all tags and releases
       # TODO: Enable it later.
 #      - name: Publish to TestPyPI