move pydantic_core into python/pydantic_core to avoid pytest import crash

Author: davidhewitt

.github/workflows/ci.yml

@@ -453,7 +453,6 @@ jobs:
           pip install -U pip
           pip install -r tests/requirements.txt
           pip install pydantic-core --no-index --no-deps --find-links pgo-wheel --force-reinstall
-          cd tests  # change directory to avoid importing local pydantic_core source
           pytest tests/benchmarks
           rustup run stable bash -c '$RUSTUP_HOME/toolchains/$RUSTUP_TOOLCHAIN/lib/rustlib/x86_64-unknown-linux-gnu/bin/llvm-profdata merge -o ${{ github.workspace }}/merged.profdata ${{ github.workspace }}/profdata'
 

.gitignore

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

README.md

@@ -106,8 +106,8 @@ make install
 
 That should be it, the example shown above should now run.
 
-You might find it useful to look at [`pydantic_core/_pydantic_core.pyi`](./pydantic_core/_pydantic_core.pyi) and
-[`pydantic_core/core_schema.py`](./pydantic_core/core_schema.py) for more information on the python API,
+You might find it useful to look at [`pydantic_core/_pydantic_core.pyi`](./python/pydantic_core/_pydantic_core.pyi) and
+[`pydantic_core/core_schema.py`](./python/pydantic_core/core_schema.py) for more information on the python API,
 beyond that, [`tests/`](./tests) provide a large number of examples of usage.
 
 If you want to contribute to pydantic-core, you'll want to use some other make commands:

build.rs

@@ -4,7 +4,7 @@ use std::process::Command;
 use std::str::from_utf8;
 
 fn generate_self_schema() {
-    println!("cargo:rerun-if-changed=pydantic_core/core_schema.py");
+    println!("cargo:rerun-if-changed=python/pydantic_core/core_schema.py");
     println!("cargo:rerun-if-changed=generate_self_schema.py");
     if Path::new("./src/self_schema.py").exists() && option_env!("CI") == Some("true") {
         // self_schema.py already exists and CI indicates we're running on a github actions build,

generate_self_schema.py

@@ -34,7 +34,7 @@
 else:
     # can't import core_schema.py directly as pydantic-core might not be installed
     core_schema_spec = importlib.util.spec_from_file_location(
-        '_typing', str(THIS_DIR / 'pydantic_core' / 'core_schema.py')
+        '_typing', str(THIS_DIR / 'python' / 'pydantic_core' / 'core_schema.py')
     )
     core_schema = importlib.util.module_from_spec(core_schema_spec)
     core_schema_spec.loader.exec_module(core_schema)

pyproject.toml

@@ -44,6 +44,7 @@ Funding = 'https://github.com/sponsors/samuelcolvin'
 Source = 'https://github.com/pydantic/pydantic-core'
 
 [tool.maturin]
+python-source = "python"
 module-name = "pydantic_core._pydantic_core"
 bindings = 'pyo3'
 features = ["pyo3/extension-module", "mimalloc-allocator"]