Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package cargo-vendor-filterer for
openSUSE:Factory checked in at 2024-05-15 21:28:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cargo-vendor-filterer (Old)
and /work/SRC/openSUSE:Factory/.cargo-vendor-filterer.new.1880 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cargo-vendor-filterer"
Wed May 15 21:28:58 2024 rev:4 rq:1174208 version:0.5.14
Changes:
--------
---
/work/SRC/openSUSE:Factory/cargo-vendor-filterer/cargo-vendor-filterer.changes
2024-03-29 13:13:38.245038603 +0100
+++
/work/SRC/openSUSE:Factory/.cargo-vendor-filterer.new.1880/cargo-vendor-filterer.changes
2024-05-15 21:29:21.891603605 +0200
@@ -1,0 +2,13 @@
+Wed May 8 09:50:40 UTC 2024 - Soc Virnyl Estela
<[email protected]>
+
+- Update to 0.5.14:
+ * improvement: add option `--no-default-features` and `--features`
+ * change fieldname types of feature and no-default-features to Vec<String>
and bool, respectively
+ * fix: use clap and serde default for new fieldnames
+ * cleanup: replace Option<bool> with default values with bool for
all-features
+ * cleanup: add the if-elses for the new cli and config options on
add_packages_for_platform too
+ * ci: update nushell to 0.91.0 for vendor tests
+- Update service file:
+ * use glob so we don't need to edit versions in the _service file.
+
+-------------------------------------------------------------------
Old:
----
cargo-vendor-filterer-0.5.13.tar.gz
New:
----
cargo-vendor-filterer-0.5.14.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cargo-vendor-filterer.spec ++++++
--- /var/tmp/diff_new_pack.8C8xsz/_old 2024-05-15 21:29:24.083682947 +0200
+++ /var/tmp/diff_new_pack.8C8xsz/_new 2024-05-15 21:29:24.103683672 +0200
@@ -21,7 +21,7 @@
License: Apache-2.0
Group: Development/Tools/Building
URL: https://github.com/coreos/cargo-vendor-filterer
-Version: 0.5.13
+Version: 0.5.14
Release: 0
Source0:
https://github.com/coreos/cargo-vendor-filterer/archive/refs/tags/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
Source1: vendor.tar.zst
++++++ _service ++++++
--- /var/tmp/diff_new_pack.8C8xsz/_old 2024-05-15 21:29:24.151685408 +0200
+++ /var/tmp/diff_new_pack.8C8xsz/_new 2024-05-15 21:29:24.175686277 +0200
@@ -1,7 +1,7 @@
<services>
<service name="download_files" mode="manual" />
<service name="cargo_vendor" mode="manual">
- <param name="srctar">cargo-vendor-filterer-0.5.13.tar.gz</param>
+ <param name="srctar">cargo-vendor-filterer-*.tar.gz</param>
<param name="compression">zst</param>
<param name="update">true</param>
<param name="filter">true</param>
++++++ cargo-vendor-filterer-0.5.13.tar.gz ->
cargo-vendor-filterer-0.5.14.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/cargo-vendor-filterer-0.5.13/.github/workflows/ci.yml
new/cargo-vendor-filterer-0.5.14/.github/workflows/ci.yml
--- old/cargo-vendor-filterer-0.5.13/.github/workflows/ci.yml 2024-03-25
01:12:38.000000000 +0100
+++ new/cargo-vendor-filterer-0.5.14/.github/workflows/ci.yml 2024-04-01
19:03:06.000000000 +0200
@@ -75,26 +75,33 @@
needs: build-test
strategy:
matrix:
- repos:
- - "nushell/[email protected]"
- - "containers/[email protected]"
+ repo:
+ - nushell/nushell
+ - containers/netavark
+ include:
+ - repo: nushell/nushell
+ tag: 0.91.0
+ args: "-F plugin -F system-clipboard -F default-no-clipboard"
+ - repo: containers/netavark
+ tag: v1.8.0
+ args: "-F deps-serde"
steps:
- name: Download binary
uses: actions/download-artifact@v2
with:
name: cargo-vendor-filterer
- run: sudo install -m 0755 cargo-vendor-filterer /usr/bin
- - run: |
- r="${{ matrix.repos }}"
- parts=(${r//@/ })
- echo repo=${parts[0]} >> $GITHUB_ENV
- echo tag=${parts[1]} >> $GITHUB_ENV
- uses: actions/checkout@v3
with:
- repository: ${{ env.repo }}
- ref: ${{ env.tag }}
+ repository: ${{ matrix.repo }}
+ ref: ${{ matrix.tag }}
# For netavark
- run: sudo apt install protobuf-compiler
- - run: mkdir -p .cargo && cargo-vendor-filterer --platform
x86_64-unknown-linux-gnu --all-features true > .cargo/config.toml
+ - run: |
+ mkdir -p .cargo && cargo-vendor-filterer --platform
x86_64-unknown-linux-gnu --all-features > .cargo/config.toml
+ rm -rf vendor
+ cargo-vendor-filterer --platform x86_64-unknown-linux-gnu
--no-default-features > .cargo/config.toml
+ rm -rf vendor
+ cargo-vendor-filterer --platform x86_64-unknown-linux-gnu
--no-default-features ${{ matrix.args }} > .cargo/config.toml
# This runs without networking, verifying we're building using vendored
deps
- run: rm ~/.cargo/{registry,git} -rf && unshare -Umn cargo check
--offline
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cargo-vendor-filterer-0.5.13/Cargo.lock
new/cargo-vendor-filterer-0.5.14/Cargo.lock
--- old/cargo-vendor-filterer-0.5.13/Cargo.lock 2024-03-25 01:12:38.000000000
+0100
+++ new/cargo-vendor-filterer-0.5.14/Cargo.lock 2024-04-01 19:03:06.000000000
+0200
@@ -103,7 +103,7 @@
[[package]]
name = "cargo-vendor-filterer"
-version = "0.5.13"
+version = "0.5.14"
dependencies = [
"anyhow",
"camino",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cargo-vendor-filterer-0.5.13/Cargo.toml
new/cargo-vendor-filterer-0.5.14/Cargo.toml
--- old/cargo-vendor-filterer-0.5.13/Cargo.toml 2024-03-25 01:12:38.000000000
+0100
+++ new/cargo-vendor-filterer-0.5.14/Cargo.toml 2024-04-01 19:03:06.000000000
+0200
@@ -4,7 +4,7 @@
rust-version = "1.75"
license = "Apache-2.0"
name = "cargo-vendor-filterer"
-version = "0.5.13"
+version = "0.5.14"
description = "`cargo vendor`, but with filtering for platforms and more"
readme = "README.md"
repository = "https://github.com/coreos/cargo-vendor-filterer";
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cargo-vendor-filterer-0.5.13/src/main.rs
new/cargo-vendor-filterer-0.5.14/src/main.rs
--- old/cargo-vendor-filterer-0.5.13/src/main.rs 2024-03-25
01:12:38.000000000 +0100
+++ new/cargo-vendor-filterer-0.5.14/src/main.rs 2024-04-01
19:03:06.000000000 +0200
@@ -1,7 +1,9 @@
use anyhow::{anyhow, Context, Result};
use camino::{Utf8Path, Utf8PathBuf};
-use cargo_metadata::Package;
-use cargo_metadata::{CargoOpt::AllFeatures, MetadataCommand};
+use cargo_metadata::{
+ CargoOpt::{AllFeatures, NoDefaultFeatures, SomeFeatures},
+ MetadataCommand, Package,
+};
use clap::Parser;
use either::Either;
use serde::{Deserialize, Serialize};
@@ -122,7 +124,12 @@
struct VendorFilter {
platforms: Option<BTreeSet<String>>,
tier: Option<tiers::Tier>,
- all_features: Option<bool>,
+ #[serde(default)]
+ all_features: bool,
+ #[serde(default)]
+ no_default_features: bool,
+ #[serde(skip_serializing_if = "Vec::is_empty", default)]
+ features: Vec<String>,
exclude_crate_paths: Option<HashSet<CrateExclude>>,
}
@@ -157,9 +164,20 @@
#[arg(long)]
manifest_path: Option<Utf8PathBuf>,
- /// Enable all features
- #[arg(long)]
- all_features: Option<bool>,
+ /// Activate all available features
+ #[arg(long, default_value_t = false)]
+ all_features: bool,
+
+ /// Do not activate the `default` feature
+ #[arg(long, default_value_t = false)]
+ no_default_features: bool,
+
+ /// Space or comma separated list of features to activate. Features
+ /// of workspace members may be enabled with package-name/feature-name
+ /// syntax. This flag may be specified multiple times, which enables all
+ /// specified features.
+ #[arg(long, short = 'F')]
+ features: Vec<String>,
/// Pick the output format.
#[arg(long, default_value = "dir")]
@@ -311,7 +329,9 @@
fn parse_args(args: &Args) -> Result<Option<Self>> {
let args_unset = args.platform.is_none()
&& args.tier.is_none()
- && args.all_features.is_none()
+ && !args.all_features
+ && !args.no_default_features
+ && args.features.is_empty()
&& args.exclude_crate_path.is_none();
let exclude_crate_paths = args
.exclude_crate_path
@@ -329,6 +349,8 @@
.map(|x| BTreeSet::from_iter(x.iter().cloned())),
tier: args.tier.clone(),
all_features: args.all_features,
+ no_default_features: args.no_default_features,
+ features: args.features.clone(),
exclude_crate_paths,
});
Ok(r)
@@ -543,9 +565,15 @@
let mut packages = HashMap::new();
for manifest_path in all_manifest_paths {
let mut command = new_metadata_cmd(manifest_path, args.offline);
- if config.all_features.unwrap_or_default() {
+ if config.all_features {
command.features(AllFeatures);
}
+ if config.no_default_features {
+ command.features(NoDefaultFeatures);
+ }
+ if !config.features.is_empty() {
+ command.features(SomeFeatures(config.features.clone()));
+ }
let meta = command.exec().context("Executing cargo metadata")?;
meta.packages
.into_iter()
@@ -569,10 +597,15 @@
let all_manifest_paths = args.get_all_manifest_paths();
for manifest_path in all_manifest_paths {
let mut command = new_metadata_cmd(manifest_path, args.offline);
- if config.all_features.unwrap_or_default() {
+ if config.all_features {
command.features(AllFeatures);
}
-
+ if config.no_default_features {
+ command.features(NoDefaultFeatures);
+ }
+ if !config.features.is_empty() {
+ command.features(SomeFeatures(config.features.clone()));
+ }
if let Some(platform) = platform {
command.other_options(vec![format!("--filter-platform={platform}")]);
}
@@ -910,9 +943,12 @@
let valid = vec![
json!({}),
json!({ "platforms": ["aarch64-unknown-linux-gnu"]}),
- json!({ "platforms": ["*-unknown-linux-gnu"], "tier": "2"}),
- json!({ "platforms": ["*-unknown-linux-gnu"], "tier": "Two"}),
- json!({ "platforms": ["aarch64-unknown-linux-gnu"], "all-features":
true}),
+ json!({ "platforms": ["aarch64-unknown-linux-gnu"],
"no-default-features": true}),
+ json!({ "platforms": ["*-unknown-linux-gnu"], "tier": "2",
"no-default-features": false}),
+ json!({ "platforms": ["*-unknown-linux-gnu"], "tier": "Two",
"no-default-features": false}),
+ json!({ "platforms": ["aarch64-unknown-linux-gnu"], "all-features":
true, "no-default-features": false}),
+ json!({ "platforms": ["aarch64-unknown-linux-gnu"],
"no-default-features": true}),
+ json!({ "platforms": ["aarch64-unknown-linux-gnu"],
"no-default-features": true, "features": ["first-feature", "second-feature"]}),
];
for case in valid {
let _: VendorFilter = serde_json::from_value(case).unwrap();
++++++ vendor.tar.zst ++++++
Binary files /var/tmp/diff_new_pack.8C8xsz/_old and
/var/tmp/diff_new_pack.8C8xsz/_new differ
