Merge branch 'main' into multiple_tags

# Conflicts:
#	tests/test_parser/test_openapi.py

Author: dbanty

.changeset/delete_fewer_files_with_overwrite.md

@@ -0,0 +1,13 @@
+---
+default: major
+---
+
+# Delete fewer files with `--overwrite`
+
+`--overwrite` will no longer delete the entire output directory before regenerating. Instead, it will only delete 
+specific, known directories within that directory. Right now, that is only the generated `models` and `api` directories.
+
+Other generated files, like `README.md`, will be overwritten. Extra files and directories outside of those listed above 
+will be left untouched, so you can any extra modules or files around while still updating `pyproject.toml` automatically.
+
+Closes #1105.

.changeset/properly_rebuild_pydantic_models_if_necessary.md

@@ -0,0 +1,10 @@
+---
+default: patch
+---
+
+# Fix compatibility with Pydantic 2.10+
+
+#1176 by @Viicos
+
+Set `defer_build` to models that we know will fail to build, and call `model_rebuild`
+in the `__init__.py` file.

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,27 +1,17 @@
 ---
-name: Bug report
-about: Create a report to help us improve
+name: Report a bug
+about: Missing OpenAPI functionality are feature requests, not bugs!
 title: ''
 labels: bug
 assignees: ''
 
 ---
 
 **Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
+A clear and concise description of what the bug is. If this used to work, when did it stop working?
 
 **OpenAPI Spec File**
-A link to your openapi.json which produces this issue.
+A link to an OpenAPI document which produces this issue. Ideally, write a minimal reproduction only containing the problematic pieces.
 
 **Desktop (please complete the following information):**
  - OS: [e.g. macOS 10.15.1]

.github/ISSUE_TEMPLATE/config.yml

@@ -2,7 +2,7 @@ blank_issues_enabled: false
 contact_links:
   - name: GitHub Discussions
     url: https://github.com/openapi-generators/openapi-python-client/discussions
-    about: Please ask and answer questions here.
+    about: Request features and improvements here!
   - name: Discord
     url: https://discord.gg/JaqVvBgwYw
     about: Less structured, more casual chat.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -4,10 +4,12 @@
     ":semanticCommitTypeAll(chore)"
   ],
   "rangeStrategy": "widen",
