feat: pypi source dependencies

examples/pypi-source-deps/.gitattributes

@@ -0,0 +1,2 @@
+# GitHub syntax highlighting
+pixi.lock linguist-language=YAML

examples/pypi-source-deps/.gitignore

@@ -0,0 +1,2 @@
+# pixi environments
+.pixi

examples/pypi-source-deps/minimal_project/minimal_project/module.py

@@ -0,0 +1,2 @@
+def hello():
+    print('Hello World!')

examples/pypi-source-deps/minimal_project/pyproject.toml

@@ -0,0 +1,8 @@
+[project]
+name = "minimal_project"
+version = "0.1"
+description = "just says hello"
+
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"

examples/pypi-source-deps/pixi.toml

@@ -0,0 +1,29 @@
+[project]
+name = "pypi-source-deps"
+version = "0.1.0"
+description = "Add a short description here"
+authors = ["Tim de Jager <[email protected]>"]
+channels = ["conda-forge"]
+platforms = ["osx-arm64", "linux-64", "win-64"]
+
+[tasks]
+hello = "python -c 'from minimal_project import module;module.hello()'"
+
+[dependencies]
+python = "*"
+
+[pypi-dependencies]
+
+rich = "~=13.7"
+# Lets start with some git dependencies
+# With ssh
+flask = { git = "ssh://[email protected]/pallets/flask" }
+# With https
+requests = { git = "https://github.com/psf/requests.git", rev = "0106aced5faa299e6ede89d1230bd6784f2c3660" }
+# ...or use branch = '' to specify a branch or commit
+
+# You can also directly add a source dependency from file
+minimal_project = { path = "./minimal_project" }
+
+# You can also use a direct url, to either a `.tar.gz` or `.zip`, or a `.whl` file
+click = { url = "https://github.com/pallets/click/releases/download/8.1.7/click-8.1.7-py3-none-any.whl" }

schema/model.py

@@ -8,15 +8,14 @@
     BaseModel,
     Field,
     PositiveFloat,
-    conint,
-    constr,
+    StringConstraints,
 )
 
-NonEmptyStr = constr(min_length=1)
-PathNoBackslash = constr(pattern=r"^[^\\]+$")
+NonEmptyStr = Annotated[str, StringConstraints(min_length=1)]
+PathNoBackslash = Annotated[str, StringConstraints(pattern=r"^[^\\]+$")]
 Glob = NonEmptyStr
-UnsignedInt = conint(ge=0)
-GitUrl = constr(pattern=r"((git|ssh|http(s)?)|(git@[\w\.]+))(:(\/\/)?)([\w\.@:\/\\-~]+)")
+UnsignedInt = Annotated[int, Field(strict=True, ge=0)]
+GitUrl = Annotated[str, StringConstraints(pattern=r"((git|ssh|http(s)?)|(git@[\w\.]+))(:(\/\/)?)([\w\.@:\/\\-~]+)")]
 
 
 class StrictBaseModel(BaseModel):
@@ -90,6 +89,24 @@ class MatchspecTable(StrictBaseModel):
 CondaPackageName = NonEmptyStr
 
 
+# { version = "sdfds" extras = ["sdf"] }
+# { git = "sfds", rev = "fssd" }
+# { path = "asfdsf" }
+# { url = "asdfs" }
+
+class PyPIVersionRequirement(StrictBaseModel):
+    version: NonEmptyStr = Field(
+        None,
+        description="The version of the package in [PEP 440](https://www.python.org/dev/peps/pep-0440/) format",
+    )
+
+class PyPIGitRequirement(StrictBaseModel):
+    git: NonEmptyStr = Field(
+        None,
+        description="The git url to the repo e.g https://github.com/prefix-dev/pixi",
+    )
+    rev: NonEmptyStr | None = Field(None, description="The git sha revision")
+
 class PyPIRequirementTable(StrictBaseModel):
     version: NonEmptyStr | None = Field(
         None,
@@ -286,4 +303,4 @@ class BaseManifest(StrictBaseModel):
 
 
 if __name__ == "__main__":
-    print(json.dumps(BaseManifest.schema(), indent=2))
+    print(json.dumps(BaseManifest.model_json_schema(), indent=2))