Attachment 159921 Details for Bug 202361 – Change for version 4.0.3.20 of patch-setup.py

Change for version 4.0.3.20 of patch-setup.py

patch-setup.py (text/x-python), 3.56 KB, created by Walter Schwarzenfeld on 2015-08-16 14:04:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Walter Schwarzenfeld

Created: 2015-08-16 14:04:04 UTC

Size: 3.56 KB

patch

obsolete

>--- setup.py.orig	2015-08-16 13:03:00 UTC
>+++ setup.py
>@@ -35,6 +35,10 @@ if sys.version_info[:2] < (2, 6):
> 
> incdir_list = libdir_list = None
> 
>+LOCALBASE = os.environ.get("LOCALBASE", "/usr/local")
>+incdir_list = ['%s/include' % LOCALBASE]
>+libdir_list = ['%s/lib/' % LOCALBASE]
>+
> if os.name == 'posix':
>     LIBRSYNC_DIR = os.environ.get('LIBRSYNC_DIR', '')
>     args = sys.argv[:]
>@@ -46,15 +50,9 @@ if os.name == 'posix':
>         incdir_list = [os.path.join(LIBRSYNC_DIR, 'include')]
>         libdir_list = [os.path.join(LIBRSYNC_DIR, 'lib')]
> 
>-data_files = [('share/man/man1',
>+data_files = [('man/man1',
>                ['bin/duplicity.1',
>                 'bin/rdiffdir.1']),
>-              ('share/doc/duplicity-%s' % version_string,
>-               ['COPYING',
>-                'README',
>-                'README-REPO',
>-                'README-LOG',
>-                'CHANGELOG']),
>               ]
> 
> top_dir = os.path.dirname(os.path.abspath(__file__))
>@@ -69,45 +67,8 @@ for root, dirs, files in os.walk(os.path
>                  ["po/%s/duplicity.mo" % lang]))
> 
> 
>-class TestCommand(test):
>-    def run(self):
>-        # Make sure all modules are ready
>-        build_cmd = self.get_finalized_command("build_py")
>-        build_cmd.run()
>-        # And make sure our scripts are ready
>-        build_scripts_cmd = self.get_finalized_command("build_scripts")
>-        build_scripts_cmd.run()
>-
>-        # make symlinks for test data
>-        if build_cmd.build_lib != top_dir:
>-            for path in ['testfiles.tar.gz', 'gnupg']:
>-                src = os.path.join(top_dir, 'testing', path)
>-                target = os.path.join(build_cmd.build_lib, 'testing', path)
>-                try:
>-                    os.symlink(src, target)
>-                except Exception:
>-                    pass
>-
>-        os.environ['PATH'] = "%s:%s" % (
>-            os.path.abspath(build_scripts_cmd.build_dir),
>-            os.environ.get('PATH'))
>-
>-        test.run(self)
>-
>-
> class InstallCommand(install):
>     def run(self):
>-        # Normally, install will call build().  But we want to delete the
>-        # testing dir between building and installing.  So we manually build
>-        # and mark ourselves to skip building when we run() for real.
>-        self.run_command('build')
>-        self.skip_build = True
>-
>-        # This should always be true, but just to make sure!
>-        if self.build_lib != top_dir:
>-            testing_dir = os.path.join(self.build_lib, 'testing')
>-            os.system("rm -rf %s" % testing_dir)
>-
>         install.run(self)
> 
> 
>@@ -132,12 +93,7 @@ setup(name="duplicity",
>       maintainer_email="kenneth@loafman.com",
>       url="http://duplicity.nongnu.org/index.html",
>       packages=['duplicity',
>-                  'duplicity.backends',
>-                  'duplicity.backends.pyrax_identity',
>-                  'testing',
>-                  'testing.functional',
>-                  'testing.overrides',
>-                  'testing.unit'],
>+                  'duplicity.backends'],
>       package_dir={"duplicity": "duplicity",
>                    "duplicity.backends": "duplicity/backends", },
>       ext_modules=[Extension("duplicity._librsync",
>@@ -147,9 +103,6 @@ setup(name="duplicity",
>                              libraries=["rsync"])],
>       scripts=['bin/rdiffdir', 'bin/duplicity'],
>       data_files=data_files,
>-      tests_require=['lockfile', 'mock', 'pexpect'],
>-      test_suite='testing',
>-      cmdclass={'test': TestCommand,
>-                'install': InstallCommand,
>+      cmdclass={'install': InstallCommand,
>                 'sdist': SDistCommand},
>       )

Actions: View

Attachments on bug 202361: 159921