Merge branch 'master' of github.com:takluyver/pynsist

doc/conf.py

@@ -37,8 +37,11 @@ extensions = [
     'sphinx.ext.autodoc',
     'sphinx.ext.intersphinx',
     'sphinx.ext.viewcode',
+    'sphinxcontrib_github_alt',
 ]
 
+github_project_url = "https://github.com/takluyver/pynsist"
+
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
 

doc/installers.rst

@@ -3,24 +3,25 @@ Installer details
 
 The installers pynsist builds do a number of things:
 
-1. Unpack and run the Python .msi installer for the version of Python you
-   specified.
-2. Unpack and run the .msi installer for the `py launcher
-   <https://bitbucket.org/vinay.sajip/pylauncher>`_, if you're using Python 2
-   (in Python 3, this is installed as part of Python).
-3. Install a number of files in the installation directory the user selects:
+1. Install a number of files in the installation directory the user selects:
 
+   - An embedded build of Python, including the standard library.
+   - A copy of the necessary Microsoft C runtime for Python to run, if this
+     is not already installed on the system.
    - The launcher script(s) that start your application
    - The icon(s) for your application launchers
    - Python packages your application needs
    - Any other files you specified
 
-4. Create a start menu shortcut for each launcher script. If there is only one
+2. Create a start menu shortcut for each launcher script. If there is only one
    launcher, it will go in the top level of the start menu. If there's more than
    one, the installer will make a folder named after the application.
+3. If you have specified any :ref:`commands <command_config>`, modify the
+   :envvar:`PATH` environment variable in the registry, so that your commands
+   will be available in a system command prompt.
+4. Byte-compile all Python files in the ``pkgs`` subdirectory. This should
+   slightly improve the startup time of your application.
 5. Write an uninstaller, and the registry keys to put it in 'Add/remove programs'.
-   The uninstaller only uninstalls your application (undoing steps 3-5); it
-   leaves Python alone, because there might be other applications using Python.
 
 The installer (and uninstaller) is produced using `NSIS
 <http://nsis.sourceforge.net/Main_Page>`_, with the Modern UI.

doc/pypi-requirements.txt

@@ -3,3 +3,4 @@ requests
 win_cli_launchers
 yarg
 requests_download
+sphinxcontrib_github_alt

doc/releasenotes.rst

@@ -1,6 +1,14 @@
 Release notes
 =============
 
+Version 2.1
+-----------
+
+* Fix for launching Python subprocesses with the installed packages available
+  for import (:ghpull:`142`).
+* Ensure ``.pth`` files in the installed packages directory are read
+  (:ghpull:`138`).
+
 Version 2.0
 -----------
 

examples/console/installer.cfg

@@ -6,7 +6,7 @@ entry_point=guessnumber:main
 console=true
 
 [Python]
-version=3.5.1
+version=3.6.3
 bitness=64
 format=bundled
 

flit.ini

@@ -1,24 +0,0 @@
-[metadata]
-module = nsist
-author = Thomas Kluyver
-author-email = thomas@kluyver.me.uk
-dist-name = pynsist
-home-page = https://pynsist.readthedocs.io/en/latest/
-description-file = README.rst
-requires-python = >=3.5
-requires = requests
-    requests_download
-    jinja2
-    yarg
-    win_cli_launchers
-dev-requires = testpath
-classifiers = License :: OSI Approved :: MIT License
-    Intended Audience :: Developers
-    Environment :: Win32 (MS Windows)
-    Programming Language :: Python :: 3
-    Topic :: Software Development
-    Topic :: System :: Installation/Setup
-    Topic :: System :: Software Distribution
-
-[scripts]
-pynsist=nsist:main

nsist/__init__.py

@@ -26,7 +26,7 @@ from .nsiswriter import NSISFileWriter
 from .pypi import fetch_pypi_wheels
 from .util import download, text_types, get_cache_dir
 
-__version__ = '2.0'
+__version__ = '2.1'
 
 pjoin = os.path.join
 logger = logging.getLogger(__name__)
@@ -180,7 +180,7 @@ class InstallerBuilder(object):
 
         It will be unpacked into the build directory.
 
-        In addition, any *._pth files found therein will have the pkgs path
+        In addition, any ``*._pth`` files found therein will have the pkgs path
         appended to them.
         """
         url, filename = self._python_download_url_filename()
@@ -208,7 +208,7 @@ class InstallerBuilder(object):
                      and f.endswith('._pth')]
         for pth in pth_files:
             with open(pjoin(python_dir, pth), 'a+b') as f:
-                f.write(b'\r\n..\\pkgs\r\n')
+                f.write(b'\r\n..\\pkgs\r\nimport site\r\n')
 
         self.install_dirs.append(('Python', '$INSTDIR'))
 

pyproject.toml

@@ -0,0 +1,32 @@
+[build-system]
+requires = ["flit"]
+build-backend = "flit.buildapi"
+
+[tool.flit.metadata]
+module = "nsist"
+author = "Thomas Kluyver"
+author-email = "thomas@kluyver.me.uk"
+dist-name = "pynsist"
+home-page = "https://pynsist.readthedocs.io/en/latest/"
+description-file = "README.rst"
+requires-python = ">=3.5"
+requires = [
+    "requests",
+    "requests_download",
+    "jinja2",
+    "yarg",
+    "win_cli_launchers"
+]
+dev-requires = ["testpath"]
+classifiers = [
+    "License :: OSI Approved :: MIT License",
+    "Intended Audience :: Developers",
+    "Environment :: Win32 (MS Windows)",
+    "Programming Language :: Python :: 3",
+    "Topic :: Software Development",
+    "Topic :: System :: Installation/Setup",
+    "Topic :: System :: Software Distribution",
+]
+
+[tool.flit.scripts]
+pynsist = "nsist:main"