|
 |
aada13 |
From cb6de5392b6b9123c39b08cc067dd824eb77bd31 Mon Sep 17 00:00:00 2001
|
|
|
aada13 |
From: David Lehman <dlehman@redhat.com>
|
|
|
aada13 |
Date: Mon, 25 Mar 2019 14:33:56 -0400
|
|
|
aada13 |
Subject: [PATCH 4/8] Adjust Makefile et al to renamed package.
|
|
|
aada13 |
|
|
|
aada13 |
---
|
|
|
aada13 |
MANIFEST.in | 2 +-
|
|
|
aada13 |
Makefile | 12 ++++++------
|
|
|
aada13 |
po/Makefile | 2 +-
|
|
|
aada13 |
scripts/makeupdates | 4 ++--
|
|
|
aada13 |
setup.py | 8 ++++----
|
|
|
aada13 |
5 files changed, 14 insertions(+), 14 deletions(-)
|
|
|
aada13 |
|
|
|
aada13 |
diff --git a/Makefile b/Makefile
|
|
|
aada13 |
index 76817278..328e17c8 100644
|
|
|
aada13 |
--- a/Makefile
|
|
|
aada13 |
+++ b/Makefile
|
|
|
aada13 |
@@ -1,8 +1,8 @@
|
|
|
aada13 |
PYTHON?=python3
|
|
|
aada13 |
PKG_INSTALL?=dnf
|
|
|
aada13 |
|
|
|
aada13 |
-PKGNAME=blivet
|
|
|
aada13 |
-SPECFILE=python-blivet.spec
|
|
|
aada13 |
+PKGNAME=blivet3
|
|
|
aada13 |
+SPECFILE=python-blivet3.spec
|
|
|
aada13 |
VERSION=$(shell $(PYTHON) setup.py --version)
|
|
|
aada13 |
RPMVERSION=$(shell rpmspec -q --queryformat "%{version}\n" $(SPECFILE) | head -1)
|
|
|
aada13 |
RPMRELEASE=$(shell rpmspec --undefine '%dist' -q --queryformat "%{release}\n" $(SPECFILE) | head -1)
|
|
|
aada13 |
@@ -51,8 +51,8 @@ test:
|
|
|
aada13 |
coverage:
|
|
|
aada13 |
@echo "*** Running unittests with $(COVERAGE) for $(PYTHON) ***"
|
|
|
aada13 |
PYTHONPATH=.:tests/ $(COVERAGE) run --branch -m unittest discover -v -s tests/ -p '*_test.py'
|
|
|
aada13 |
- $(COVERAGE) report --include="blivet/*" --show-missing
|
|
|
aada13 |
- $(COVERAGE) report --include="blivet/*" > coverage-report.log
|
|
|
aada13 |
+ $(COVERAGE) report --include="blivet3/*" --show-missing
|
|
|
aada13 |
+ $(COVERAGE) report --include="blivet3/*" > coverage-report.log
|
|
|
aada13 |
|
|
|
aada13 |
pylint:
|
|
|
aada13 |
@echo "*** Running pylint ***"
|
|
|
aada13 |
@@ -69,7 +69,7 @@ pep8:
|
|
|
aada13 |
else \
|
|
|
aada13 |
echo "You need to install pycodestyle/pep8 to run this check."; exit 1; \
|
|
|
aada13 |
fi ; \
|
|
|
aada13 |
- $$pep8 --ignore=E501,E402,E731,W504 blivet/ tests/ examples/
|
|
|
aada13 |
+ $$pep8 --ignore=E501,E402,E731,W504 blivet3/ tests/ examples/
|
|
|
aada13 |
|
|
|
aada13 |
canary: po-fallback
|
|
|
aada13 |
@echo "*** Running translation-canary tests ***"
|
|
|
aada13 |
@@ -83,7 +83,7 @@ check:
|
|
|
aada13 |
exit $$status
|
|
|
aada13 |
|
|
|
aada13 |
clean:
|
|
|
aada13 |
- -rm *.tar.gz blivet/*.pyc blivet/*/*.pyc ChangeLog
|
|
|
aada13 |
+ -rm *.tar.gz blivet3/*.pyc blivet3/*/*.pyc ChangeLog
|
|
|
aada13 |
$(MAKE) -C po clean
|
|
|
aada13 |
$(PYTHON) setup.py -q clean --all
|
|
|
aada13 |
|
|
|
aada13 |
diff --git a/po/Makefile b/po/Makefile
|
|
|
aada13 |
index bbc6b5e8..2d521b0d 100644
|
|
|
aada13 |
--- a/po/Makefile
|
|
|
aada13 |
+++ b/po/Makefile
|
|
|
aada13 |
@@ -24,7 +24,7 @@ MSGFMT = msgfmt --statistics --verbose
|
|
|
aada13 |
# What do we need to do
|
|
|
aada13 |
POFILES = $(wildcard *.po)
|
|
|
aada13 |
MOFILES = $(patsubst %.po,%.mo,$(POFILES))
|
|
|
aada13 |
-PYSRC = $(wildcard ../blivet/*.py ../blivet/*/*.py)
|
|
|
aada13 |
+PYSRC = $(wildcard ../blivet3/*.py ../blivet3/*/*.py)
|
|
|
aada13 |
SRCFILES = $(PYSRC)
|
|
|
aada13 |
|
|
|
aada13 |
all:: refresh-po $(MOFILES)
|
|
|
aada13 |
diff --git a/setup.py b/setup.py
|
|
|
aada13 |
index 418055bd..5b8f4cf6 100644
|
|
|
aada13 |
--- a/setup.py
|
|
|
aada13 |
+++ b/setup.py
|
|
|
aada13 |
@@ -42,7 +42,7 @@ def findall(dirname=os.curdir):
|
|
|
aada13 |
filelist.findall = findall
|
|
|
aada13 |
|
|
|
aada13 |
# Extend the sdist command
|
|
|
aada13 |
-class blivet_sdist(sdist):
|
|
|
aada13 |
+class blivet3_sdist(sdist):
|
|
|
aada13 |
def run(self):
|
|
|
aada13 |
# Build the .mo files
|
|
|
aada13 |
subprocess.check_call(['make', '-C', 'po'])
|
|
|
aada13 |
@@ -68,12 +68,12 @@ data_files = [
|
|
|
aada13 |
]
|
|
|
aada13 |
|
|
|
aada13 |
|
|
|
aada13 |
-setup(name='blivet',
|
|
|
aada13 |
+setup(name='blivet3',
|
|
|
aada13 |
version='3.1.3',
|
|
|
aada13 |
- cmdclass={"sdist": blivet_sdist},
|
|
|
aada13 |
+ cmdclass={"sdist": blivet3_sdist},
|
|
|
aada13 |
description='Python module for system storage configuration',
|
|
|
aada13 |
author='David Lehman', author_email='dlehman@redhat.com',
|
|
|
aada13 |
url='http://github.com/storaged-project/blivet',
|
|
|
aada13 |
data_files=data_files,
|
|
|
aada13 |
- packages=['blivet', 'blivet.dbus', 'blivet.devices', 'blivet.devicelibs', 'blivet.events', 'blivet.formats', 'blivet.populator', 'blivet.static_data', 'blivet.tasks', 'blivet.populator.helpers']
|
|
|
aada13 |
+ packages=['blivet3', 'blivet3.dbus', 'blivet3.devices', 'blivet3.devicelibs', 'blivet3.events', 'blivet3.formats', 'blivet3.populator', 'blivet3.static_data', 'blivet3.tasks', 'blivet3.populator.helpers']
|
|
|
aada13 |
)
|
|
|
aada13 |
--
|
|
|
aada13 |
2.17.2
|
|
|
aada13 |
|