Merge branch 'master' of https://github.com/jelmer/silver-platter int…

…o bump-deps
jelmer · Feb 18, 2024 · 0e1a4f2 · 0e1a4f2
2 parents fe54397 + f47d4ea
commit 0e1a4f2
Show file tree

Hide file tree

Showing 39 changed files with 2,276 additions and 3,332 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -23,6 +23,9 @@ jobs:
         sudo apt -y update
         sudo apt -y install devscripts bzr libapt-pkg-dev libtdb-dev libssl-dev pkg-config
         cargo install cargo-all-features
+    # TODO(jelmer): Add proper test isolation so this isn't necessary
+    - name: Setup bzr identity
+      run: bzr whoami "CI <[email protected]>"
     - name: Build
       run: cargo build --verbose
     - name: Run tests

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "silver-platter"
 version = "0.5.20"
-authors = [ "Jelmer Vernooij <[email protected]>",]
+authors = [ "Jelmer Vernooĳ <[email protected]>",]
 edition = "2021"
 license = "GPL-2.0+"
 description = "Large scale VCS change management"
@@ -69,10 +69,14 @@ pyo3-log = "0.8"
 serde_json = "1"
 tera = "1"
 serde = "1.0.171"
-breezyshim = ">=0.1.55"
+breezyshim = ">=0.1.79"
 url = "2.4.0"
 debian-changelog = "0.1.10"
 
 [[bin]]
 name = "svp"
 
+[[bin]]
+name = "debian-svp"
+required-features = ["debian"]
+
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-all:
+all: build-inplace
 
 build-inplace:
 	python3 setup.py build_ext -i

diff --git a/crates/svp-py/src/lib.rs b/crates/svp-py/src/lib.rs
@@ -869,7 +869,7 @@ fn fetch_colocated(
     silver_platter::workspace::fetch_colocated(
         &controldir,
         &from_controldir,
-        additional_colocated_branches,
+        &additional_colocated_branches,
     )
 }
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -54,7 +54,6 @@ testing = [
 ]
 
 [project.scripts]
-svp = "silver_platter.__main__:main"
 debian-svp = "silver_platter.debian.__main__:main"
 
 [tool.setuptools]

diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 import sys
 
 from setuptools import setup
-from setuptools_rust import Binding, RustExtension
+from setuptools_rust import Binding, RustBin, RustExtension
 
 features = []
 
@@ -17,6 +17,11 @@
             binding=Binding.PyO3,
             args=["--no-default-features"],
             features=features,
+        ),
+        RustBin(
+            "svp",
+            "Cargo.toml",
+            features=features
         )
     ],
 )
diff --git a/silver_platter/__init__.py b/silver_platter/__init__.py
@@ -26,3 +26,7 @@
 
 __version__ = (0, 5, 20)
 version_string = ".".join(map(str, __version__))
+
+
+class UnrelatedBranchExists(Exception):
+    """An unrelated branch exists."""
diff --git a/silver_platter/__main__.py b/silver_platter/__main__.py
diff --git a/silver_platter/apply.py b/silver_platter/apply.py