McSinyx
/
pip
mirror of https://github.com/pypa/pip
1
1
Fork 0
Code Issues Releases Activity

Fix for latest setuptools

This commit is contained in:
Donald Stufft 2014-11-19 17:05:14 -05:00
parent a2d7a32018
commit 5f0692b40a
6 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/data/packages/FSPkg/setup.cfg
View File

@ -1,2 +0,0 @@
[egg_info]
tag_build = dev

2
tests/data/packages/FSPkg/setup.py
View File

@ -1,6 +1,6 @@
from setuptools import setup, find_packages
version = '0.1'
version = '0.1dev'
setup(name='FSPkg',
version=version,

11
tests/functional/test_install.py
View File

@ -1,3 +1,4 @@
import os
import textwrap
import glob
@ -298,7 +299,7 @@ def test_install_from_local_directory(script, data):
result = script.pip('install', to_install, expect_error=False)
fspkg_folder = script.site_packages / 'fspkg'
egg_info_folder = (
script.site_packages / 'FSPkg-0.1dev-py%s.egg-info' % pyversion
script.site_packages / 'FSPkg-0.1.dev0-py%s.egg-info' % pyversion
)
assert fspkg_folder in result.files_created, str(result.stdout)
assert egg_info_folder in result.files_created, str(result)
@ -313,7 +314,7 @@ def test_install_from_local_directory_with_symlinks_to_directories(
result = script.pip('install', to_install, expect_error=False)
pkg_folder = script.site_packages / 'symlinks'
egg_info_folder = (
script.site_packages / 'symlinks-0.1dev-py%s.egg-info' % pyversion
script.site_packages / 'symlinks-0.1.dev0-py%s.egg-info' % pyversion
)
assert pkg_folder in result.files_created, str(result.stdout)
assert egg_info_folder in result.files_created, str(result)
@ -344,7 +345,7 @@ def test_install_as_egg(script, data):
to_install = data.packages.join("FSPkg")
result = script.pip('install', to_install, '--egg', expect_error=False)
fspkg_folder = script.site_packages / 'fspkg'
egg_folder = script.site_packages / 'FSPkg-0.1dev-py%s.egg' % pyversion
egg_folder = script.site_packages / 'FSPkg-0.1.dev0-py%s.egg' % pyversion
assert fspkg_folder not in result.files_created, str(result.stdout)
assert egg_folder in result.files_created, str(result)
assert join(egg_folder, 'fspkg') in result.files_created, str(result)
@ -362,7 +363,7 @@ def test_install_curdir(script, data):
result = script.pip('install', curdir, cwd=run_from, expect_error=False)
fspkg_folder = script.site_packages / 'fspkg'
egg_info_folder = (
script.site_packages / 'FSPkg-0.1dev-py%s.egg-info' % pyversion
script.site_packages / 'FSPkg-0.1.dev0-py%s.egg-info' % pyversion
)
assert fspkg_folder in result.files_created, str(result.stdout)
assert egg_info_folder in result.files_created, str(result)
@ -376,7 +377,7 @@ def test_install_pardir(script, data):
result = script.pip('install', pardir, cwd=run_from, expect_error=False)
fspkg_folder = script.site_packages / 'fspkg'
egg_info_folder = (
script.site_packages / 'FSPkg-0.1dev-py%s.egg-info' % pyversion
script.site_packages / 'FSPkg-0.1.dev0-py%s.egg-info' % pyversion
)
assert fspkg_folder in result.files_created, str(result.stdout)
assert egg_info_folder in result.files_created, str(result)

2
tests/functional/test_install_reqs.py
View File

@ -66,7 +66,7 @@ def test_relative_requirements_file(script, data):
'install', '-vvv', '-r', script.scratch_path / 'file-egg-req.txt'
)
assert (
script.site_packages / 'FSPkg-0.1dev-py%s.egg-info' % pyversion
script.site_packages / 'FSPkg-0.1.dev0-py%s.egg-info' % pyversion
) in result.files_created, str(result)
assert (script.site_packages / 'fspkg') in result.files_created, (
str(result.stdout)

2
tests/functional/test_install_user.py
View File

@ -83,7 +83,7 @@ class Tests_UserSite:
)
fspkg_folder = script.user_site / 'fspkg'
egg_info_folder = (
script.user_site / 'FSPkg-0.1dev-py%s.egg-info' % pyversion
script.user_site / 'FSPkg-0.1.dev0-py%s.egg-info' % pyversion
)
assert fspkg_folder in result.files_created, result.stdout

2
tests/functional/test_uninstall.py
View File

@ -283,7 +283,7 @@ def test_uninstall_as_egg(script, data):
to_install = data.packages.join("FSPkg")
result = script.pip('install', to_install, '--egg', expect_error=False)
fspkg_folder = script.site_packages / 'fspkg'
egg_folder = script.site_packages / 'FSPkg-0.1dev-py%s.egg' % pyversion
egg_folder = script.site_packages / 'FSPkg-0.1.dev0-py%s.egg' % pyversion
assert fspkg_folder not in result.files_created, str(result.stdout)
assert egg_folder in result.files_created, str(result)