From 36ab05c22244890e3442d0e8c658faa938198120 Mon Sep 17 00:00:00 2001
From: lethliel <mstrigl@suse.com>
Date: Thu, 13 Dec 2018 13:15:31 +0100
Subject: [PATCH] [python3] setup.py now supports python3
---
setup.py | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/setup.py b/setup.py
index e306f707..91a7eb85 100755
--- a/setup.py
+++ b/setup.py
@@ -2,11 +2,13 @@
from distutils.core import setup
import distutils.core
-import distutils.command.build
-import distutils.command.install_data
+from distutils.command import build, install_data
import os.path
import osc.core
import sys
+
+import setuptools
+
from osc import commandline
from osc import babysitter
# optional support for py2exe
@@ -17,7 +19,7 @@
HAVE_PY2EXE = False
-class build_osc(distutils.command.build.build, object):
+class build_osc(build.build, object):
"""
Custom build command which generates man page.
"""
@@ -28,7 +30,7 @@ def build_man_page(self):
import gzip
man_path = os.path.join(self.build_base, 'osc.1.gz')
distutils.log.info('generating %s' % man_path)
- outfile = gzip.open(man_path, 'w')
+ outfile = gzip.open(man_path, 'wt')
osccli = commandline.Osc(stdout=outfile)
# FIXME: we cannot call the main method because osc expects an ~/.oscrc
# file (this would break builds in environments like the obs)
@@ -60,15 +62,15 @@ def run(self):
src_dir = (self.distribution.package_dir or {'': ''})['']
src_dir = os.path.join(os.getcwd(), src_dir)
import sphinx
- sphinx.main(['runme',
- '-D', 'version=%s' % metadata.get_version(),
+ sphinx.main(['runme',
+ '-D', 'version=%s' % metadata.get_version(),
os.path.join('docs',), os.path.join(self.built_docs, 'docs')])
# take a potential build-base option into account (for instance, if osc is
# build and installed like this:
# python setup.py build --build-base=<dir> ... install ...)
-class install_data(distutils.command.install_data.install_data, object):
+class install_data(install_data.install_data, object):
def initialize_options(self):
super(install_data, self).initialize_options()
self.built_data = None
@@ -97,7 +99,7 @@ def finalize_options(self):
if sys.platform[:3] != 'win':
data_files.append((os.path.join('share', 'man', 'man1'), ['osc.1.gz']))
-setup(name='osc',
+setuptools.setup(name='osc',
version = osc.core.__version__,
description = 'openSUSE commander',
long_description = 'Command-line client for the openSUSE Build Service, which allows to access repositories in the openSUSE Build Service in similar way as Subversion repositories.',