From 3a79fdde9f372d39de88ef4fe5eaf4277f29fcfb Mon Sep 17 00:00:00 2001 From: Ernestas Kulik Date: Mon, 13 Jan 2020 09:04:38 +0100 Subject: [PATCH] Move to python-blessed As python-blessings is unmaintained nowadays and is not packaged for EPEL 8, it might be good to move to an active fork. Related: https://bugzilla.redhat.com/show_bug.cgi?id=1777377 --- hacking/titotest-centos-6/Dockerfile | 2 +- hacking/titotest-centos-7/Dockerfile | 2 +- hacking/titotest-fedora-27/Dockerfile | 4 ++-- hacking/titotest-fedora-rawhide/Dockerfile | 3 +-- requirements.txt | 2 +- setup.py | 2 +- src/tito/common.py | 2 +- test/unit/common_tests.py | 2 +- tito.spec | 4 ++-- 9 files changed, 11 insertions(+), 12 deletions(-) diff --git a/hacking/titotest-centos-6/Dockerfile b/hacking/titotest-centos-6/Dockerfile index 1117909..cb5b972 100644 --- a/hacking/titotest-centos-6/Dockerfile +++ b/hacking/titotest-centos-6/Dockerfile @@ -25,7 +25,7 @@ RUN yum -y install \ docbook-style-xsl \ libxslt \ rpmdevtools \ - python-blessings \ + python-blessed \ ; yum clean all RUN useradd sandbox diff --git a/hacking/titotest-centos-7/Dockerfile b/hacking/titotest-centos-7/Dockerfile index a837dc0..f9fe904 100644 --- a/hacking/titotest-centos-7/Dockerfile +++ b/hacking/titotest-centos-7/Dockerfile @@ -18,7 +18,7 @@ RUN yum -y install \ docbook-style-xsl \ libxslt \ rpmdevtools \ - python-blessings \ + python-blessed \ && yum clean all RUN useradd sandbox diff --git a/hacking/titotest-fedora-27/Dockerfile b/hacking/titotest-fedora-27/Dockerfile index 4aa5c68..630fd88 100644 --- a/hacking/titotest-fedora-27/Dockerfile +++ b/hacking/titotest-fedora-27/Dockerfile @@ -8,14 +8,14 @@ RUN dnf -y install \ python2-devel \ python-mock \ python-nose \ - python-blessings \ + python-blessed \ python-pep8 \ python-setuptools \ python-bugzilla \ python2-rpm \ python3-mock \ python3-nose \ - python3-blessings \ + python3-blessed \ python3-pep8 \ rsync \ createrepo_c diff --git a/hacking/titotest-fedora-rawhide/Dockerfile b/hacking/titotest-fedora-rawhide/Dockerfile index 3dc3126..703194b 100644 --- a/hacking/titotest-fedora-rawhide/Dockerfile +++ b/hacking/titotest-fedora-rawhide/Dockerfile @@ -14,14 +14,13 @@ RUN dnf -y install \ python2-devel \ python-mock \ python-nose \ - python-blessings \ python-pep8 \ python-setuptools \ python-bugzilla \ python2-rpm \ python3-mock \ python3-nose \ - python3-blessings \ + python3-blessed \ python3-pep8 \ rsync \ createrepo_c diff --git a/requirements.txt b/requirements.txt index 57087d0..d43de1b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1 @@ -blessings +blessed diff --git a/setup.py b/setup.py index b63cad4..f616b0a 100755 --- a/setup.py +++ b/setup.py @@ -34,7 +34,7 @@ setup( packages=find_packages('src'), include_package_data=True, install_requires=[ - 'blessings' + 'blessed' ], # non-python scripts go here diff --git a/src/tito/common.py b/src/tito/common.py index e61060b..13ec5e7 100644 --- a/src/tito/common.py +++ b/src/tito/common.py @@ -28,7 +28,7 @@ import shlex import shutil import tempfile -from blessings import Terminal +from blessed import Terminal from bugzilla.rhbugzilla import RHBugzilla diff --git a/test/unit/common_tests.py b/test/unit/common_tests.py index c2fc116..ca4f38c 100644 --- a/test/unit/common_tests.py +++ b/test/unit/common_tests.py @@ -31,7 +31,7 @@ from mock import Mock, patch, call from tempfile import NamedTemporaryFile from textwrap import dedent from unit import open_mock, Capture -from blessings import Terminal +from blessed import Terminal class CommonTests(unittest.TestCase): diff --git a/tito.spec b/tito.spec index e2a76ae..9bdcff8 100644 --- a/tito.spec +++ b/tito.spec @@ -31,14 +31,14 @@ BuildRequires: python3-devel BuildRequires: python3-setuptools Requires: python3-setuptools Requires: python3-bugzilla -Requires: python3-blessings +Requires: python3-blessed Requires: rpm-python3 %else BuildRequires: python2-devel BuildRequires: python-setuptools Requires: python-setuptools Requires: python-bugzilla -Requires: python-blessings +Requires: python-blessed Requires: rpm-python %endif BuildRequires: asciidoc