Release 3.6.

.gitattributes

@@ -17,6 +17,11 @@ runw_d	-text
 *.exe	-text
 *.dll	-text
 
+# misc
+*.sqlite3 -text
+*.egg     -text
+*.zip     -text
+
 /PyInstaller/utils/_gitrevision.py ident export-subst
 # Tests relay on fixed \n line end
 /tests/unit/test_modulegraph/testdata/test.txt text eol=lf

.github/CONTRIBUTING.md

@@ -1,2 +1,2 @@
 Please refer to the [Development
-Guide](https://github.com/pyinstaller/pyinstaller/wiki/Development).
+Guide](https://pyinstaller.readthedocs.io/en/latest/development/).

.github/FUNDING.yml

@@ -0,0 +1,3 @@
+custom: ["http://www.pyinstaller.org/funding.html", "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=VK5QJFDCE8UW6"]
+patreon: pyinstaller
+tidelift: "pypi/PyInstaller"

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,69 @@
+---
+name: Bug report
+about: Report a bug encountered while freezing you program or runing your frozen program
+title: ''
+labels:
+assignees: ''
+---
+
+<!--
+Welcome to the PyInstaller issue tracker! Before creating an issue, please heed the following:
+
+1. This tracker should only be used to report bugs and request features / enhancements to PyInstaller
+    - For questions and general support, use the mailing list, see
+	  <http://www.pyinstaller.org/support.html#mailing-list>
+2. Use the search function before creating a new issue. Duplicates will be closed and directed to
+   the original discussion.
+3. When making a bug report, make sure you provide all required information. The easier it is for
+   maintainers to reproduce, the faster it'll be fixed.
+-->
+
++++ ONLY TEXT +++ DO NOT POST IMAGES +++
+
+## Description of the issue
+
+## Context information (for bug reports)
+
+* Output of `pyinstaller --version`: ```(paste here)```
+* Version of Python: e.g. 3.7
+* Platform: e.g GNU/Linux (distribution), Windows (language settings), OS X, conda, FreeBSD
+* Did you also try this on another platform? Does it work there?
+
+
+* try the latest development version, using the following command:
+
+```shell
+pip install https://github.com/pyinstaller/pyinstaller/archive/develop.zip
+```
+
+* follow *all* the instructions in our "If Things Go Wrong" Guide
+  (https://github.com/pyinstaller/pyinstaller/wiki/If-Things-Go-Wrong) and
+
+### Make sure [everything is packaged correctly](https://github.com/pyinstaller/pyinstaller/wiki/How-to-Report-Bugs#make-sure-everything-is-packaged-correctly)
+
+  * [ ] start with celan installation
+  * [ ] use the latest development version
+  * [ ] Run your frozen program **from a command window (shell)** — instead of double-clicking on it
+  * [ ] Package your program in **--onedir mode**
+  * [ ] Package **without UPX**, say: use the option `--noupx` or set `upx=False` in your .spec-file
+  * [ ] Repackage you application in **verbose/debug mode**. For this, pass the option `--debug` to `pyi-makespec` or `pyinstaller` or use `EXE(..., debug=1, ...)` in your .spec file.
+
+
+### A minimal example program which shows the error
+
+```
+(paste text here)
+“Minimal“ means: remove everything from your code which is not relevant for this bug,
+esp. don't use external programs, remote requests, etc.
+A very good example is https://gist.github.com/ronen/024cdae9ff2d50488438. This one helped
+us reproducing and fixing a quite complex problem within approx 1 hour.
+```
+
+### Stacktrace / full error message
+
+```
+(paste text here)
+```
+
+Please also see <https://github.com/pyinstaller/pyinstaller/wiki/How-to-Report-Bugs>
+for more about what would use to solve the issue.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,30 @@
+---
+name: Feature request
+about: Suggest an idea to improve PyInstaller
+title: ''
+labels: feature
+assignees: ''
+
+---
+
+<!--
+Welcome to the PyInstaller issue tracker! Before creating an issue, please heed the following:
+
+1. This tracker should only be used to report bugs and request features / enhancements to PyInstaller
+    - For questions and general support, use the mailing list, see
+	  <http://www.pyinstaller.org/support.html#mailing-list>
+2. Use the search function before creating a new issue. Duplicates will be closed and directed to
+   the original discussion.
+-->
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/question-about-using-pyinstaller.md

@@ -0,0 +1,12 @@
+---
+name: Question about using PyInstaller
+about: This is not the appropriate channel
+title: ''
+labels: kind:support
+assignees: ''
+
+---
+
+Please use the mailing list see <http://www.pyinstaller.org/support.html#mailing-list> for details.
+
+Posts that are not a bug report or a feature/enhancement request will not be addressed on this issue tracker, but closed.

.github/SECURITY.md

@@ -0,0 +1,5 @@
+## Security contact information
+
+To report a security vulnerability, please use the
+[Tidelift security contact](https://tidelift.com/security).
+Tidelift will coordinate the fix and disclosure.

.pyup.yml

@@ -10,6 +10,6 @@ requirements:
       update: False
 
 pr_prefix: "Tests: Requirements:"
-label_prs: tests/ci/pyup
+label_prs: "area:tests/ci/pyup"
 
 branch_prefix: pyup/

.travis.yml

@@ -37,6 +37,15 @@ jobs:
       cache:
         directories:
           - $HOME/Library/Caches/pip
+      # Define the ``before_install-osx`` `node anchor
+      # <https://yaml.org/spec/1.2/spec.html#id2785586>`_, so the contents of
+      # the ``script`` node can be re-used.
+      before_install: &before_install-osx
+        # Activate a venv to ensure we're using the correct Python interpreter.
+        # Per http://steven.casagrande.io/articles/travis-ci-and-if-statements/,
+        # ensure the build fails for statements in an ``if`` clause.
+        - python3 -m venv venv
+        - source venv/bin/activate
       script: &script-test-pyinstaller
         # -n 3
         #   Run tests and speed them up by sending them to multiple CPUs.
@@ -58,6 +67,10 @@ jobs:
       cache:
         directories:
           - $HOME/Library/Caches/pip
+      # Insert the earlier defined ``before_install-osx`` node anchor contents
+      # by referencing it with an `alias node
+      # <https://yaml.org/spec/1.2/spec.html#id2786196>`_.
+      before_install: *before_install-osx
       script: &script-test-libraries
         - >
           py.test -n 3 --maxfail 3 --durations 10
@@ -71,7 +84,14 @@ jobs:
     - &test-libraries
       stage: Test - Libraries
       python: 2.7
-      # Run tests and speed them up by sending them to multiple CPUs.
+      before_install:
+        # Install OpenSSL 1.1. This fixes dynamic linking problems when PyQt5.13 tries
+        # to link with OpenSSL 1.1 -- on Ubuntu 16 (xenial), the older OpenSSL
+        # produces errors like ``qt.network.ssl: QSslSocket: cannot resolve
+        # OPENSSL_init_ssl``.
+        - sudo add-apt-repository ppa:carsten-uppenbrink-net/openssl -y
+        - sudo apt-get update -q
+        - sudo apt install openssl -q
       script: *script-test-libraries
 
     - &lint
@@ -80,8 +100,8 @@ jobs:
       script:
         - >
             if [ "$TRAVIS_PULL_REQUEST" != "false" ] ; then
-                git fetch origin $TRAVIS_BRANCH:$TRAVIS_BRANCH --depth 1 || travis_terminate 1;
-                flake8-diff -v -v -v $TRAVIS_BRANCH || travis_terminate 1;
+              git fetch origin $TRAVIS_BRANCH:$TRAVIS_BRANCH --depth 1 || travis_terminate 1;
+              flake8-diff -v -v -v $TRAVIS_BRANCH || travis_terminate 1;
             fi
 
     - <<: *test-pyinstaller
@@ -96,9 +116,6 @@ jobs:
     - <<: *lint
       python: 3.6
 
-    # Building Python > 3.7 requires OpenSSL 1.0.2 (or 1.1), which is
-    # available in xenial (16.04 LTS) only.
-
     - <<: *test-pyinstaller
       python: 3.7
     - <<: *test-libraries
@@ -137,16 +154,6 @@ addons:
     # Disabled, since this takes a HUGE amount of test time.
     #update: true
 
-before_install:
-  # Activate a venv to ensure we're using the correct Python interpreter.
-  # Per http://steven.casagrande.io/articles/travis-ci-and-if-statements/,
-  # ensure the build fails for statements in an ``if`` clause.
-  - >
-      if [[ $TRAVIS_OS_NAME == 'osx' ]]; then
-          python3 -m venv venv || travis_terminate 1;
-          source venv/bin/activate;
-      fi
-
 install:
   # Update pip.
   - python -m pip install -U pip setuptools wheel | cat
@@ -172,7 +179,7 @@ script:
 notifications:
     irc:
         channels:
-            - "irc.freenode.org#pyinstaller"
+          - "irc.freenode.org#pyinstaller"
         use_notice: true
         # skip_join: true would require +n mode *not to be set on #pyinstaller
         skip_join: false

COPYING.txt

@@ -3,7 +3,7 @@
 ================================
 
 
-Copyright (c) 2010-2019, PyInstaller Development Team
+Copyright (c) 2010-2020, PyInstaller Development Team
 Copyright (c) 2005-2009, Giovanni Bajo
 Based on previous work under copyright (c) 2002 McMillan Enterprises, Inc.
 
@@ -22,7 +22,7 @@ and related files into combinations with other programs, and to distribute
 those combinations without any restriction coming from the use of those
 files. (The General Public License restrictions do apply in other respects;
 for example, they cover modification of the files, and distribution when
-not linked into a combine executable.)
+not linked into a combined executable.)
 
 
 Bootloader and Related Files
@@ -70,12 +70,14 @@ to indicate the copyright and license terms:
 
 
 #-----------------------------------------------------------------------------
-# Copyright (c) 2005-20l5, PyInstaller Development Team.
+# Copyright (c) 2005-2020, PyInstaller Development Team.
 #
-# Distributed under the terms of the GNU General Public License with exception
-# for distributing bootloader.
+# Distributed under the terms of the GNU General Public License (version 2
+# or later) with exception for distributing the bootloader.
 #
 # The full license is in the file COPYING.txt, distributed with this software.
+#
+# SPDX-License-Identifier: (GPL-2.0-or-later WITH Bootloader-exception)
 #-----------------------------------------------------------------------------
 
 
@@ -90,7 +92,7 @@ https://gnu.org/licenses/gpl-2.0.html
 		       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 

PyInstaller/__init__.py

@@ -1,10 +1,12 @@
 #-----------------------------------------------------------------------------
-# Copyright (c) 2005-2019, PyInstaller Development Team.
+# Copyright (c) 2005-2020, PyInstaller Development Team.
 #
-# Distributed under the terms of the GNU General Public License with exception
-# for distributing bootloader.
+# Distributed under the terms of the GNU General Public License (version 2
+# or later) with exception for distributing the bootloader.
 #
 # The full license is in the file COPYING.txt, distributed with this software.
+#
+# SPDX-License-Identifier: (GPL-2.0-or-later WITH Bootloader-exception)
 #-----------------------------------------------------------------------------
 
 
@@ -20,7 +22,7 @@
 
 # Note: Keep this variable as plain string so it could be updated automatically
 #       when doing a release.
-__version__ = '3.5'
+__version__ = '3.6'
 
 
 # Absolute path of this package's directory. Save this early so all

PyInstaller/__main__.py

@@ -1,10 +1,12 @@
 #-----------------------------------------------------------------------------
-# Copyright (c) 2013-2019, PyInstaller Development Team.
+# Copyright (c) 2013-2020, PyInstaller Development Team.
 #
-# Distributed under the terms of the GNU General Public License with exception
-# for distributing bootloader.
+# Distributed under the terms of the GNU General Public License (version 2
+# or later) with exception for distributing the bootloader.
 #
 # The full license is in the file COPYING.txt, distributed with this software.
+#
+# SPDX-License-Identifier: (GPL-2.0-or-later WITH Bootloader-exception)
 #-----------------------------------------------------------------------------
 
 
@@ -21,7 +23,7 @@
 from . import log as logging
 
 # note: don't import anything else until this function is run!
-from .compat import check_requirements
+from .compat import check_requirements, is_conda
 
 logger = logging.getLogger(__name__)
 
@@ -99,7 +101,8 @@ def run(pyi_args=None, pyi_config=None):
         # This helps identify PyInstaller, Python and platform version
         #  when users report issues.
         logger.info('PyInstaller: %s' % __version__)
-        logger.info('Python: %s' % platform.python_version())
+        logger.info('Python: %s%s', platform.python_version(),
+                    " (conda)" if is_conda else "")
         logger.info('Platform: %s' % platform.platform())
 
         # Skip creating .spec when .spec file is supplied

PyInstaller/archive/pyz_crypto.py

@@ -1,10 +1,12 @@
 #-----------------------------------------------------------------------------
-# Copyright (c) 2005-2019, PyInstaller Development Team.
+# Copyright (c) 2005-2020, PyInstaller Development Team.
 #
-# Distributed under the terms of the GNU General Public License with exception
-# for distributing bootloader.
+# Distributed under the terms of the GNU General Public License (version 2
+# or later) with exception for distributing the bootloader.
 #
 # The full license is in the file COPYING.txt, distributed with this software.
+#
+# SPDX-License-Identifier: (GPL-2.0-or-later WITH Bootloader-exception)
 #-----------------------------------------------------------------------------
 
 import os