Merge branch 'main' into test-build-3.12

Author: samuelcolvin

.cargo/config.toml

@@ -1,19 +1,15 @@
 [build]
-rustflags = [
-  "-A", "incomplete_features",
-]
+rustflags = []
 
 # see https://pyo3.rs/main/building_and_distribution.html#macos
 [target.x86_64-apple-darwin]
 rustflags = [
   "-C", "link-arg=-undefined",
   "-C", "link-arg=dynamic_lookup",
-  "-A", "incomplete_features",
 ]
 
 [target.aarch64-apple-darwin]
 rustflags = [
   "-C", "link-arg=-undefined",
   "-C", "link-arg=dynamic_lookup",
-  "-A", "incomplete_features",
 ]

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,17 @@
+<!-- Thank you for your contribution! -->
+
+## Change Summary
+
+<!-- Please give a short summary of the changes. -->
+
+## Related issue number
+
+<!-- Are there any issues opened that will be resolved by merging this change? -->
+<!-- WARNING: please use "fix #123" style references so the issue is closed when this PR is merged. -->
+
+## Checklist
+
+* [ ] Unit tests for the changes exist
+* [ ] Documentation reflects the changes where applicable
+* [ ] Pydantic tests pass with this `pydantic-core` (except for expected changes)
+* [ ] My PR is ready to review, **please add a comment including the phrase "please review" to assign reviewers**

.github/workflows/ci.yml

@@ -53,7 +53,7 @@ jobs:
       - run: ls -lha
       - run: coverage xml
 
-      - run: coverage-prepare lcov pydantic_core/*.so
+      - run: coverage-prepare lcov python/pydantic_core/*.so
 
       - uses: codecov/codecov-action@v3
 
@@ -152,8 +152,7 @@ jobs:
           python-version: '3.11'
 
       - run: pip install -r tests/requirements.txt
-      - run: 'pip install "maturin==1.0.1" typing_extensions'
-      - run: make build-dev
+      - run: pip install -e . --config-settings=build-args='--profile dev'
 
       - run: pip freeze
       - run: pytest
@@ -174,7 +173,7 @@ jobs:
 
       - uses: actions/setup-python@v4
         with:
-          python-version: '3.10'
+          python-version: '3.11'
 
       # used to lint js code
       - uses: actions/setup-node@v3
@@ -196,7 +195,6 @@ jobs:
         if: steps.cache-py.outputs.cache-hit != 'true'
 
       - run: pip install .
-        if: steps.cache-py.outputs.cache-hit != 'true'
 
       - run: pip freeze
 
@@ -255,7 +253,7 @@ jobs:
           version: '3.1.32'
           actions-cache-folder: emsdk-cache
 
-      - run: pip install 'maturin==1.0.1' 'black>=22.3.0,<23' typing_extensions
+      - run: pip install 'maturin>=1,<2' 'black>=22.3.0,<23' typing_extensions
 
       - name: build wheels
         run: make build-wasm
@@ -362,6 +360,7 @@ jobs:
           architecture: ${{ matrix.python-architecture || 'x64' }}
 
       - run: pip install -U twine 'black>=22.3.0,<23' typing_extensions
+
       # generate self-schema now, so we don't have to do so inside docker in maturin build
       - run: python generate_self_schema.py
 
@@ -381,6 +380,7 @@ jobs:
           container: ${{ matrix.container }}
           args: --release --out dist --interpreter ${{ matrix.interpreter || '3.7 3.8 3.9 3.10 3.11 3.12 pypy3.7 pypy3.8 pypy3.9' }}
           rust-toolchain: stable
+          docker-options: -e CI
 
       - run: ${{ matrix.ls || 'ls -lh' }} dist/
 
@@ -463,8 +463,6 @@ jobs:
             fi
           run: |
             set -x
-            # this is required so that pytest uses the installed pydantic-core package
-            rm -r pydantic_core
             # typing-extensions isn't automatically installed because of `--no-index --no-deps`
             python3 -m venv venv
             source venv/bin/activate
@@ -498,7 +496,6 @@ jobs:
           name: pypi_files
           path: dist
 
-      - run: rm -r pydantic_core
       - run: pip install typing-extensions
       - run: pip install -r tests/requirements.txt
       - run: pip install pydantic-core --no-index --no-deps --find-links dist --force-reinstall

.github/workflows/codspeed.yml

@@ -46,13 +46,14 @@ jobs:
       - name: cache rust
         uses: Swatinem/rust-cache@v2
 
-      - run: pip install . -v
+      - name: Install pydantic-core
+        # --no-default-features to avoid using mimalloc
+        run: |
+          pip install -e . --config-settings=build-args='--no-default-features --verbose' -v
+          python -c 'import pydantic_core; assert pydantic_core._pydantic_core.__pydantic_core_default_allocator__'
         env:
           CONST_RANDOM_SEED: 0 # Fix the compile time RNG seed
 
-      # this is required so that pytest uses the installed package
-      - run: rm tests/__init__.py
-
       - name: Run CodSpeed benchmarks
         uses: CodSpeedHQ/action@v1
         with:

.gitignore

@@ -34,5 +34,5 @@ node_modules/
 /*.profdata
 /*.profraw
 /foobar.py
-/pydantic_core/*.so
+/python/pydantic_core/*.so
 /src/self_schema.py

.mypy-stubtest-allowlist

@@ -0,0 +1,4 @@
+# TODO: __init__ signature inherited from BaseException, probably needs investigating
+pydantic_core._pydantic_core.PydanticOmit.__init__
+# TODO: don't want to expose this staticmethod, requires https://github.com/PyO3/pyo3/issues/2384
+pydantic_core._pydantic_core.PydanticUndefinedType.new