rpms/fence-agents
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- remove pexpect dependency

Browse Source 
Resolves: rhbz#1961551
This commit is contained in:
Oyvind Albrigtsen 2021-05-19 14:24:11 +02:00
parent eadca95a73
commit 3ac2c2a094
3 changed files with 52 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
fence-agents.spec
View File

@ -31,9 +31,9 @@ Source1003: cryptography-3.4.7-cp36-abi3-manylinux2014_x86_64.whl
Source1004: jmespath-0.10.0-py2.py3-none-any.whl
Source1005: pycparser-2.20-py2.py3-none-any.whl
# aws
Source1006: awscli-1.19.74-py2.py3-none-any.whl
Source1007: boto3-1.17.74.tar.gz
Source1008: botocore-1.20.74-py2.py3-none-any.whl
Source1006: awscli-1.19.75-py2.py3-none-any.whl
Source1007: boto3-1.17.75-py2.py3-none-any.whl
Source1008: botocore-1.20.75-py2.py3-none-any.whl
Source1009: colorama-0.4.3-py2.py3-none-any.whl
Source1010: docutils-0.15.2-py3-none-any.whl
Source1011: pyasn1-0.4.8-py2.py3-none-any.whl
@ -73,30 +73,37 @@ Source1042: packaging-20.9-py2.py3-none-any.whl
Source1043: protobuf-3.17.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.whl
Source1044: pyasn1_modules-0.2.8-py2.py3-none-any.whl
Source1045: pyparsing-2.4.7-py2.py3-none-any.whl
Source1046: pyroute2-0.5.19.tar.gz
Source1047: pytz-2021.1-py2.py3-none-any.whl
Source1048: setuptools-56.2.0-py3-none-any.whl
Source1049: uritemplate-3.0.1-py2.py3-none-any.whl
Source1046: pyroute2-0.6.1.tar.gz
Source1047: pyroute2.core-0.6.1.tar.gz
Source1048: pyroute2.ethtool-0.6.1.tar.gz
Source1049: pyroute2.ipdb-0.6.1.tar.gz
Source1050: pyroute2.ipset-0.6.1.tar.gz
Source1051: pyroute2.ndb-0.6.1.tar.gz
Source1052: pyroute2.nftables-0.6.1.tar.gz
Source1053: pyroute2.nslink-0.6.1.tar.gz
Source1054: pytz-2021.1-py2.py3-none-any.whl
Source1055: setuptools-56.2.0-py3-none-any.whl
Source1056: uritemplate-3.0.1-py2.py3-none-any.whl
# openstack
Source1050: debtcollector-2.2.0-py3-none-any.whl
Source1051: iso8601-0.1.14-py2.py3-none-any.whl
Source1052: keystoneauth1-4.3.1-py3-none-any.whl
Source1053: msgpack-1.0.2-cp39-cp39-manylinux1_x86_64.whl
Source1054: netaddr-0.8.0-py2.py3-none-any.whl
Source1055: netifaces-0.10.9.tar.gz
Source1056: oslo.i18n-5.0.1-py3-none-any.whl
Source1057: oslo.serialization-4.1.0-py3-none-any.whl
Source1058: oslo.utils-4.9.0-py3-none-any.whl
Source1059: os_service_types-1.7.0-py2.py3-none-any.whl
Source1060: pbr-5.6.0-py2.py3-none-any.whl
Source1061: prettytable-2.1.0-py3-none-any.whl
Source1062: python_novaclient-17.4.0-py3-none-any.whl
Source1063: stevedore-3.3.0-py3-none-any.whl
Source1064: wcwidth-0.2.5-py2.py3-none-any.whl
Source1065: wrapt-1.12.1.tar.gz
Source1057: debtcollector-2.2.0-py3-none-any.whl
Source1058: iso8601-0.1.14-py2.py3-none-any.whl
Source1059: keystoneauth1-4.3.1-py3-none-any.whl
Source1060: msgpack-1.0.2-cp39-cp39-manylinux1_x86_64.whl
Source1061: netaddr-0.8.0-py2.py3-none-any.whl
Source1062: netifaces-0.10.9.tar.gz
Source1063: oslo.i18n-5.0.1-py3-none-any.whl
Source1064: oslo.serialization-4.1.0-py3-none-any.whl
Source1065: oslo.utils-4.9.0-py3-none-any.whl
Source1066: os_service_types-1.7.0-py2.py3-none-any.whl
Source1067: pbr-5.6.0-py2.py3-none-any.whl
Source1068: prettytable-2.1.0-py3-none-any.whl
Source1069: python_novaclient-17.4.0-py3-none-any.whl
Source1070: stevedore-3.3.0-py3-none-any.whl
Source1071: wcwidth-0.2.5-py2.py3-none-any.whl
Source1072: wrapt-1.12.1.tar.gz
# pexpect
Source1066: pexpect-4.8.0-py2.py3-none-any.whl
Source1067: ptyprocess-0.7.0-py2.py3-none-any.whl
Source1073: pexpect-4.8.0-py2.py3-none-any.whl
Source1074: ptyprocess-0.7.0-py2.py3-none-any.whl
### END ###
Patch0: fence_gce-google-auth-oauthlib-support.patch
@ -206,11 +213,18 @@ sed -i.orig 's|FENCE_ZVM=1|FENCE_ZVM=0|' configure.ac
%build
# support libs
for x in %{_sourcedir}/requirements-*.txt; do
%ifarch x86_64
LIBS="%{_sourcedir}/requirements-*.txt"
%else
LIBS="%{_sourcedir}/requirements-pexpect.txt"
%endif
for x in $LIBS; do
%{__python3} -m pip install --target support/$(echo $x | sed -E "s/.*requirements-(.*).txt/\1/") --no-index --find-links %{_sourcedir} -r $x
done
%ifarch x86_64
sed -i -e "/^import awscli.clidriver/isys.path.insert(0, '/usr/lib/%{name}/support/aws')" support/aws/bin/aws
%endif
if [ -z "$PYTHON " ]; then
PYTHON="%{__python3}"
@ -221,11 +235,9 @@ fi
CFLAGS="$(echo '%{optflags}')" make %{_smp_mflags}
%install
%ifarch x86_64
# support libs
mkdir -p %{buildroot}%{_usr}/lib/%{name}
mv support %{buildroot}%{_usr}/lib/%{name}
%endif
export PYTHONPATH=%{buildroot}%{_usr}/lib/%{name}/support
make install DESTDIR=%{buildroot}

