Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix cargo test #206

Merged
merged 13 commits into from
Feb 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
15 changes: 13 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 6 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "silver-platter"
version = "0.5.20"
authors = [ "Jelmer Vernooij <[email protected]>",]
authors = [ "Jelmer Vernooij <[email protected]>",]
edition = "2021"
license = "GPL-2.0+"
description = "Large scale VCS change management"
Expand Down Expand Up @@ -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"]

1 change: 0 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ testing = [
]

[project.scripts]
svp = "silver_platter.__main__:main"
debian-svp = "silver_platter.debian.__main__:main"

[tool.setuptools]
Expand Down
7 changes: 6 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import sys

from setuptools import setup
from setuptools_rust import Binding, RustExtension
from setuptools_rust import Binding, RustBin, RustExtension

features = []

Expand All @@ -17,6 +17,11 @@
binding=Binding.PyO3,
args=["--no-default-features"],
features=features,
),
RustBin(
"svp",
"Cargo.toml",
features=features
)
],
)
4 changes: 4 additions & 0 deletions silver_platter/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,7 @@

__version__ = (0, 5, 20)
version_string = ".".join(map(str, __version__))


class UnrelatedBranchExists(Exception):
"""An unrelated branch exists."""
148 changes: 0 additions & 148 deletions silver_platter/__main__.py

This file was deleted.

123 changes: 0 additions & 123 deletions silver_platter/apply.py

This file was deleted.

Loading
Loading