yudaike/openSUSE-release-tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Require newly released osc for python3 fixes

Browse Source
This commit is contained in:
Stephan Kulow 2019-05-21 07:17:04 +02:00
parent 5ac61a01c8
commit 4a0df7a257
3 changed files with 11 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dist/ci/testenv-tumbleweed/Dockerfile vendored
View File

@ -1,6 +1,10 @@
#!BuildTag: osrt_testenv_tumbleweed
FROM opensuse/tumbleweed
# make sure we see osc regressions earlier than it hitting tumbleweed
RUN zypper -n ar https://download.opensuse.org/repositories/openSUSE:/Tools/openSUSE_Factory/ openSUSE:Tools
RUN zypper --gpg-auto-import-keys ref
RUN useradd tester -d /code/tests/home
RUN zypper in -y osc python3-nose python3-httpretty python3-pyxdg python3-PyYAML \
@ -8,9 +12,6 @@ RUN zypper in -y osc python3-nose python3-httpretty python3-pyxdg python3-PyYAML
python3-influxdb python3-coverage python3-coveralls libxml2-tools curl python3-flake8 \
vim vim-data strace git sudo patch openSUSE-release openSUSE-release-ftp
COPY osc-hotpatch.diff /tmp
RUN patch /usr/lib/python3.7/site-packages/osc/core.py /tmp/osc-hotpatch.diff
COPY run_as_tester /usr/bin
# OBS does not know about executable files, so we need to tweak it manually
RUN chmod a+x /usr/bin/run_as_tester

11
dist/ci/testenv-tumbleweed/osc-hotpatch.diff vendored
View File

@ -1,11 +0,0 @@
--- /usr/lib/python3.6/site-packages/osc/core.py.bak 2019-05-02 18:14:01.088380882 +0000
+++ /usr/lib/python3.6/site-packages/osc/core.py 2019-05-02 18:14:19.204341426 +0000
@@ -6318,7 +6318,7 @@
try:
comment = node.find('comment').text.encode(locale.getpreferredencoding(), 'replace')
except:
- comment = b'<no message>'
+ comment = '<no message>'
try:
requestid = node.find('requestid').text.encode(locale.getpreferredencoding(), 'replace')
except:

14
dist/package/openSUSE-release-tools.spec vendored
View File

@ -39,8 +39,8 @@ Group: Development/Tools/Other
Url: https://github.com/openSUSE/openSUSE-release-tools
Source: %{name}-%{version}.tar.xz
BuildArch: noarch
# Requires sr#512849 which provides osc_plugin_dir.
BuildRequires: osc >= 0.159.0
# Requires sr#704176
BuildRequires: osc >= 0.165.1
BuildRequires: %{use_python}-PyYAML
BuildRequires: %{use_python}-cmdln
BuildRequires: %{use_python}-colorama
@ -276,7 +276,7 @@ Group: Development/Tools/Other
BuildArch: noarch
# TODO Update requirements, but for now base deps.
Requires: %{name} = %{version}
Requires: osc >= 0.159.0
Requires: osc >= 0.165.1
%description -n osclib
Supplemental osc libraries utilized by release tools.
@ -285,7 +285,7 @@ Supplemental osc libraries utilized by release tools.
Summary: OSC plugin to check for duplicate requests
Group: Development/Tools/Other
BuildArch: noarch
Requires: osc >= 0.159.0
Requires: osc >= 0.165.1
Requires: osclib = %{version}
%description -n osc-plugin-check_dups
@ -295,7 +295,7 @@ OSC plugin to check for duplicate requests, see `osc check_dups --help`.
Summary: OSC plugin for cycle visualization
Group: Development/Tools/Other
BuildArch: noarch
Requires: osc >= 0.159.0
Requires: osc >= 0.165.1
Requires: osclib = %{version}
%description -n osc-plugin-cycle
@ -305,7 +305,7 @@ OSC plugin for cycle visualization, see `osc cycle --help`.
Summary: OSC plugin for origin management
Group: Development/Tools/Other
BuildArch: noarch
Requires: osc >= 0.159.0
Requires: osc >= 0.165.1
Requires: osclib = %{version}
%description -n osc-plugin-origin
@ -326,7 +326,7 @@ OSC plugin for the staging workflow, see `osc staging --help`.
Summary: OSC plugin to check for virtually accepted request
Group: Development/Tools/Other
BuildArch: noarch
Requires: osc >= 0.159.0
Requires: osc >= 0.165.1
Requires: osclib = %{version}
%description -n osc-plugin-vdelreq