Commit bf5ecf7c authored by Thomas Goirand's avatar Thomas Goirand

Switch swift to Python 3.

parent 2c306201
swift (2.21.10+2019.07.13+git.4643412bd1-1) UNRELEASED; urgency=medium
* New upstream release.
* Switch swift to Python 3.
-- Thomas Goirand <zigo@debian.org> Mon, 15 Jul 2019 15:09:23 +0200
......
......@@ -11,39 +11,40 @@ Build-Depends:
dh-exec,
dh-python,
openstack-pkg-tools (>= 99~),
python-all,
python-pbr,
python-setuptools,
python3-all,
python3-pbr,
python3-setuptools,
python3-sphinx (>= 1.6.2),
Build-Depends-Indep:
python-boto,
python-coverage,
python-cryptography,
python-dnspython,
python-eventlet,
python-fixtures (>= 3.0.0),
python-greenlet,
python-ipaddress,
python-keystoneclient,
python-keystonemiddleware (>= 4.17.0),
python-lxml,
python-mock,
python-netifaces,
python-nose,
python-nose-exclude,
python-nosehtmloutput,
python-nosexcover,
python-openssl,
python-openstack.nose-plugin,
python-openstackclient,
python-os-testr (>= 0.8.0),
python-pastedeploy,
python-pyeclib,
python-requests (>= 2.14.2),
python-requests-mock (>= 1.2.0),
python-six,
python-swiftclient,
python-xattr,
python3-boto3,
python3-boto,
python3-coverage,
python3-cryptography,
python3-dnspython,
python3-eventlet,
python3-fixtures (>= 3.0.0),
python3-greenlet,
python3-ipaddress,
python3-keystoneclient,
python3-keystonemiddleware (>= 4.17.0),
python3-lxml,
python3-mock,
python3-netifaces,
python3-nose,
python3-nose-exclude,
python3-nosehtmloutput,
python3-nosexcover,
python3-openssl,
python3-openstack.nose-plugin,
python3-openstackclient,
python3-os-testr (>= 0.8.0),
python3-pastedeploy,
python3-pyeclib,
python3-requests (>= 2.14.2),
python3-requests-mock (>= 1.2.0),
python3-six,
python3-swiftclient,
python3-xattr,
python3-openstackdocstheme (>= 1.11.0),
python3-os-api-ref (>= 1.0.0),
python3-oslosphinx,
......@@ -53,27 +54,27 @@ Vcs-Git: https://salsa.debian.org/openstack-team/services/swift.git
Homepage: https://github.com/openstack/swift
Testsuite: autopkgtest-pkg-python
Package: python-swift
Package: python3-swift
Architecture: all
Section: python
Depends:
adduser,
python-cryptography,
python-dnspython,
python-eventlet,
python-greenlet,
python-ipaddress,
python-netifaces,
python-openssl,
python-pastedeploy,
python-pyeclib,
python-six,
python-xattr,
python3-cryptography,
python3-dnspython,
python3-eventlet,
python3-greenlet,
python3-ipaddress,
python3-netifaces,
python3-openssl,
python3-pastedeploy,
python3-pyeclib,
python3-six,
python3-xattr,
${misc:Depends},
${python:Depends},
${python3:Depends},
Breaks:
systemd (<< 235~),
Description: distributed virtual object store - Python libraries
Description: distributed virtual object store - Python 3 libraries
OpenStack Object Storage (code-named Swift) creates redundant, scalable object
storage using clusters of standardized servers to store petabytes of
accessible data. It is not a file system or real-time data storage system, but
......@@ -93,17 +94,17 @@ Description: distributed virtual object store - Python libraries
inexpensive commodity hard drives and servers can be used in lieu of more
expensive equipment.
.
This package provides the Python libraries that actually implement
This package provides the Python 3 libraries that actually implement
everything.
Package: swift
Architecture: all
Depends:
logrotate,
python-swift (=${binary:Version}),
python3-swift (=${binary:Version}),
rsyslog,
${misc:Depends},
${python:Depends},
${python3:Depends},
Description: distributed virtual object store - common files
OpenStack Object Storage (code-named Swift) creates redundant, scalable object
storage using clusters of standardized servers to store petabytes of
......@@ -130,11 +131,11 @@ Package: swift-account
Architecture: all
Depends:
lsb-base,
python-swift (=${binary:Version}),
python3-swift (=${binary:Version}),
rsync,
swift (=${binary:Version}),
${misc:Depends},
${python:Depends},
${python3:Depends},
Recommends:
swift-drive-audit,
Description: distributed virtual object store - account server
......@@ -163,11 +164,11 @@ Package: swift-container
Architecture: all
Depends:
lsb-base,
python-swift (=${binary:Version}),
python3-swift (=${binary:Version}),
rsync,
swift (=${binary:Version}),
${misc:Depends},
${python:Depends},
${python3:Depends},
Recommends:
swift-drive-audit,
Description: distributed virtual object store - container server
......@@ -199,7 +200,7 @@ Depends:
libjs-bootstrap,
libjs-jquery,
libjs-underscore,
python-os-api-ref-common,
python3-os-api-ref-common,
${misc:Depends},
${sphinxdoc:Depends},
Description: distributed virtual object store - documentation
......@@ -227,10 +228,10 @@ Description: distributed virtual object store - documentation
Package: swift-drive-audit
Architecture: all
Depends:
python-swift (=${binary:Version}),
python3-swift (=${binary:Version}),
swift (=${binary:Version}),
${misc:Depends},
${python:Depends},
${python3:Depends},
Description: distributed virtual object store - drive audit
OpenStack Object Storage (code-named Swift) creates redundant, scalable object
storage using clusters of standardized servers to store petabytes of
......@@ -257,11 +258,11 @@ Package: swift-object
Architecture: all
Depends:
lsb-base,
python-swift (=${binary:Version}),
python3-swift (=${binary:Version}),
rsync,
swift (=${binary:Version}),
${misc:Depends},
${python:Depends},
${python3:Depends},
Recommends:
swift-drive-audit,
Description: distributed virtual object store - object server
......@@ -290,11 +291,11 @@ Package: swift-object-expirer
Architecture: all
Depends:
lsb-base (>= 3.0-6),
python-swift (=${binary:Version}),
python3-swift (=${binary:Version}),
rsync,
swift (=${binary:Version}),
${misc:Depends},
${python:Depends},
${python3:Depends},
Description: distributed virtual object store - object-expirer
OpenStack Object Storage (code-named Swift) creates redundant, scalable object
storage using clusters of standardized servers to store petabytes of
......@@ -323,12 +324,12 @@ Package: swift-proxy
Architecture: all
Depends:
lsb-base,
python-swift (=${binary:Version}),
python3-swift (=${binary:Version}),
swift (=${binary:Version}),
${misc:Depends},
${python:Depends},
${python3:Depends},
Recommends:
python-keystonemiddleware | swauth,
python3-keystonemiddleware | swauth,
Description: distributed virtual object store - proxy server
OpenStack Object Storage (code-named Swift) creates redundant, scalable object
storage using clusters of standardized servers to store petabytes of
......
......@@ -5,7 +5,7 @@
include /usr/share/openstack-pkg-tools/pkgos.make
%:
dh $@ --buildsystem=python_distutils --with python2,sphinxdoc,systemd
dh $@ --buildsystem=python_distutils --with python3,sphinxdoc,systemd
# clean sphinx build output
override_dh_clean:
......@@ -13,7 +13,7 @@ override_dh_clean:
rm -f debian/*.upstart
rm -f debian/*.init
rm -f debian/*.service
rm -f debian/python-swift.postinst
rm -f debian/python3-swift.postinst
rm -f $(CURDIR)/swift-test.conf
# build with sphinx documentation
......@@ -22,7 +22,7 @@ override_dh_sphinxdoc:
dh_auto_build
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 -O--buildsystem=python_distutils
dh_sphinxdoc
endif
ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
......@@ -35,7 +35,7 @@ endif
override_dh_auto_build:
dh_auto_build
/usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func python-swift.postinst
/usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func python3-swift.postinst
override_dh_install:
rm debian/tmp/usr/bin/swift-init
......@@ -49,7 +49,7 @@ override_dh_install:
done
dh_install
rm -rf debian/python-swift/usr/lib/python*/dist-packages/test
rm -rf debian/python3-swift/usr/lib/python*/dist-packages/test
gen-init-configurations:
# Create the init scripts and systemd unit files from the template
......
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