15
sources
View File

@ -11,9 +11,9 @@ SHA512 (cffi-1.14.5-cp39-cp39-manylinux1_x86_64.whl) = 3c73e06bef8e9646beacc584d
SHA512 (cryptography-3.4.7-cp36-abi3-manylinux2014_x86_64.whl) = 6b4eaa52b17065e5723ac2d70f38f05c5a550aea5a50cd4ffac78ec61fa363ac9d1ef29d9c9ca876e69cf9ac681bf6e9941f2027fd6126e472d425d0b5cdf788
SHA512 (jmespath-0.10.0-py2.py3-none-any.whl) = c4ef69cbdac0e6ff8fe1b4a604ebd7abd16e6021cea4b8b6c69917433939a60632462cecf6164a00fd585cb2ca4ddbfb3f871286ab48dd4aa37a11d002612b65
SHA512 (pycparser-2.20-py2.py3-none-any.whl) = 06dc9cefdcde6b97c96d0452a77db42a629c48ee545edd7ab241763e50e3b3c56d21f9fcce4e206817aa1a597763d948a10ccc73572490d739c89eea7fede0a1
SHA512 (awscli-1.19.74-py2.py3-none-any.whl) = 59b618ac0dfa09a838b80d090096e8f4083268c3f9085ec1ab057aaaf4369222bc2600ceade4d83307dd6cee0eddf70986349ca62f9cfd831b746183aabff6dd
SHA512 (boto3-1.17.74.tar.gz) = 11ae1fcb33c0f265ec4fbf54b5e3c97460321a2f93c9a27c5584368376bf222488de4ba5e0757516c18b685786330d757b854fcdb53e049b74e2941d2d717c93
SHA512 (botocore-1.20.74-py2.py3-none-any.whl) = a12a686f7fb589da198cc01580fe4e269dd93092b14c66507b30e3e27797724a53e4612fb6990ff36a251bfe62207eb87d6cbe8b8f66afe72be0e7f7733f0f7a
SHA512 (awscli-1.19.75-py2.py3-none-any.whl) = 4d342f33eba2d4cdf2c35525fc09676b3151c13e23decfc44e13ef9ae481f28a84185732de019b8da6b5cb5ca926bac0b98cf5ed99a267541ca34609c80c213e
SHA512 (boto3-1.17.75-py2.py3-none-any.whl) = cc4917c8ab875ec459691b0395cbccc223738b6845cd079d32c0829c102933cb27906029054fa83bb2214e40784cdcacf126d687d8b00b6f89dcc5d9fc1a98c0
SHA512 (botocore-1.20.75-py2.py3-none-any.whl) = ce12c97598aad0f67c4d184eb4dcd28f2b782ab18d5b5abc081b6c450288fb785a5412dca93db3994756284e4372552facf92551462816f8bc9ae6ad53fd46a8
SHA512 (colorama-0.4.3-py2.py3-none-any.whl) = 7cb2e248fbda31049e23431a921c71d3ecca650011ba25290ce0bfabb616faa0f0185e49deda10a9a358d3b9355392864b51ef764a4020c33d0980af97a33024
SHA512 (docutils-0.15.2-py3-none-any.whl) = d9680d716663c8a64e7d8f7b4709974f780600d025d76d9b74363ed42d4935346f642a820a5c3ee9507b047956bc1304816835d750b65ca1dde8f6e3180e1f5b
SHA512 (pyasn1-0.4.8-py2.py3-none-any.whl) = ab0ccbe261323925ca46a4f4e0e674f730f8b93f6db87b6bf94e26f2e190c3e9afd2ea6ede0d99b100eda282e54c03d87c3357bf3bdfa399469d56a92e2aabbb
@ -51,7 +51,14 @@ SHA512 (packaging-20.9-py2.py3-none-any.whl) = 6a4f69737814acbf43a3d0644d8dbbe44
SHA512 (protobuf-3.17.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.whl) = fa1006fa2dd2b579727f1b12ae4696f20452edf814ca5cb477f9a18cca7924e2cb2989f85d4382af94b1f8174e55be909fd26cfae5499f58e04de92c163cd7d0
SHA512 (pyasn1_modules-0.2.8-py2.py3-none-any.whl) = 8248686f74d000f29c9a5a2dfd14883d44a276286caf7c34c100ea9660e5f644765452fb62c88c534093ea330d5e3d9389fa6398477231e2d1b6331b98861a62
SHA512 (pyparsing-2.4.7-py2.py3-none-any.whl) = acb6b4ff90254d73804621d302926deb69bc99ffde16d7aa16cba7d0af7a53c25b7197d422309d9e82a766704fd7ea4c8b078a48d2e7d8658a8b237266fe24f5
SHA512 (pyroute2-0.5.19.tar.gz) = bd60e2adf59b8438ff4f6abf2d41cf18eb60dcef3072577648488db45ffe89bd9c7207c4eccc38eb9256533ea2950e7f20b82ae4940b1207ba71d0f261e83f6d
SHA512 (pyroute2-0.6.1.tar.gz) = d48b88e62f37eee0a136038c91a5697df94eda481b2f64bb2ff086dd49d3ad0b2bd5726289946be818041595bc912a499dea32d9d1b1f6086102e3fa88b2d84d
SHA512 (pyroute2.core-0.6.1.tar.gz) = 19af5bdbb20030c00a2cb34ccf1e53e08cea531ba95c1ac9a21a1775260e63d24c9376381804e02aea79f67ebc8a87462a176f44be248c149ef122cdc1496816
SHA512 (pyroute2.ethtool-0.6.1.tar.gz) = 5162f23cbbd0d297edf05245636c3e625a532263319b11f756813b9bcd497696282e996f674b568081de8541d95776739119f4bda80b2030c9883ec43d74a71f
SHA512 (pyroute2.ipdb-0.6.1.tar.gz) = 1a7d7701b591fabf028996ca0f622ec92efcd0c320de7dd71d82ee6b33f69ca3e444d4f35257b5779349c4d8178ec4deb64ec01e9543870c13cc424b8531ba55
SHA512 (pyroute2.ipset-0.6.1.tar.gz) = 472fa6b9e265977823c5726bd14822231838c89ae488c3c49c0df223aee47d652c10375a7488640d13e3c45a19324a1b35aca7e5abf00dc4eaf048af6cc3a953
SHA512 (pyroute2.ndb-0.6.1.tar.gz) = 9bcc73fc5636edfec8c9569c44330e89d4a7b018b736fe7c6fd4a64d5613fe6ef2e2364e652f21b586bc211e04d1d56b3e18dd21384d1ae6773df0a2138af9a5
SHA512 (pyroute2.nftables-0.6.1.tar.gz) = 9fcbe9ecc7246a04c72445294446dc7fd9b33fad53f189fe2c52f4d1a834eb5861cbbb058e7873fe46c23654833f30fc8f0d6f3c51cbe2bd36c6c4de87bac9d5
SHA512 (pyroute2.nslink-0.6.1.tar.gz) = 1962f01160b5bbbce01e98fbeaf06ffa58bbf64d568c0d1b407a34e3c9e1436940a60634d0a0371165cc501f91d909daadf81e3df73b5fc61c538c8761fac726
SHA512 (pytz-2021.1-py2.py3-none-any.whl) = 7ef08f53204664d6426bcb77e6f74bad8263d0f96128254aa41a752eaa9a0d1c9dac64134f5fd40c36a7385cfb453ec95ae7f714ba88993de000c34c32835619
SHA512 (setuptools-56.2.0-py3-none-any.whl) = 2cfb556b9281243887abcd2834263f30eccbf96631363e215e91a2630718e1878980ff1bf7ce17b8f34fef2b10270082b090b80326a179f303be81951de231cd
SHA512 (uritemplate-3.0.1-py2.py3-none-any.whl) = 0d4cfc2eb14b73f17ef9d82a08d9bc7fbc8a1efd1e51693e20c51c01812e7597ebe964904f79fd86e21d06bd690abfdf9bd2824e8f957dd8a9486e3b860d58d0

2
update-ha-cloud.sh
View File

@ -18,7 +18,7 @@ if ! git diff --quiet sources; then
cat << EOF
Upload new sources by running:
awk '/^[^#]/{gsub("[()]", "", \$2); printf "%s ", \$2}' sources | xargs rhpkg new-sources
awk '/^[^#]/{gsub("[()]", "", \$2); printf "%s ", \$2}' sources | xargs centpkg new-sources
EOF
fi