From 55b9834ab5d2bee6affab93d41c421b0cf92944e Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Thu, 7 Dec 2023 15:05:23 +0100 Subject: [PATCH] deps: require cargo2rpm >= 0.1.15 and update test fixtures --- requirements.txt | 2 +- .../tests/samples/tokio-1.19.2.plain.spec | 21 +++++++++++++++++++ setup.cfg | 2 +- 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 3f61886..60ffcdc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -cargo2rpm>=0.1.14 +cargo2rpm>=0.1.15 jinja2 jsonschema pyparsing diff --git a/rust2rpm/tests/samples/tokio-1.19.2.plain.spec b/rust2rpm/tests/samples/tokio-1.19.2.plain.spec index 46e1789..37944f5 100644 --- a/rust2rpm/tests/samples/tokio-1.19.2.plain.spec +++ b/rust2rpm/tests/samples/tokio-1.19.2.plain.spec @@ -275,7 +275,14 @@ Requires: (crate(mio/default) >= 0.8.1 with crate(mio/default) < 0.9.0~) Requires: (crate(mio/net) >= 0.8.1 with crate(mio/net) < 0.9.0~) Requires: (crate(mio/os-ext) >= 0.8.1 with crate(mio/os-ext) < 0.9.0~) Requires: (crate(mio/os-poll) >= 0.8.1 with crate(mio/os-poll) < 0.9.0~) +Requires: (crate(winapi) >= 0.3.8 with crate(winapi) < 0.4.0~) +Requires: (crate(winapi/handleapi) >= 0.3.8 with crate(winapi/handleapi) < 0.4.0~) +Requires: (crate(winapi/mswsock) >= 0.3.8 with crate(winapi/mswsock) < 0.4.0~) Requires: (crate(winapi/namedpipeapi) >= 0.3.8 with crate(winapi/namedpipeapi) < 0.4.0~) +Requires: (crate(winapi/std) >= 0.3.8 with crate(winapi/std) < 0.4.0~) +Requires: (crate(winapi/winsock2) >= 0.3.8 with crate(winapi/winsock2) < 0.4.0~) +Requires: (crate(winapi/ws2ipdef) >= 0.3.8 with crate(winapi/ws2ipdef) < 0.4.0~) +Requires: (crate(winapi/ws2tcpip) >= 0.3.8 with crate(winapi/ws2tcpip) < 0.4.0~) Requires: cargo Requires: crate(tokio) = 1.19.2 Requires: crate(tokio/libc) = 1.19.2 @@ -345,7 +352,14 @@ Requires: (crate(mio/default) >= 0.8.1 with crate(mio/default) < 0.9.0~) Requires: (crate(mio/net) >= 0.8.1 with crate(mio/net) < 0.9.0~) Requires: (crate(mio/os-ext) >= 0.8.1 with crate(mio/os-ext) < 0.9.0~) Requires: (crate(mio/os-poll) >= 0.8.1 with crate(mio/os-poll) < 0.9.0~) +Requires: (crate(winapi) >= 0.3.8 with crate(winapi) < 0.4.0~) +Requires: (crate(winapi/handleapi) >= 0.3.8 with crate(winapi/handleapi) < 0.4.0~) +Requires: (crate(winapi/mswsock) >= 0.3.8 with crate(winapi/mswsock) < 0.4.0~) +Requires: (crate(winapi/std) >= 0.3.8 with crate(winapi/std) < 0.4.0~) Requires: (crate(winapi/threadpoollegacyapiset) >= 0.3.8 with crate(winapi/threadpoollegacyapiset) < 0.4.0~) +Requires: (crate(winapi/winsock2) >= 0.3.8 with crate(winapi/winsock2) < 0.4.0~) +Requires: (crate(winapi/ws2ipdef) >= 0.3.8 with crate(winapi/ws2ipdef) < 0.4.0~) +Requires: (crate(winapi/ws2tcpip) >= 0.3.8 with crate(winapi/ws2tcpip) < 0.4.0~) Requires: cargo Requires: crate(tokio) = 1.19.2 Requires: crate(tokio/bytes) = 1.19.2 @@ -402,7 +416,14 @@ Requires: (crate(mio/default) >= 0.8.1 with crate(mio/default) < 0.9.0~) Requires: (crate(mio/net) >= 0.8.1 with crate(mio/net) < 0.9.0~) Requires: (crate(mio/os-ext) >= 0.8.1 with crate(mio/os-ext) < 0.9.0~) Requires: (crate(mio/os-poll) >= 0.8.1 with crate(mio/os-poll) < 0.9.0~) +Requires: (crate(winapi) >= 0.3.8 with crate(winapi) < 0.4.0~) Requires: (crate(winapi/consoleapi) >= 0.3.8 with crate(winapi/consoleapi) < 0.4.0~) +Requires: (crate(winapi/handleapi) >= 0.3.8 with crate(winapi/handleapi) < 0.4.0~) +Requires: (crate(winapi/mswsock) >= 0.3.8 with crate(winapi/mswsock) < 0.4.0~) +Requires: (crate(winapi/std) >= 0.3.8 with crate(winapi/std) < 0.4.0~) +Requires: (crate(winapi/winsock2) >= 0.3.8 with crate(winapi/winsock2) < 0.4.0~) +Requires: (crate(winapi/ws2ipdef) >= 0.3.8 with crate(winapi/ws2ipdef) < 0.4.0~) +Requires: (crate(winapi/ws2tcpip) >= 0.3.8 with crate(winapi/ws2tcpip) < 0.4.0~) Requires: cargo Requires: crate(tokio) = 1.19.2 Requires: crate(tokio/libc) = 1.19.2 diff --git a/setup.cfg b/setup.cfg index 6101aa3..2d34f84 100644 --- a/setup.cfg +++ b/setup.cfg @@ -24,7 +24,7 @@ classifiers = include_package_data = True packages = rust2rpm install_requires = - cargo2rpm>=0.1.14 + cargo2rpm>=0.1.15 jinja2 jsonschema pyparsing