Commit 17e17e40 authored by Thomas Goirand's avatar Thomas Goirand

More Py3 depends fix.

parent a2a3daeb
......@@ -21,10 +21,9 @@ Build-Depends-Indep:
python3-coverage,
python3-cryptography,
python3-dnspython,
python3-eventlet,
python3-eventlet (>= 0.24.1),
python3-fixtures (>= 3.0.0),
python3-greenlet,
python3-ipaddress,
python3-keystoneclient,
python3-keystonemiddleware (>= 4.17.0),
python3-lxml,
......@@ -61,9 +60,8 @@ Depends:
adduser,
python3-cryptography,
python3-dnspython,
python3-eventlet,
python3-eventlet (>= 0.24.1),
python3-greenlet,
python3-ipaddress,
python3-netifaces,
python3-openssl,
python3-pastedeploy,
......
......@@ -8,36 +8,26 @@ include /usr/share/openstack-pkg-tools/pkgos.make
dh $@ --buildsystem=python_distutils --with python3,sphinxdoc,systemd
# clean sphinx build output
override_dh_clean:
dh_clean
override_dh_auto_clean:
rm -f debian/*.upstart
rm -f debian/*.init
rm -f debian/*.service
rm -f debian/python3-swift.postinst
rm -f $(CURDIR)/swift-test.conf
override_dh_auto_build:
/usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func python3-swift.postinst
# build with sphinx documentation
ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS)))
override_dh_sphinxdoc:
dh_auto_build
ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS)))
LC_ALL=C.UTF-8 PYTHONPATH=. python3 -m sphinx doc/source $(CURDIR)/debian/swift-doc/usr/share/doc/swift-doc/base
LC_ALL=C.UTF-8 PYTHONPATH=. python3 -m sphinx api-ref/source $(CURDIR)/debian/swift-doc/usr/share/doc/swift-doc/api-ref
dh_sphinxdoc
endif
ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
override_dh_auto_test:
echo "[unit_test]\nfake_syslog = True" > $(CURDIR)/swift-test.conf
SWIFT_TEST_CONFIG_FILE=$(CURDIR)/swift-test.conf PYTHONPATH=. nosetests -v test/unit --exe \
--exclude-test=test.unit.common.test_utils.TestUtils.test_get_logger_sysloghandler_plumbing
rm -f $(CURDIR)/swift-test.conf
endif
override_dh_auto_build:
dh_auto_build
/usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func python3-swift.postinst
override_dh_install:
override_dh_auto_install:
pkgos-dh_auto_install --no-py2 --in-tmp
rm debian/tmp/usr/bin/swift-init
# Create the init scripts and systemd unit files from the template
......@@ -48,6 +38,13 @@ override_dh_install:
debian/gen-systemd-unit $$i ; \
done
ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
echo "[unit_test]\nfake_syslog = True" > $(CURDIR)/swift-test.conf
SWIFT_TEST_CONFIG_FILE=$(CURDIR)/swift-test.conf PYTHONPATH=$(CURDIR)/debian/tmp/usr/lib/python3/dist-packages python3 -m nose -v test/unit --exe \
--exclude-test=test.unit.common.test_utils.TestUtils.test_get_logger_sysloghandler_plumbing
rm -f $(CURDIR)/swift-test.conf
endif
dh_install
rm -rf debian/python3-swift/usr/lib/python*/dist-packages/test
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment