Merge branch 'master' into 3905_Pip_version_check_cache_dir

Author: tomfbiz

.github/ISSUE_TEMPLATE.md

@@ -1,13 +1,3 @@
 * Pip version:
 * Python version:
 * Operating system:
-
-### Description:
-
-// REPLACE ME: What are you trying to get done, what has happened, what went wrong, and what did you expect?
-
-### What I've run:
-
-```
-// REPLACE ME: Paste a log of command(s) you ran and pip's output, tracebacks, etc, here
-```

.github/ISSUE_TEMPLATE/bug-report.md

@@ -0,0 +1,33 @@
+---
+name: Bug report
+about: Create a report to help us improve
+
+---
+
+**Environment**
+
+* pip version:
+* Python version:
+* OS:
+
+<!-- Feel free to add more information about your environment here -->
+
+**Description**
+<!-- A clear and concise description of what the bug is. -->
+
+**Expected behavior**
+<!-- A clear and concise description of what you expected to happen. -->
+
+**How to Reproduce**
+<!-- Describe the steps to reproduce this bug. -->
+
+1. Get package from '...'
+2. Then run '...'
+3. An error occurs.
+
+**Output**
+
+```
+Paste the output of the steps above, including the commands themselves and
+pip's output/traceback etc.
+```

.github/ISSUE_TEMPLATE/feature-request.md

@@ -0,0 +1,17 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+
+---
+
+**What's the problem this feature will solve?**
+<!-- A clear and concise description of what the problem is. -->
+
+**Describe the solution you'd like**
+<!-- A clear and concise description of what you want to happen. -->
+
+**Alternative Solutions**
+<!-- A clear and concise description of any alternative solutions or features you've considered. -->
+
+**Additional context**
+<!-- Add any other context, links, etc. about the feature here. -->

appveyor.yml

@@ -1,14 +1,12 @@
 environment:
   matrix:
-    # Unit and integration tests. 
+    # Unit and integration tests.
     - PYTHON: "C:\\Python27"
       RUN_INTEGRATION_TESTS: "True"
     - PYTHON: "C:\\Python36-x64"
       RUN_INTEGRATION_TESTS: "True"
     # Unit tests only.
     - PYTHON: "C:\\Python27-x64"
-    - PYTHON: "C:\\Python33"
-    - PYTHON: "C:\\Python33-x64"
     - PYTHON: "C:\\Python34"
     - PYTHON: "C:\\Python34-x64"
     - PYTHON: "C:\\Python35"

docs/installing.rst

@@ -102,7 +102,7 @@ On Windows [4]_::
 Python and OS Compatibility
 ---------------------------
 
-pip works with CPython versions 2.7, 3.3, 3.4, 3.5, 3.6 and also pypy.
+pip works with CPython versions 2.7, 3.4, 3.5, 3.6 and also pypy.
 
 This means pip works on the latest patch version of each of these minor
 versions. Previous patch versions are supported on a best effort approach.

news/3796.removal

@@ -0,0 +1 @@
+Dropped support for Python 3.3.

news/5366.bugfix

@@ -0,0 +1 @@
+Check for file existence and unlink first when clobbering existing files during a wheel install.

setup.py

@@ -51,7 +51,6 @@ def find_version(*file_paths):
         "Programming Language :: Python :: 2",
         "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.3",
         "Programming Language :: Python :: 3.4",
         "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.6",
@@ -83,7 +82,7 @@ def find_version(*file_paths):
     },
     tests_require=tests_require,
     zip_safe=False,
-    python_requires='>=2.7,!=3.0.*,!=3.1.*,!=3.2.*',
+    python_requires='>=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*',
     extras_require={
         'testing': tests_require,
     },

src/pip/_internal/basecommand.py

@@ -6,7 +6,6 @@
 import optparse
 import os
 import sys
-import warnings
 
 from pip._internal import cmdoptions
 from pip._internal.baseparser import (
@@ -26,7 +25,6 @@
     ERROR, PREVIOUS_BUILD_DIR_ERROR, SUCCESS, UNKNOWN_ERROR,
     VIRTUALENV_NOT_FOUND,
 )
-from pip._internal.utils import deprecation
 from pip._internal.utils.logging import IndentingFormatter
 from pip._internal.utils.misc import get_prog, normalize_path
 from pip._internal.utils.outdated import pip_version_check
@@ -198,13 +196,6 @@ def main(self, args):
             },
         })
 
-        if sys.version_info[:2] == (3, 3):
-            warnings.warn(
-                "Python 3.3 support has been deprecated and will be dropped "
-                "in the future. Please upgrade your Python.",
-                deprecation.RemovedInPip11Warning,
-            )
-
         # TODO: try to get these passing down from the command?
         #      without resorting to os.environ to hold these.
 

src/pip/_internal/wheel.py

@@ -285,6 +285,17 @@ def clobber(source, dest, is_base, fixer=None, filter=None):
                 # uninstalled.
                 ensure_dir(destdir)
 
+                # copyfile (called below) truncates the destination if it
+                # exists and then writes the new contents. This is fine in most
+                # cases, but can cause a segfault if pip has loaded a shared
+                # object (e.g. from pyopenssl through its vendored urllib3)
+                # Since the shared object is mmap'd an attempt to call a
+                # symbol in it will then cause a segfault. Unlinking the file
+                # allows writing of new contents while allowing the process to
+                # continue to use the old copy.
+                if os.path.exists(destfile):
+                    os.unlink(destfile)
+
                 # We use copyfile (not move, copy, or copy2) to be extra sure
                 # that we are not moving directories over (copyfile fails for
                 # directories) as well as to ensure that we are not copying

tests/functional/test_install.py

@@ -32,16 +32,11 @@ def test_pep518_uses_build_env(script, data, original_setuptools):
         raise ValueError(original_setuptools)
     to_install = data.src.join("pep518-3.0")
     for command in ('install', 'wheel'):
-        kwargs = {}
-        if sys.version_info[:2] == (3, 3):
-            # Ignore Python 3.3 deprecation warning...
-            kwargs['expect_stderr'] = True
         script.run(
             "python", "-c",
             "import pip._internal; pip._internal.main(["
             "%r, " "'-f', %r, " "%r, "
             "])" % (command, str(data.packages), str(to_install)),
-            **kwargs
         )
 
 
@@ -55,16 +50,11 @@ def test_pep518_with_user_pip(script, virtualenv, pip_src, data):
         fp.write('raise ImportError\n')
     to_install = data.src.join("pep518-3.0")
     for command in ('install', 'wheel'):
-        kwargs = {}
-        if sys.version_info[:2] == (3, 3):
-            # Ignore Python 3.3 deprecation warning...
-            kwargs['expect_stderr'] = True
         script.run(
             "python", "-c",
             "import pip._internal; pip._internal.main(["
             "%r, " "'-f', %r, " "%r, "
             "])" % (command, str(data.packages), str(to_install)),
-            **kwargs
         )
 
 
@@ -76,7 +66,7 @@ def test_pip_second_command_line_interface_works(script, data):
     # On old versions of Python, urllib3/requests will raise a warning about
     # the lack of an SSLContext.
     kwargs = {}
-    if pyversion_tuple < (2, 7, 9) or pyversion_tuple[:2] == (3, 3):
+    if pyversion_tuple < (2, 7, 9):
         kwargs['expect_stderr'] = True
 
     args = ['pip%s' % pyversion]

tests/lib/__init__.py

@@ -372,9 +372,6 @@ def pip(self, *args, **kwargs):
         if (pyversion_tuple < (2, 7, 9) and
                 args and args[0] in ('search', 'install', 'download')):
             kwargs['expect_stderr'] = True
-        # Python 3.3 is deprecated and we emit a warning on it.
-        if pyversion_tuple[:2] == (3, 3):
-            kwargs['expect_stderr'] = True
         if kwargs.pop('use_module', False):
             exe = 'python'
             args = ('-m', 'pip') + args

tox.ini

@@ -1,7 +1,7 @@
 [tox]
 envlist =
     docs, packaging, lint-py2, lint-py3, mypy,
-    py27, py33, py34, py35, py36, py37, pypy
+    py27, py34, py35, py36, py37, pypy
 
 [testenv]
 passenv = CI GIT_SSL_CAINFO