+  "lockFileMaintenance": { "enabled": true, "automerge": true },
   "regexManagers": [
     {
       "fileMatch": [
-        "release.*\\.yml"
+        "release.*\\.yml",
+        "prerelease.yml"
       ],
       "matchStrings": [
         "version:\\s*(?<currentValue>.*)"

.github/check_for_changes.py

@@ -11,116 +11,195 @@ jobs:
   test:
     strategy:
       matrix:
-        python: [ "3.8", "3.9", "3.10", "3.11" ]
+        python: [ "3.9", "3.10", "3.11", "3.12", "3.13" ]
         os: [ ubuntu-latest, macos-latest, windows-latest ]
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4.2.2
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5.3.0
         with:
           python-version: ${{ matrix.python }}
 
       - name: Get Python Version
         id: get_python_version
         run: echo "python_version=$(python --version)" >> $GITHUB_OUTPUT
+        shell: bash
 
       - name: Cache dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: .venv
-          key: ${{ runner.os }}-${{ steps.get_python_version.outputs.python_version }}-dependencies-${{ hashFiles('**/poetry.lock') }}
+          key: ${{ runner.os }}-${{ steps.get_python_version.outputs.python_version }}-dependencies-${{ hashFiles('**/pdm.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ steps.get_python_version.outputs.python_version }}-dependencies
-      - name: Install Poetry
-        run: pip install poetry
+      - name: Install PDM
+        run: pip install pdm
 
-      - name: Create Virtual Environment
-        run: python -m venv .venv
+      - name: Install Dependencies
+        run: pdm install
 
-      - name: Upgrade pip
-        run: poetry run python -m pip install --upgrade pip
+      - name: Check formatting
+        run: pdm run ruff format . --check
 
-      - name: Install Dependencies
-        run: poetry install
+      - name: Run mypy
+        run: pdm mypy --show-error-codes
 
-      - name: Run Black
-        run: poetry run black . --check
+      - name: Lint
+        run: pdm run ruff check .
 
-      - name: Run isort
-        run: poetry run isort . --check
+      - name: Run pytest without coverage
+        if: matrix.os != 'ubuntu-latest'
+        run: pdm test
 
-      - name: Run safety
-        run: poetry export -f requirements.txt | poetry run safety check --bare --stdin
+      - name: Run pytest with coverage
+        if: matrix.os == 'ubuntu-latest'
+        run: pdm test_with_coverage
 
-      - name: Run mypy
-        run: poetry run mypy --show-error-codes openapi_python_client
+      - run: mv .coverage .coverage.${{ matrix.python }}
+        if: matrix.os == 'ubuntu-latest'
 
-      - name: Run pylint
-        run: poetry run pylint openapi_python_client
+      - name: Store coverage report
+        uses: actions/[email protected]
+        if: matrix.os == 'ubuntu-latest'
+        with:
+          name: coverage-${{ matrix.python }}
+          path: .coverage.${{ matrix.python }}
+          if-no-files-found: error
+          include-hidden-files: true
 
-      - name: Run pytest
-        run: poetry run pytest --cov=openapi_python_client --cov-report=term-missing tests end_to_end_tests/test_end_to_end.py --basetemp=tests/tmp
-        env:
-          TASKIPY: true
+  test_min_deps:
+    strategy:
+      matrix:
+        os: [ ubuntu-latest, macos-latest, windows-latest ]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/[email protected]
+      - name: Set up Python
+        uses: actions/[email protected]
+        with:
+          python-version: "3.9"
 
-      - name: Generate coverage report
+      - name: Get Python Version
+        id: get_python_version
+        run: echo "python_version=$(python --version)" >> $GITHUB_OUTPUT
         shell: bash
-        run: poetry run coverage xml
 
-      - uses: codecov/codecov-action@v3
+      - name: Cache dependencies
+        uses: actions/cache@v4
+        with:
+          path: .venv
+          key: ${{ runner.os }}-${{ steps.get_python_version.outputs.python_version }}-min-dependencies-${{ hashFiles('**/pdm.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-${{ steps.get_python_version.outputs.python_version }}-min-dependencies
+      - name: Install PDM
+        run: pip install pdm
+
+      - name: Install minimum dependencies
+        run: pdm install -L pdm.minimal.lock
+
+      - name: Run mypy
+        run: pdm mypy --show-error-codes
+
+      - name: Lint
+        run: pdm run ruff check .
+
+      - name: Run unit tests only  # snapshots are expected to fail
+        run: pdm unit_test
+
+  coverage:
+    name: Combine & check coverage
+    needs: test
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/[email protected]
+      - uses: actions/setup-python@v5
         with:
-          files: ./coverage.xml
+          python-version: "3.12"
+      - name: Download coverage reports
+        uses: actions/[email protected]
+        with:
+          merge-multiple: true
+
+      - name: Create Virtual Environment
+        run: python -m venv .venv
+
+      - name: Combine coverage & fail if it's <100%.
+        run: |
+          # Install coverage
+          .venv/bin/pip install --upgrade coverage[toml]
+
+          # Find all of the downloaded coverage reports and combine them
+          .venv/bin/python -m coverage combine
+          
+          # Create html report
+          .venv/bin/python -m coverage html --skip-covered --skip-empty
+          
+          # Report in Markdown and write to summary.
+          .venv/bin/python -m coverage report --format=markdown >> $GITHUB_STEP_SUMMARY
+          
+          # Report again and fail if under 100%.
+          .venv/bin/python -m coverage report --fail-under=100          
+
+      - name: Upload HTML report if check failed.
+        uses: actions/[email protected]
+        with:
+          name: html-report
+          path: htmlcov
+        if: ${{ failure() }}
 
   integration:
     name: Integration Tests
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        httpx_version:
+          - "0.20.0"
+          - ""
     services:
       openapi-test-server:
         image: ghcr.io/openapi-generators/openapi-test-server:0.0.1
         ports:
           - "3000:3000"
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4.2.2
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5.3.0
         with:
-          python-version: "3.10"
+          python-version: "3.9"
       - name: Get Python Version
         id: get_python_version
         run: echo "python_version=$(python --version)" >> $GITHUB_OUTPUT
       - name: Cache dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: .venv
-          key: ${{ runner.os }}-${{ steps.get_python_version.outputs.python_version }}-dependencies-${{ hashFiles('**/poetry.lock') }}
+          key: ${{ runner.os }}-${{ steps.get_python_version.outputs.python_version }}-dependencies-${{ hashFiles('**/pdm.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ steps.get_python_version.outputs.python_version }}-dependencies
       - name: Install dependencies
         run: |
-          pip install poetry
+          pip install pdm
           python -m venv .venv
-          poetry run python -m pip install --upgrade pip
-          poetry install
-      - name: Regenerate Integration Client
-        run: |
-          poetry run openapi-python-client update --url http://localhost:3000/openapi.json --config integration-tests-config.yaml
-      - name: Check for any file changes
-        run: python .github/check_for_changes.py
+          pdm install
       - name: Cache Generated Client Dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: integration-tests/.venv
-          key: ${{ runner.os }}-${{ steps.get_python_version.outputs.python_version }}-integration-dependencies-${{ hashFiles('**/poetry.lock') }}
+          key: ${{ runner.os }}-${{ steps.get_python_version.outputs.python_version }}-integration-dependencies-${{ hashFiles('**/pdm.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ steps.get_python_version.outputs.python_version }}-integration-dependencies
+      - name: Set httpx version
+        if: matrix.httpx_version != ''
+        run: |
+          cd integration-tests 
+          pdm add httpx==${{ matrix.httpx_version }}
       - name: Install Integration Dependencies
         run: |
           cd integration-tests
-          python -m venv .venv
-          poetry run python -m pip install --upgrade pip
-          poetry install
+          pdm install
       - name: Run Tests
         run: |
           cd integration-tests
-          poetry run pytest
+          pdm run pytest
+          pdm run mypy . --strict