Merge branch 'RobertCraigie:main' into fix-cp932-error

RobertCraigie · Sep 11, 2024 · 36f6cd1 · 36f6cd1
2 parents 2a3a168 + 05808fc
commit 36f6cd1
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@
         <img src="https://img.shields.io/discord/933860922039099444?color=blue&label=chat&logo=discord" alt="Chat on Discord">
     </a>
     <a href="https://prisma.io">
-        <img src="https://img.shields.io/static/v1?label=prisma&message=5.17.0&color=blue&logo=prisma" alt="Supported Prisma version is 5.17.0">
+        <img src="https://img.shields.io/static/v1?label=prisma&message=5.19.0&color=blue&logo=prisma" alt="Supported Prisma version is 5.19.0">
     </a>
     <a href="https://github.com/astral-sh/ruff">
         <img src="https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2FJacobCoffee%2Fbfb02a83c8da3cbf53f7772f2cee02ec%2Fraw%2Facb94daa3aedecda67e2c7d8c5aec9765db0734d%2Fformat-badge.json" alt="Code style: ruff">

diff --git a/docs/getting_started/advanced.md b/docs/getting_started/advanced.md
@@ -1,5 +1,5 @@
 !!! note
-    Adapted from the Prisma Client Go [documentation](https://github.com/prisma/prisma-client-go/blob/master/docs/advanced.md)
+    Adapted from the Prisma Client Go [documentation](https://github.com/steebchen/prisma-client-go/blob/main/docs/pages/docs/getting-started/advanced.md)
 
 In the [quickstart](quickstart.md), we have created a simple post model and ran a few queries. However, Prisma and the
 Python client are designed to work with relations between models.

diff --git a/docs/index.md b/docs/index.md
@@ -8,7 +8,7 @@
         <img src="https://img.shields.io/discord/933860922039099444?color=blue&label=chat&logo=discord" alt="Chat on Discord">
     </a>
     <a href="https://prisma.io">
-        <img src="https://img.shields.io/static/v1?label=prisma&message=5.17.0&color=blue&logo=prisma" alt="Supported Prisma version is 5.17.0">
+        <img src="https://img.shields.io/static/v1?label=prisma&message=5.19.0&color=blue&logo=prisma" alt="Supported Prisma version is 5.19.0">
     </a>
     <a href="https://github.com/astral-sh/ruff">
         <img src="https://img.shields.io/endpoint?url=https%3A%2F%2Fgist.githubusercontent.com%2FJacobCoffee%2Fbfb02a83c8da3cbf53f7772f2cee02ec%2Fraw%2Facb94daa3aedecda67e2c7d8c5aec9765db0734d%2Fformat-badge.json" alt="Code style: ruff">

diff --git a/docs/reference/binaries.md b/docs/reference/binaries.md
@@ -9,7 +9,7 @@ Prisma Client Python _should_ automatically download the correct binaries for yo
 - Clone the prisma-engines repository at the current version that the python client supports:
 
 ```
-git clone https://github.com/prisma/prisma-engines --branch=5.17.0
+git clone https://github.com/prisma/prisma-engines --branch=5.19.0
 ```
 
 - Build the binaries following the steps found [here](https://github.com/prisma/prisma-engines#building-prisma-engines)

diff --git a/docs/reference/config.md b/docs/reference/config.md
@@ -220,15 +220,15 @@ This option controls the version of Prisma to use. It should be noted that this
 
 | Option           | Environment Variable  | Default  |
 | ---------------- | --------------------- | -------- |
-| `prisma_version` | `PRISMA_VERSION`      | `5.17.0` |
+| `prisma_version` | `PRISMA_VERSION`      | `5.19.0` |
 
 ### Expected Engine Version
 
 This is an internal option that is here as a safeguard for the `prisma_version` option. If you modify the `prisma_version` option then you must also update this option to use the corresponding engine version. You can find a list of engine versions [here](https://github.com/prisma/prisma-engines).
 
 | Option                    | Environment Variable             | Default                                    |
 | ------------------------- | -------------------------------- | ------------------------------------------ |
-| `expected_engine_version` | `PRISMA_EXPECTED_ENGINE_VERSION` | `393aa359c9ad4a4bb28630fb5613f9c281cde053` |
+| `expected_engine_version` | `PRISMA_EXPECTED_ENGINE_VERSION` | `5fe21811a6ba0b952a3bc71400666511fe3b902f` |
 
 
 ### Binary Platform

diff --git a/pipelines/requirements/deps/ruff.txt b/pipelines/requirements/deps/ruff.txt
@@ -1 +1 @@
-ruff==0.5.7
+ruff==0.6.3
diff --git a/src/prisma/_config.py b/src/prisma/_config.py
@@ -27,13 +27,13 @@ class DefaultConfig(BaseSettings):
     #       doesn't change then the CLI is incorrectly cached
     prisma_version: str = Field(
         env='PRISMA_VERSION',
-        default='5.17.0',
+        default='5.19.0',
     )
 
     # Engine binary versions can be found under https://github.com/prisma/prisma-engine/commits/main
     expected_engine_version: str = Field(
         env='PRISMA_EXPECTED_ENGINE_VERSION',
-        default='393aa359c9ad4a4bb28630fb5613f9c281cde053',
+        default='5fe21811a6ba0b952a3bc71400666511fe3b902f',
     )
 
     # Home directory, used to build the `binary_cache_dir` option by default, useful in multi-user

diff --git a/tests/test_generation/test_prisma_cleanup.py b/tests/test_generation/test_prisma_cleanup.py
@@ -2,8 +2,8 @@
 import subprocess
 
 import pytest
-from prisma_cleanup import cleanup
 
+from prisma_cleanup import cleanup
 from prisma.generator import BASE_PACKAGE_DIR
 from prisma.generator.utils import copy_tree