Merge branch 'master' into resolve-symlink

news/3644.trivial.rst

@@ -0,0 +1 @@
+Use tablib instead of requests in tests to avoid failures when vendored

tests/integration/test_cli.py

@@ -84,46 +84,60 @@ def test_pipenv_rm(PipenvInstance):
 @pytest.mark.cli
 def test_pipenv_graph(PipenvInstance):
  with PipenvInstance() as p:
- c = p.pipenv('install requests')
+ c = p.pipenv('install tablib')
  assert c.ok
  graph = p.pipenv("graph")
  assert graph.ok
- assert "requests" in graph.out
+ assert "tablib" in graph.out
  graph_json = p.pipenv("graph --json")
  assert graph_json.ok
- assert "requests" in graph_json.out
+ assert "tablib" in graph_json.out
  graph_json_tree = p.pipenv("graph --json-tree")
  assert graph_json_tree.ok
- assert "requests" in graph_json_tree.out
+ assert "tablib" in graph_json_tree.out
 
 
 @pytest.mark.cli
 def test_pipenv_graph_reverse(PipenvInstance):
  with PipenvInstance() as p:
- c = p.pipenv('install requests==2.18.4')
+ c = p.pipenv('install tablib==0.13.0')
  assert c.ok
  c = p.pipenv('graph --reverse')
  assert c.ok
  output = c.out
 
+ c = p.pipenv('graph --reverse --json')
+ assert c.return_code == 1
+ assert 'Warning: Using both --reverse and --json together is not supported.' in c.err
+
  requests_dependency = [
- ('certifi', 'certifi>=2017.4.17'),
- ('chardet', 'chardet(>=3.0.2,<3.1.0|<3.1.0,>=3.0.2)'),
- ('idna', 'idna(>=2.5,<2.7|<2.7,>=2.5)'),
- ('urllib3', 'urllib3(>=1.21.1,<1.23|<1.23,>=1.21.1)')
+ ('backports.csv', 'backports.csv'),
+ ('odfpy', 'odfpy'),
+ ('openpyxl', 'openpyxl>=2.4.0'),
+ ('pyyaml', 'pyyaml'),
+ ('xlrd', 'xlrd'),
+ ('xlwt', 'xlwt'),
  ]
 
  for dep_name, dep_constraint in requests_dependency:
- dep_match = re.search(r'^{}==[\d.]+$'.format(dep_name), output, flags=re.MULTILINE)
- dep_requests_match = re.search(r'^ - requests==2.18.4 \[requires: {}\]$'.format(dep_constraint), output, flags=re.MULTILINE)
- assert dep_match is not None
- assert dep_requests_match is not None
+ pat = r'^[ -]*{}==[\d.]+'.format(dep_name)
+ dep_match = re.search(pat, output, flags=re.MULTILINE)
+ assert dep_match is not None, '{} not found in {}'.format(pat, output)
+
+ # openpyxl should be indented
+ if dep_name == 'openpyxl':
+ openpyxl_dep = re.search(r'^openpyxl', output, flags=re.MULTILINE)
+ assert openpyxl_dep is None, 'openpyxl should not appear at begining of lines in {}'.format(output)
+
+ assert ' - openpyxl==2.5.4 [requires: et-xmlfile]' in output
+ else:
+ dep_match = re.search(r'^[ -]*{}==[\d.]+$'.format(dep_name), output, flags=re.MULTILINE)
+ assert dep_match is not None, '{} not found at beginning of line in {}'.format(dep_name, output)
+
+ dep_requests_match = re.search(r'^ +- tablib==0.13.0 \[requires: {}\]$'.format(dep_constraint), output, flags=re.MULTILINE)
+ assert dep_requests_match is not None, 'constraint {} not found in {}'.format(dep_constraint, output)
  assert dep_requests_match.start() > dep_match.start()
 
