[arch-commits] Commit in ceph/trunk (5 files)
Thore Bödecker
foxxx0 at archlinux.org
Sat Jan 4 15:42:00 UTC 2020
Date: Saturday, January 4, 2020 @ 15:42:00
Author: foxxx0
Revision: 547995
upgpkg: ceph 14.2.5-1
fixes FS#64235 and FS#64041
Added:
ceph/trunk/disable-broken-mgr-dashboard-test.patch
ceph/trunk/exclude-frontend-from-mgr-dashboard-cov.patch
Modified:
ceph/trunk/PKGBUILD
ceph/trunk/suppress-pylint-warnings.patch
Deleted:
ceph/trunk/fix-or-disable-broken-tests.patch
-----------------------------------------------+
PKGBUILD | 26 +-
disable-broken-mgr-dashboard-test.patch | 13 +
exclude-frontend-from-mgr-dashboard-cov.patch | 11 +
fix-or-disable-broken-tests.patch | 260 ------------------------
suppress-pylint-warnings.patch | 22 +-
5 files changed, 51 insertions(+), 281 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2020-01-04 15:41:40 UTC (rev 547994)
+++ PKGBUILD 2020-01-04 15:42:00 UTC (rev 547995)
@@ -3,9 +3,9 @@
pkgbase='ceph'
pkgname=('ceph' 'ceph-libs' 'ceph-mgr')
-_zstdver=1.4.3
-pkgver=14.2.1
-pkgrel=3
+_zstdver=1.4.4
+pkgver=14.2.5
+pkgrel=1
pkgdesc='Distributed, fault-tolerant storage platform delivering object, block, and file system'
arch=('x86_64')
url='https://ceph.com/'
@@ -25,6 +25,9 @@
'python-google-api-python-client' 'python-google-auth'
'python-google-auth-httplib2' 'python-grpcio' 'python-isort'
'python-jinja' 'python-lazy-object-proxy' 'python-mccabe'
+
+ 'python-isodate' 'python-defusedxml' 'python-pkgconfig' 'python-lxml' 'python-xmlsec'
+
'python-more-itertools' 'python-numpy' 'python-pbr' 'python-pecan'
'python-pip' 'python-pluggy' 'python-portend' 'python-prettytable'
'python-prometheus_client' 'python-py' 'python-pycparser'
@@ -33,7 +36,7 @@
'python-setuptools' 'python-six' 'python-sphinx' 'python-tempora'
'python-virtualenv' 'python-werkzeug' 'python-wrapt' 'rabbitmq'
'sed' 'snappy' 'socat' 'systemd' 'systemd-libs' 'valgrind'
- 'xfsprogs' 'xmlstarlet' 'xxhash' 'yasm' 'zlib')
+ 'xfsprogs' 'xmlstarlet' 'xxhash' 'yasm' 'zlib' )
checkdepends=('python-mock' 'python-nose' 'python-pycodestyle' 'python-pylint'
'python-pytest' 'python-pytest-cov')
options=('emptydirs')
@@ -40,21 +43,21 @@
source=("https://download.ceph.com/tarballs/${pkgbase}-${pkgver}.tar.gz"
'ceph.sysusers'
'remove-distro-version-detection.patch'
- 'fix-tox-test-commands.patch'
'disable-empty-readable.sh-test.patch'
'use-threadsafe-death-tests-objectstore-memstore.patch'
'use-system-zstd-and-fix-zstd-1.4.0-compatbility.patch'
'suppress-pylint-warnings.patch'
+ 'disable-broken-mgr-dashboard-test.patch'
"zstd-${_zstdver}.tar.gz::https://github.com/facebook/zstd/archive/v${_zstdver}.tar.gz")
-sha512sums=('fccde341344c721fbfc7f7cb73db4f65933d7fcacc9495398b55b37d1e208f0bad0cd78a4da08a3b5e26cca3175e7707f7dfb76fae5aa094f58afaed8603c866'
+sha512sums=('38da62a38960d3618e2689f0e882785d4d95358b4a3b3b5b83e54e227cff9e69f4cca0b63d2d55d69e3916055818e6cf9067f2c2eddeb221ef4bc64a13cfa22b'
'4354001c1abd9a0c385ba7bd529e3638fb6660b6a88d4e49706d4ac21c81b8e829303a20fb5445730bdac18c4865efb10bc809c1cd56d743c12aa9a52e160049'
'02c9e8fd3c23fb4c9c4c576ee6d06e8525ca31decfd964fb7231e73c98fe2987a483dda680969752186f0918f47d9af4fb09a4901e5319077f45d870906716da'
- 'e0a890c358674902db2db3c484a4d19260e2463f1b5bb641605aae0a068027327c7153e267ef344dda190affc495f3661f29b576997691431bb4bae52573aa69'
'2234d005df71b3b6013e6b76ad07a5791e3af7efec5f41c78eb1a9c92a22a67f0be9560be59b52534e90bfe251bcf32c33d5d40163f3f8f7e7420691f0f4a222'
'a74aea7c0b0d1883c874f889c184bd2c766fa578d6ca0cbe5eaada840281bb947b3d80f142b30473058cd2652d2967d241ade6914d6be50e93e91728a31733c8'
'4345fc2f422c7c1910bfd4068ad39511fa63d8c1e4fc04af416bb0f3869e43327d4a4bfc980d5abf273693a532ac153ed1e4c03e033a127692c1254b99092b8a'
- '27ec7cc9479426446857f458261f7fd3b303b32234edea1b86c4115214a320ec3e895bdc9231700b44c55d49d5b68d74e36fe1154907eb7e5d91bb9abc0437ac'
- 'ccda90c7437635f92d0db39dfba3604e256f1f08284c35c042763a54b0ead45dca8e7fa3e5cf8032292d1dd9eefc1369e23f78a80d9335d69170563090677d5f')
+ '4afd5c3b49a839531921e80b1204ef5b496531a31b3de13042bfcbb548d736851ef7698e41bc94a9bed356e7c2cab6bf30bc711796249cf10ee791974033c29b'
+ '63a92990f979dadb3c23e04e559d95d52cdb3f79115406900ccae67d3f8b1d0658f05431142365eba6ffb7706f9751209f702b69d6ffcd815716ffaf74ebae54'
+ '8209837e8eb14e474dfe21d5511085f46cef93b03ab77613fd41e7b8be652418231c38852669c8e0b55b78ad41ea2cb8008d0da122a83f8f27e32b5c86f045cf')
# -fno-plt causes linker errors (undefined reference to internal methods)
@@ -118,7 +121,7 @@
-DCMAKE_BUILD_TYPE=RelWithDebInf \
-DENABLE_GIT_VERSION=ON \
-DWITH_PYTHON2=OFF \
- -DWITH_PYTHON3=ON \
+ -DWITH_PYTHON3=3 \
-DMGR_PYTHON_VERSION=3 \
-DPYTHON_INCLUDE_DIR="${PYTHON_INCLUDE_DIR:?}" \
-DWITH_BABELTRACE=OFF \
@@ -254,7 +257,8 @@
depends=("ceph=${pkgver}-${pkgrel}" "ceph-libs=${pkgver}-${pkgrel}"
'bash' 'boost-libs' 'coffeescript' 'curl' 'gperftools' 'nodejs' 'nss'
'python' 'python-cherrypy' 'python-flask-restful' 'python-pecan'
- 'python-pyjwt' 'python-routes' 'python-requests' 'python-pyopenssl')
+ 'python-pyjwt' 'python-routes' 'python-requests' 'python-pyopenssl'
+ 'python-prettytable')
optdepends=('python-influxdb: influx module'
'python-kubernetes: rook module'
'python-prometheus_client: prometheus module'
Added: disable-broken-mgr-dashboard-test.patch
===================================================================
--- disable-broken-mgr-dashboard-test.patch (rev 0)
+++ disable-broken-mgr-dashboard-test.patch 2020-01-04 15:42:00 UTC (rev 547995)
@@ -0,0 +1,13 @@
+--- a/src/test/CMakeLists.txt 2019-12-06 17:42:34.000000000 +0100
++++ b/src/test/CMakeLists.txt 2020-01-04 09:55:50.703888545 +0100
+@@ -555,8 +555,8 @@ set(env_vars_for_tox_tests
+ WITH_PYTHON3=${WITH_PYTHON3})
+
+ if(WITH_MGR)
+- add_test(NAME run-tox-mgr-dashboard COMMAND bash ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/run-tox.sh)
+- list(APPEND tox_tests run-tox-mgr-dashboard)
++ # add_test(NAME run-tox-mgr-dashboard COMMAND bash ${CMAKE_SOURCE_DIR}/src/pybind/mgr/dashboard/run-tox.sh)
++ # list(APPEND tox_tests run-tox-mgr-dashboard)
+ set(MGR_DASHBOARD_VIRTUALENV ${CEPH_BUILD_VIRTUALENV}/mgr-dashboard-virtualenv)
+ list(APPEND env_vars_for_tox_tests MGR_DASHBOARD_VIRTUALENV=${MGR_DASHBOARD_VIRTUALENV})
+
Added: exclude-frontend-from-mgr-dashboard-cov.patch
===================================================================
--- exclude-frontend-from-mgr-dashboard-cov.patch (rev 0)
+++ exclude-frontend-from-mgr-dashboard-cov.patch 2020-01-04 15:42:00 UTC (rev 547995)
@@ -0,0 +1,11 @@
+--- a/src/pybind/mgr/dashboard/tox.ini 2019-12-06 17:42:34.000000000 +0100
++++ c/src/pybind/mgr/dashboard/tox.ini 2020-01-03 15:25:30.074706391 +0100
+@@ -20,7 +20,7 @@ commands=
+ py27: pip install -r {toxinidir}/requirements-py27.txt
+ py3: pip install -r {toxinidir}/requirements-py3.txt
+ cov: coverage erase
+- cov: {envbindir}/py.test --cov=. --cov-report= --junitxml=junit.{envname}.xml --doctest-modules controllers services/ tests/ tools.py
++ cov: {envbindir}/py.test --cov=. --cov-report= --junitxml=junit.{envname}.xml --ignore=frontend/ --doctest-modules controllers services/ tests/ tools.py
+ cov: coverage combine {toxinidir}/{env:COVERAGE_FILE}
+ cov: coverage report
+ cov: coverage xml
Deleted: fix-or-disable-broken-tests.patch
===================================================================
--- fix-or-disable-broken-tests.patch 2020-01-04 15:41:40 UTC (rev 547994)
+++ fix-or-disable-broken-tests.patch 2020-01-04 15:42:00 UTC (rev 547995)
@@ -1,260 +0,0 @@
---- a/src/test/CMakeLists.txt 2018-05-29 14:04:02.000000000 +0200
-+++ b/src/test/CMakeLists.txt 2018-06-04 13:35:28.440465053 +0200
-@@ -572,7 +572,6 @@ add_ceph_test(test_objectstore_memstore.
- #add_ceph_test(test_pidfile.sh ${CMAKE_CURRENT_SOURCE_DIR}/test_pidfile.sh)
-
- add_ceph_test(test_subman.sh ${CMAKE_CURRENT_SOURCE_DIR}/test_subman.sh)
--add_ceph_test(smoke.sh ${CMAKE_CURRENT_SOURCE_DIR}/smoke.sh)
- add_ceph_test(unittest_bufferlist.sh ${CMAKE_SOURCE_DIR}/src/unittest_bufferlist.sh)
-
- add_test(NAME run-tox-ceph-disk COMMAND bash ${CMAKE_SOURCE_DIR}/src/ceph-disk/run-tox.sh)
---- a/src/test/common/CMakeLists.txt 2018-05-29 14:04:02.000000000 +0200
-+++ b/src/test/common/CMakeLists.txt 2018-06-04 13:36:33.340014839 +0200
-@@ -41,13 +41,6 @@ add_executable(unittest_prioritized_queu
- )
- add_ceph_unittest(unittest_prioritized_queue)
-
--# unittest_mclock_priority_queue
--add_executable(unittest_mclock_priority_queue
-- test_mclock_priority_queue.cc
-- )
--add_ceph_unittest(unittest_mclock_priority_queue)
--target_link_libraries(unittest_mclock_priority_queue ceph-common dmclock)
--
- # unittest_str_map
- add_executable(unittest_str_map
- test_str_map.cc
---- a/src/test/encoding/CMakeLists.txt 2018-05-29 14:04:02.000000000 +0200
-+++ b/src/test/encoding/CMakeLists.txt 2018-06-04 13:37:22.693006351 +0200
-@@ -1,4 +1,3 @@
- # scripts
--add_ceph_test(check-generated.sh ${CMAKE_CURRENT_SOURCE_DIR}/check-generated.sh)
- add_ceph_test(readable.sh ${CMAKE_CURRENT_SOURCE_DIR}/readable.sh)
-
---- a/src/test/run-cli-tests 2018-05-29 14:04:02.000000000 +0200
-+++ b/src/test/run-cli-tests 2018-06-04 13:38:12.529328276 +0200
-@@ -1,7 +1,7 @@
- #!/bin/sh
- set -e
-
--if ! command -v virtualenv >/dev/null; then
-+if ! command -v virtualenv2 >/dev/null; then
- echo "$0: virtualenv not installed, skipping python-using tests." 1>&2
- exit 1
- fi
-@@ -30,7 +30,7 @@ if [ ! -e "$CRAM_BIN" ]; then
- # patched cram to support that. See upstream ticket at
- # https://bitbucket.org/brodie/cram/issue/9/allow-read-only-directories-for-t
- # -- tv at inktank.com
-- virtualenv "$VENV" && $VENV/bin/pip --log "$VENV"/log.txt install "$SRCDIR/downloads/cram-0.5.0ceph.2011-01-14.tar.gz"
-+ virtualenv2 "$VENV" && $VENV/bin/pip --log "$VENV"/log.txt install "$SRCDIR/downloads/cram-0.5.0ceph.2011-01-14.tar.gz"
- fi
-
- SRCDIR_ABS="$(readlink -f "$SRCDIR")"
---- a/src/test/pybind/test_ceph_argparse.py 2017-09-26 18:27:07.000000000 +0200
-+++ b/src/test/pybind/test_ceph_argparse.py 2017-10-08 16:50:49.060831801 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env nosetests
-+#!/usr/bin/env nosetests2
- # -*- mode:python; tab-width:4; indent-tabs-mode:t; coding:utf-8 -*-
- # vim: ts=4 sw=4 smarttab expandtab fileencoding=utf-8
- #
---- a/src/test/pybind/test_ceph_daemon.py 2017-09-26 18:27:07.000000000 +0200
-+++ b/src/test/pybind/test_ceph_daemon.py 2017-10-08 16:50:58.341131927 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/env nosetests
-+#!/usr/bin/env nosetests2
- # -*- mode:python; tab-width:4; indent-tabs-mode:t -*-
- # vim: ts=4 sw=4 smarttab expandtab
- #
---- a/qa/standalone/ceph-helpers.sh 2018-05-29 14:04:02.000000000 +0200
-+++ b/qa/standalone/ceph-helpers.sh 2018-06-04 13:39:31.305450795 +0200
-@@ -147,7 +147,7 @@ function teardown() {
- kill_daemons $dir KILL
- if [ `uname` != FreeBSD ] \
- && [ $(stat -f -c '%T' .) == "btrfs" ]; then
-- __teardown_btrfs $dir
-+ true
- fi
- local cores="no"
- local pattern="$(sysctl -n $KERNCORE)"
-@@ -183,12 +183,7 @@ function teardown() {
- }
-
- function __teardown_btrfs() {
-- local btrfs_base_dir=$1
-- local btrfs_root=$(df -P . | tail -1 | awk '{print $NF}')
-- local btrfs_dirs=$(cd $btrfs_base_dir; sudo btrfs subvolume list -t . | awk '/^[0-9]/ {print $4}' | grep "$btrfs_base_dir/$btrfs_dir")
-- for subvolume in $btrfs_dirs; do
-- sudo btrfs subvolume delete $btrfs_root/$subvolume
-- done
-+ true
- }
-
- function test_teardown() {
---- a/src/ceph-disk/run-tox.sh 2018-05-29 14:04:02.000000000 +0200
-+++ b/src/ceph-disk/run-tox.sh 2018-06-04 13:40:15.601811858 +0200
-@@ -30,4 +30,4 @@ if [ -z $CEPH_BUILD_DIR ]; then
- fi
-
- source ${CEPH_DISK_VIRTUALENV}/bin/activate
--tox -c ${TOX_PATH}
-+tox2 -c ${TOX_PATH}
---- a/qa/workunits/rbd/run_devstack_tempest.sh 2017-09-26 18:27:07.000000000 +0200
-+++ b/qa/workunits/rbd/run_devstack_tempest.sh 2017-10-10 18:53:33.564468674 +0200
-@@ -127,4 +127,4 @@
- chmod -R o+rx ${STACK_OPT_PATH}/devstack/files
-
- cd ${STACK_OPT_PATH}/tempest
--sudo -H -u ${TEMPEST_USER} tox -eall-plugin -- '(?!.*\[.*\bslow\b.*\])(^tempest\.(api|scenario)|(^cinder\.tests.tempest))' --concurrency=3
-+sudo -H -u ${TEMPEST_USER} tox2 -eall-plugin -- '(?!.*\[.*\bslow\b.*\])(^tempest\.(api|scenario)|(^cinder\.tests.tempest))' --concurrency=3
---- a/src/test/filestore/TestFileStore.cc 2017-09-26 18:27:07.000000000 +0200
-+++ b/src/test/filestore/TestFileStore.cc 2017-10-10 20:31:36.325983555 +0200
-@@ -36,13 +36,6 @@
- ASSERT_EQ(pm["filestore_backend"], "generic");
- }
- #if defined(__linux__)
-- {
-- map<string,string> pm;
-- FileStore fs(g_ceph_context, "a", "b");
-- TestFileStore::create_backend(fs, BTRFS_SUPER_MAGIC);
-- fs.collect_metadata(&pm);
-- ASSERT_EQ(pm["filestore_backend"], "btrfs");
-- }
- # ifdef HAVE_LIBXFS
- {
- map<string,string> pm;
---- a/src/test/cli/osdmaptool/ceph.conf.withracks 2017-09-26 18:27:07.000000000 +0200
-+++ b/src/test/cli/osdmaptool/ceph.conf.withracks 2017-10-10 21:30:49.230389707 +0200
-@@ -42,8 +42,8 @@
- keyring = /mnt/osd.$id/keyring
- osd data = /mnt/osd.$id
- osd journal = /dev/disk/by-label/osd.$id.journal
-- osd mkfs type = btrfs
-- osd mount options btrfs = rw,noatime
-+ osd mkfs type = xfs
-+ osd mount options xfs = rw,noatime
- devs = /dev/disk/by-label/osd.$id.data
- ; temp sage
- debug osd = 20
---- a/src/spdk/test/iscsi_tgt/filesystem/filesystem.sh 2017-04-13 06:05:24.000000000 +0200
-+++ b/src/spdk/test/iscsi_tgt/filesystem/filesystem.sh 2017-10-10 21:33:09.084930640 +0200
-@@ -55,7 +55,7 @@
- parted -s /dev/$dev mkpart primary '0%' '100%'
- sleep 1
-
--for fstype in "ext4" "btrfs" "xfs"; do
-+for fstype in "ext4" "xfs"; do
-
- if [ "$fstype" == "ext4" ]; then
- mkfs.${fstype} -F /dev/${dev}1
---- a/src/spdk/test/nvmf/filesystem/filesystem.sh 2017-04-13 06:05:24.000000000 +0200
-+++ b/src/spdk/test/nvmf/filesystem/filesystem.sh 2017-10-10 21:33:26.258820759 +0200
-@@ -49,7 +49,7 @@
- timing_exit parted
- sleep 1
-
-- for fstype in "ext4" "btrfs" "xfs"; do
-+ for fstype in "ext4" "xfs"; do
- timing_enter $fstype
- if [ $fstype = ext4 ]; then
- force=-F
---- a/src/ceph.conf.twoosds 2017-09-26 18:27:07.000000000 +0200
-+++ b/src/ceph.conf.twoosds 2017-10-10 21:34:13.160340506 +0200
-@@ -72,8 +72,8 @@
- ; osd journal = /mnt/osd$id/journal
- ; osd journal size = 1000
- osd journal = "/dev/disk/by-path/pci-0000:05:02.0-scsi-6:0:0:0"
-- osd mkfs type = btrfs
-- osd mount options btrfs = "flushoncommit,usertrans"
-+ osd mkfs type = xfs
-+ osd mount options xfs = "flushoncommit,usertrans"
- ; filestore max sync interval = 1
-
- devs = "/dev/disk/by-path/pci-0000:05:01.0-scsi-2:0:0:0"
---- a/src/ceph-disk/tests/ceph-disk.sh 2017-09-26 18:27:07.000000000 +0200
-+++ b/src/ceph-disk/tests/ceph-disk.sh 2017-10-10 21:35:26.386044372 +0200
-@@ -74,8 +74,7 @@
- kill_daemons $dir
- if [ `uname` != FreeBSD ] && \
- [ $(stat -f -c '%T' .) == "btrfs" ]; then
-- rm -fr $dir/*/*db
-- __teardown_btrfs $dir
-+ true
- fi
- grep " $(pwd)/$dir/" < ${PROCDIR}/proc/mounts | while read mounted rest ; do
- umount $mounted
---- a/qa/run_xfstests.sh 2017-09-26 18:27:07.000000000 +0200
-+++ b/qa/run_xfstests.sh 2017-10-10 22:18:49.663141392 +0200
-@@ -81,7 +81,7 @@
- arg_count 1 $#
-
- case "$1" in
-- xfs|ext4|btrfs) return 0 ;;
-+ xfs|ext4) return 0 ;;
- *) return 1 ;;
- esac
- }
-@@ -120,7 +120,7 @@
- echo " -c or --count" >&2
- echo " iteration count (1 or more)" >&2
- echo " -f or --fs-type" >&2
-- echo " one of: xfs, ext4, btrfs" >&2
-+ echo " one of: xfs, ext4" >&2
- echo " (default fs-type: xfs)" >&2
- echo " -r or --randomize" >&2
- echo " randomize test order" >&2
-@@ -132,7 +132,7 @@
- echo " name of file with list of tests to skip" >&2
- echo " tests:" >&2
- echo " list of test numbers, e.g.:" >&2
-- echo " generic/001 xfs/008 shared/032 btrfs/009" >&2
-+ echo " generic/001 xfs/008 shared/032" >&2
- echo " or possibly an xfstests test group, e.g.:" >&2
- echo " -g quick" >&2
- echo " (default tests: -g auto)" >&2
-@@ -235,7 +235,6 @@
- case "${FSTYP}" in
- xfs) options="-f" ;;
- ext4) options="-F" ;;
-- btrfs) options="-f" ;;
- esac
-
- "mkfs.${FSTYP}" ${options} "${dev}" ||
---- a/qa/run_xfstests-obsolete.sh 2017-09-26 18:27:07.000000000 +0200
-+++ b/qa/run_xfstests-obsolete.sh 2017-10-10 22:19:27.027675395 +0200
-@@ -125,7 +125,7 @@
- arg_count 1 $#
-
- case "$1" in
-- xfs|ext4|btrfs) return 0 ;;
-+ xfs|ext4) return 0 ;;
- *) return 1 ;;
- esac
- }
-@@ -157,7 +157,7 @@
- echo " -c or --count" >&2
- echo " iteration count (1 or more)" >&2
- echo " -f or --fs-type" >&2
-- echo " one of: xfs, ext4, btrfs" >&2
-+ echo " one of: xfs, ext4" >&2
- echo " (default fs-type: xfs)" >&2
- echo " -s or --scratch-dev (REQUIRED)" >&2
- echo " name of device used for scratch filesystem" >&2
-@@ -262,7 +262,7 @@
- # Filesystem-specific mkfs options--set if not supplied
- export XFS_MKFS_OPTIONS="${XFS_MKFS_OPTIONS:--f -l su=65536}"
- export EXT4_MKFS_OPTIONS="${EXT4_MKFS_OPTIONS:--F}"
--export BTRFS_MKFS_OPTION # No defaults
-+unset BTRFS_MKFS_OPTION # No defaults
-
- XFSTESTS_DIR="/var/lib/xfstests" # Where the tests live
-
-@@ -348,7 +348,6 @@
- case "${FSTYP}" in
- xfs) options="${XFS_MKFS_OPTIONS}" ;;
- ext4) options="${EXT4_MKFS_OPTIONS}" ;;
-- btrfs) options="${BTRFS_MKFS_OPTIONS}" ;;
- esac
-
- "mkfs.${FSTYP}" ${options} "${dev}" ||
Modified: suppress-pylint-warnings.patch
===================================================================
--- suppress-pylint-warnings.patch 2020-01-04 15:41:40 UTC (rev 547994)
+++ suppress-pylint-warnings.patch 2020-01-04 15:42:00 UTC (rev 547995)
@@ -1,21 +1,23 @@
---- a/src/pybind/mgr/dashboard/.pylintrc 2019-04-25 20:15:48.000000000 +0200
-+++ b/src/pybind/mgr/dashboard/.pylintrc 2019-07-14 18:22:09.881166099 +0200
-@@ -119,7 +119,8 @@ disable=import-star-module-level,
+--- a/src/pybind/mgr/dashboard/.pylintrc 2019-12-06 17:42:34.000000000 +0100
++++ b/src/pybind/mgr/dashboard/.pylintrc 2020-01-03 13:55:54.511393504 +0100
+@@ -119,7 +119,11 @@ disable=import-star-module-level,
too-many-arguments,
too-many-locals,
too-many-statements,
- useless-object-inheritance
+ useless-object-inheritance,
-+ no-else-raise
++ no-else-raise,
++ multiple-statements,
++ unused-argument,
++ protected-access
# Enable the message, report, category or checker with the given id(s). You can
---- a/src/pybind/mgr/dashboard/tests/__init__.py 2019-04-25 20:15:48.000000000 +0200
-+++ b/src/pybind/mgr/dashboard/tests/__init__.py 2019-07-15 11:28:10.443476232 +0200
-@@ -1,5 +1,5 @@
+--- a/src/pybind/mgr/dashboard/services/rgw_client.py 2019-12-06 17:42:34.000000000 +0100
++++ b/src/pybind/mgr/dashboard/services/rgw_client.py 2020-01-03 15:13:15.266131061 +0100
+@@ -1,4 +1,5 @@
# -*- coding: utf-8 -*-
--# pylint: disable=too-many-arguments
-+# pylint: disable=too-many-arguments,no-else-return
++# pylint: disable=unused-argument
from __future__ import absolute_import
- import json
+ import re
More information about the arch-commits
mailing list