Finished Release v0.5.40

src/infi/recipe/application_packager/base/__init__.py

@@ -22,11 +22,12 @@
                    'shortcuts-icon': "~/.msi-ui/icon.exe",
                    'msi-banner-bmp': "~/.msi-ui/WixUIBanner.bmp",
                    'msi-dialog-bmp': "~/.msi-ui/WixUIDialog.bmp",
-                   'startmenu-shortcuts': [],
+                   'startmenu-shortcuts': '[]',
                    'eula-rtf': None,
                    'documentation-url': None,
                    '_target_arch': None,
-                   'close-on-upgrade-or-removal' : 'true'
+                   'close-on-upgrade-or-removal' : 'true',
+                   'additional-directories': '[]'
                   }
 
 PYTHON_PACKAGES_USED_BY_PACKAGING = ["infi.recipe.buildout_logging",
@@ -237,6 +238,9 @@ def get_shortcuts_icon(self):
     def get_startmenu_shortcuts(self):
         return self._get_recipe_atribute("startmenu-shortcuts")
 
+    def get_additional_directories(slef):
+        return slef._get_recipe_atribute("additional-directories")
+
     def write_bootstrap_for_production(self):
         from ..utils.buildout import write_bootstrap_for_production
         write_bootstrap_for_production()
@@ -295,3 +299,10 @@ def get_signtool(self):
         certificate = recipe.get("pfx-file", RECIPE_DEFAULTS['pfx-file'])
         password_file = recipe.get("pfx-password-file", RECIPE_DEFAULTS['pfx-password-file'])
         return utils.signtool.Signtool(timestamp_url, certificate, password_file)
+
+    def add_aditional_directories(self):
+        from os import path
+        for d in eval(self.get_additional_directories()):
+            dirname = path.dirname(d.rstrip('/\\'))
+            dest_dir = path.join(self.get_install_prefix(), dirname)
+            self._add_directory(path.join(self.get_buildout_dir(), d), dest_dir)

src/infi/recipe/application_packager/deb/__init__.py

@@ -76,6 +76,7 @@ def _put_all_files(self):
         self._add_directory(path.join(self.get_buildout_dir(), 'parts', 'python'), parts)
         self._add_directory(path.join(self.get_buildout_dir(), 'src'), self.get_install_prefix())
         self._add_directory(path.join(self.get_buildout_dir(), 'eggs'), self.get_install_prefix(), True, True)
+        self.add_aditional_directories()
 
     def get_deb_filename(self):
         return "{}-{}-{}.deb".format(self.get_package_name(), self.get_project_version__long(), self.get_os_string())

src/infi/recipe/application_packager/msi/__init__.py

@@ -195,6 +195,7 @@ def _put_all_files(self, wix, silent_launcher):
         wix.add_directory(path.join(self.get_buildout_dir(), 'parts', 'python'), parts)
         wix.add_directory(path.join(self.get_buildout_dir(), 'src'), wix.installdir)
         wix.add_directory(path.join(self.get_buildout_dir(), 'eggs'), wix.installdir, True, True)
+        self.add_aditional_directories()
         return silent_launcher_file_id
 
     def _append_os_removedirs_eggs(self, wix, silent_launcher_file_id):

src/infi/recipe/application_packager/pkg/__init__.py

@@ -89,6 +89,7 @@ def _put_all_files(self):
         self._add_directory(path.join(self.get_buildout_dir(), 'parts', 'python'), parts)
         self._add_directory(path.join(self.get_buildout_dir(), 'src'), self.get_install_prefix())
         self._add_directory(path.join(self.get_buildout_dir(), 'eggs'), self.get_install_prefix(), True, True)
+        self.add_aditional_directories()
 
     def _get_pkg_filename(self):
         return "{}-{}-{}.pkg".format(self.get_package_name(), self.get_project_version__long(), self.get_os_string())

src/infi/recipe/application_packager/rpm/__init__.py

@@ -139,6 +139,7 @@ def _put_all_files(self):
         self._add_directory(path.join(self.get_buildout_dir(), 'parts', 'python'), parts)
         self._add_directory(path.join(self.get_buildout_dir(), 'src'), self.get_install_prefix())
         self._add_directory(path.join(self.get_buildout_dir(), 'eggs'), self.get_install_prefix(), True, True)
+        self.add_aditional_directories()
 
     def get_rpm_filename(self):
         return "{}-{}-{}.rpm".format(self.get_package_name(), self.get_project_version__long(),

src/infi/recipe/application_packager/utils/__init__.py

@@ -84,7 +84,7 @@ def write_ez_setup_py(destination_dir):
         with open(ez_setup_txt) as fd:
             content = fd.read()
         content = content.replace("0.8", _get_install_package_verion("setuptools"))
-        content = content.replace("https://pypi.python.org/packages/source/s/setuptools/", ".cache/dist/")
+        content = content.replace("https://pypi.io/packages/source/s/setuptools/", ".cache/dist/")
         with open("ez_setup.py", "w") as fd:
             fd.write(content)
 

src/infi/recipe/application_packager/utils/buildout/bootstrap.py

@@ -58,7 +58,7 @@ def normalize_to_url(option, opt_str, value, parser):
     setattr(parser.values, name, value)
 
 ezsetup_source = 'https://bootstrap.pypa.io/ez_setup.py'
-setuptools_source = "https://pypi.python.org/packages/source/s/setuptools/"
+setuptools_source = "https://pypi.io/packages/source/s/setuptools/"
 pypi_index = "https://pypi.python.org/simple/"
 
 parser = OptionParser(usage=usage)

src/infi/recipe/application_packager/utils/ez_setup.txt

@@ -29,7 +29,7 @@ except ImportError:
     USER_SITE = None
 
 DEFAULT_VERSION = "0.8"
-DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
+DEFAULT_URL = "https://pypi.io/packages/source/s/setuptools/"
 
 def _python_cmd(*args):
     args = (sys.executable,) + args

tests/test_pypi.py

@@ -20,5 +20,4 @@ def test_official_pypi(self, exception_class):
             except TypeError:
                 ConfigParser().get.side_effect = exception_class("x", "y")
             url = utils._get_package_url("zc.buildout")
-            self.assertIn("pypi.python.org/packages/source", url)
             self.assertNotIn("#", url)