- c = p.pipenv('graph --reverse --json')
- assert c.return_code == 1
- assert 'Warning: Using both --reverse and --json together is not supported.' in c.err
-
 
 @pytest.mark.cli
 @pytest.mark.needs_internet(reason='required by check')

tests/integration/test_install_basic.py

@@ -122,16 +122,16 @@ def test_install_without_dev(PipenvInstance):
 six = "*"
 
 [dev-packages]
-pytz = "*"
+tablib = "*"
  """.strip()
  f.write(contents)
  c = p.pipenv("install")
  assert c.return_code == 0
  assert "six" in p.pipfile["packages"]
- assert "pytz" in p.pipfile["dev-packages"]
+ assert "tablib" in p.pipfile["dev-packages"]
  assert "six" in p.lockfile["default"]
- assert "pytz" in p.lockfile["develop"]
- c = p.pipenv('run python -c "import pytz"')
+ assert "tablib" in p.lockfile["develop"]
+ c = p.pipenv('run python -c "import tablib"')
  assert c.return_code != 0
  c = p.pipenv('run python -c "import six"')
  assert c.return_code == 0

tests/integration/test_pipenv.py

@@ -62,22 +62,23 @@ def test_deploy_works(PipenvInstance):
 @pytest.mark.update
 @pytest.mark.lock
 def test_update_locks(PipenvInstance):
-
  with PipenvInstance() as p:
- c = p.pipenv('install requests==2.14.0')
+ c = p.pipenv('install jdcal==1.3')
  assert c.return_code == 0
+ assert p.lockfile['default']['jdcal']['version'] == '==1.3'
  with open(p.pipfile_path, 'r') as fh:
  pipfile_contents = fh.read()
- pipfile_contents = pipfile_contents.replace('==2.14.0', '*')
+ assert '==1.3' in pipfile_contents
+ pipfile_contents = pipfile_contents.replace('==1.3', '*')
  with open(p.pipfile_path, 'w') as fh:
  fh.write(pipfile_contents)
- c = p.pipenv('update requests')
+ c = p.pipenv('update jdcal')
  assert c.return_code == 0
- assert p.lockfile['default']['requests']['version'] == '==2.19.1'
+ assert p.lockfile['default']['jdcal']['version'] == '==1.4'
  c = p.pipenv('run pip freeze')
  assert c.return_code == 0
  lines = c.out.splitlines()
- assert 'requests==2.19.1' in [l.strip() for l in lines]
+ assert 'jdcal==1.4' in [l.strip() for l in lines]
 
 
 @pytest.mark.project

tests/integration/test_project.py

@@ -155,16 +155,16 @@ def test_many_indexes(PipenvInstance):
 @pytest.mark.install
 @pytest.mark.project
 def test_include_editable_packages(PipenvInstance, testsroot, pathlib_tmpdir):
- file_name = "requests-2.19.1.tar.gz"
- package = pathlib_tmpdir.joinpath("requests-2.19.1")
- source_path = os.path.abspath(os.path.join(testsroot, "test_artifacts", file_name))
+ file_name = "tablib-0.12.1.tar.gz"
+ package = pathlib_tmpdir.joinpath("tablib-0.12.1")
+ source_path = os.path.abspath(os.path.join(testsroot, "pypi", "tablib", file_name))
  with PipenvInstance(chdir=True) as p:
  with tarfile.open(source_path, "r:gz") as tarinfo:
  tarinfo.extractall(path=str(pathlib_tmpdir))
  c = p.pipenv('install -e {0}'.format(package.as_posix()))
  assert c.return_code == 0
  project = Project()
- assert "requests" in [
+ assert "tablib" in [
  package.project_name
  for package in project.environment.get_installed_packages()
  ]

tests/integration/test_uninstall.py

@@ -11,30 +11,48 @@
 @pytest.mark.run
 @pytest.mark.uninstall
 @pytest.mark.install
-def test_uninstall(PipenvInstance):
+def test_uninstall_requests(PipenvInstance):
+ # Uninstalling requests can fail even when uninstall Django below
+ # succeeds, if requests was de-vendored.
+ # See https://github.com/pypa/pipenv/issues/3644 for problems
+ # caused by devendoring
  with PipenvInstance() as p:
  c = p.pipenv("install requests")
  assert c.return_code == 0
  assert "requests" in p.pipfile["packages"]
- assert "requests" in p.lockfile["default"]
- assert "chardet" in p.lockfile["default"]
- assert "idna" in p.lockfile["default"]
- assert "urllib3" in p.lockfile["default"]
- assert "certifi" in p.lockfile["default"]
+
+ c = p.pipenv("run python -m requests.help")
+ assert c.return_code == 0
 
  c = p.pipenv("uninstall requests")
  assert c.return_code == 0
  assert "requests" not in p.pipfile["dev-packages"]
- assert "requests" not in p.lockfile["develop"]
- assert "chardet" not in p.lockfile["develop"]
- assert "idna" not in p.lockfile["develop"]
- assert "urllib3" not in p.lockfile["develop"]
- assert "certifi" not in p.lockfile["develop"]
 
  c = p.pipenv("run python -m requests.help")
  assert c.return_code > 0
 
 
+def test_uninstall_django(PipenvInstance):
+ with PipenvInstance() as p:
+ c = p.pipenv("install Django==1.11.13")
+ assert c.return_code == 0
+ assert "django" in p.pipfile["packages"]
+ assert "django" in p.lockfile["default"]
+ assert "pytz" in p.lockfile["default"]
+
+ c = p.pipenv("run python -m django --version")
+ assert c.return_code == 0
+
+ c = p.pipenv("uninstall Django")
+ assert c.return_code == 0
+ assert "django" not in p.pipfile["dev-packages"]
+ assert "django" not in p.lockfile["develop"]
+ assert p.lockfile["develop"] == {}
+
+ c = p.pipenv("run python -m django --version")
+ assert c.return_code > 0
+
+
 @pytest.mark.run
 @pytest.mark.uninstall
 @pytest.mark.install
@@ -46,90 +64,89 @@ def test_mirror_uninstall(PipenvInstance):
  )
  assert "pypi.org" not in mirror_url
 
- c = p.pipenv("install requests --pypi-mirror {0}".format(mirror_url))
+ c = p.pipenv("install Django==1.11.13 --pypi-mirror {0}".format(mirror_url))
  assert c.return_code == 0
- assert "requests" in p.pipfile["packages"]
- assert "requests" in p.lockfile["default"]
- assert "chardet" in p.lockfile["default"]
- assert "idna" in p.lockfile["default"]
- assert "urllib3" in p.lockfile["default"]
- assert "certifi" in p.lockfile["default"]
+ assert "django" in p.pipfile["packages"]
+ assert "django" in p.lockfile["default"]
+ assert "pytz" in p.lockfile["default"]
  # Ensure the --pypi-mirror parameter hasn't altered the Pipfile or Pipfile.lock sources
  assert len(p.pipfile["source"]) == 1
  assert len(p.lockfile["_meta"]["sources"]) == 1
  assert "https://pypi.org/simple" == p.pipfile["source"][0]["url"]
  assert "https://pypi.org/simple" == p.lockfile["_meta"]["sources"][0]["url"]
 
- c = p.pipenv("uninstall requests --pypi-mirror {0}".format(mirror_url))
+ c = p.pipenv("run python -m django --version")
  assert c.return_code == 0
- assert "requests" not in p.pipfile["dev-packages"]
- assert "requests" not in p.lockfile["develop"]
- assert "chardet" not in p.lockfile["develop"]
- assert "idna" not in p.lockfile["develop"]
- assert "urllib3" not in p.lockfile["develop"]
- assert "certifi" not in p.lockfile["develop"]
+
+ c = p.pipenv("uninstall Django --pypi-mirror {0}".format(mirror_url))
+ assert c.return_code == 0
+ assert "django" not in p.pipfile["dev-packages"]
+ assert "django" not in p.lockfile["develop"]
+ assert p.lockfile["develop"] == {}
  # Ensure the --pypi-mirror parameter hasn't altered the Pipfile or Pipfile.lock sources
  assert len(p.pipfile["source"]) == 1
  assert len(p.lockfile["_meta"]["sources"]) == 1
  assert "https://pypi.org/simple" == p.pipfile["source"][0]["url"]
  assert "https://pypi.org/simple" == p.lockfile["_meta"]["sources"][0]["url"]
 
- c = p.pipenv("run python -m requests.help")
+ c = p.pipenv("run python -m django --version")
  assert c.return_code > 0
 
 
 @pytest.mark.files
 @pytest.mark.uninstall
 @pytest.mark.install
 def test_uninstall_all_local_files(PipenvInstance, testsroot):
- file_name = "requests-2.19.1.tar.gz"
+ file_name = "tablib-0.12.1.tar.gz"
  # Not sure where travis/appveyor run tests from
- source_path = os.path.abspath(os.path.join(testsroot, "test_artifacts", file_name))
+ source_path = os.path.abspath(os.path.join(testsroot, "pypi", "tablib", file_name))
 
  with PipenvInstance(chdir=True) as p:
  shutil.copy(source_path, os.path.join(p.path, file_name))
- os.mkdir(os.path.join(p.path, "requests"))
+ os.mkdir(os.path.join(p.path, "tablib"))
  c = p.pipenv("install {}".format(file_name))
  assert c.return_code == 0
  c = p.pipenv("uninstall --all")
  assert c.return_code == 0
- assert "requests" in c.out
+ assert "tablib" in c.out
  # Uninstall --all is not supposed to remove things from the pipfile
  # Note that it didn't before, but that instead local filenames showed as hashes
- assert "requests" in p.pipfile["packages"]
+ assert "tablib" in p.pipfile["packages"]
 
 
 @pytest.mark.run
 @pytest.mark.uninstall
 @pytest.mark.install
 def test_uninstall_all_dev(PipenvInstance):
  with PipenvInstance() as p:
- c = p.pipenv("install --dev requests six")
+ c = p.pipenv("install --dev Django==1.11.13 six")
  assert c.return_code == 0
 
- c = p.pipenv("install pytz")
+ c = p.pipenv("install tablib")
  assert c.return_code == 0
 
- assert "pytz" in p.pipfile["packages"]
- assert "requests" in p.pipfile["dev-packages"]
+ assert "tablib" in p.pipfile["packages"]
+ assert "django" in p.pipfile["dev-packages"]
  assert "six" in p.pipfile["dev-packages"]
- assert "pytz" in p.lockfile["default"]
- assert "requests" in p.lockfile["develop"]
+ assert "tablib" in p.lockfile["default"]
+ assert "django" in p.lockfile["develop"]
  assert "six" in p.lockfile["develop"]
 
+ c = p.pipenv('run python -c "import django"')
+ assert c.return_code == 0
+
  c = p.pipenv("uninstall --all-dev")
  assert c.return_code == 0
- assert "requests" not in p.pipfile["dev-packages"]
- assert "six" not in p.pipfile["dev-packages"]
- assert "requests" not in p.lockfile["develop"]
+ assert p.pipfile["dev-packages"] == {}
+ assert "django" not in p.lockfile["develop"]
  assert "six" not in p.lockfile["develop"]
- assert "pytz" in p.pipfile["packages"]
- assert "pytz" in p.lockfile["default"]
+ assert "tablib" in p.pipfile["packages"]
+ assert "tablib" in p.lockfile["default"]
 
- c = p.pipenv("run python -m requests.help")
+ c = p.pipenv('run python -c "import django"')
  assert c.return_code > 0
 
- c = p.pipenv('run python -c "import pytz"')
+ c = p.pipenv('run python -c "import tablib"')
  assert c.return_code == 0