Bug 930808 - Upgrade virtualenv to 12.0.2; r=glandium
Source archive downloaded from https://pypi.python.org/packages/source/v/virtualenv/virtualenv-12.0.2.tar.gz and uncompressed into python/virtualenv. The egg-info directory was removed.
This commit is contained in:
@@ -3,8 +3,31 @@ import re
|
||||
import shutil
|
||||
import sys
|
||||
|
||||
if sys.version_info[:2] < (2, 6):
|
||||
sys.exit('virtualenv requires Python 2.6 or higher.')
|
||||
|
||||
try:
|
||||
from setuptools import setup
|
||||
from setuptools.command.test import test as TestCommand
|
||||
|
||||
class PyTest(TestCommand):
|
||||
user_options = [('pytest-args=', 'a', "Arguments to pass to py.test")]
|
||||
|
||||
def initialize_options(self):
|
||||
TestCommand.initialize_options(self)
|
||||
self.pytest_args = None
|
||||
|
||||
def finalize_options(self):
|
||||
TestCommand.finalize_options(self)
|
||||
self.test_args = []
|
||||
self.test_suite = True
|
||||
|
||||
def run_tests(self):
|
||||
# import here, because outside the eggs aren't loaded
|
||||
import pytest
|
||||
errno = pytest.main(self.pytest_args)
|
||||
sys.exit(errno)
|
||||
|
||||
setup_params = {
|
||||
'entry_points': {
|
||||
'console_scripts': [
|
||||
@@ -13,13 +36,14 @@ try:
|
||||
],
|
||||
},
|
||||
'zip_safe': False,
|
||||
'test_suite': 'nose.collector',
|
||||
'tests_require': ['nose', 'Mock'],
|
||||
'cmdclass': {'test': PyTest},
|
||||
'tests_require': ['pytest', 'mock'],
|
||||
}
|
||||
except ImportError:
|
||||
from distutils.core import setup
|
||||
if sys.platform == 'win32':
|
||||
print('Note: without Setuptools installed you will have to use "python -m virtualenv ENV"')
|
||||
print('Note: without Setuptools installed you will '
|
||||
'have to use "python -m virtualenv ENV"')
|
||||
setup_params = {}
|
||||
else:
|
||||
script = 'scripts/virtualenv'
|
||||
@@ -27,22 +51,21 @@ except ImportError:
|
||||
shutil.copy(script, script_ver)
|
||||
setup_params = {'scripts': [script, script_ver]}
|
||||
|
||||
here = os.path.dirname(os.path.abspath(__file__))
|
||||
|
||||
## Get long_description from index.txt:
|
||||
f = open(os.path.join(here, 'docs', 'index.rst'))
|
||||
long_description = f.read().strip()
|
||||
long_description = long_description.split('split here', 1)[1]
|
||||
f.close()
|
||||
f = open(os.path.join(here, 'docs', 'news.rst'))
|
||||
long_description += "\n\n" + f.read()
|
||||
f.close()
|
||||
def read_file(*paths):
|
||||
here = os.path.dirname(os.path.abspath(__file__))
|
||||
with open(os.path.join(here, *paths)) as f:
|
||||
return f.read()
|
||||
|
||||
# Get long_description from index.rst:
|
||||
long_description = read_file('docs', 'index.rst')
|
||||
long_description = long_description.strip().split('split here', 1)[0]
|
||||
# Add release history
|
||||
long_description += "\n\n" + read_file('docs', 'changes.rst')
|
||||
|
||||
|
||||
def get_version():
|
||||
f = open(os.path.join(here, 'virtualenv.py'))
|
||||
version_file = f.read()
|
||||
f.close()
|
||||
version_file = read_file('virtualenv.py')
|
||||
version_match = re.search(r"^__version__ = ['\"]([^'\"]*)['\"]",
|
||||
version_file, re.M)
|
||||
if version_match:
|
||||
@@ -55,7 +78,7 @@ def get_version():
|
||||
# running python setup.py test (see
|
||||
# http://www.eby-sarna.com/pipermail/peak/2010-May/003357.html)
|
||||
try:
|
||||
import multiprocessing
|
||||
import multiprocessing # noqa
|
||||
except ImportError:
|
||||
pass
|
||||
|
||||
@@ -69,7 +92,6 @@ setup(
|
||||
'Intended Audience :: Developers',
|
||||
'License :: OSI Approved :: MIT License',
|
||||
'Programming Language :: Python :: 2',
|
||||
'Programming Language :: Python :: 2.5',
|
||||
'Programming Language :: Python :: 2.6',
|
||||
'Programming Language :: Python :: 2.7',
|
||||
'Programming Language :: Python :: 3',
|
||||
@@ -81,7 +103,7 @@ setup(
|
||||
author_email='ianb@colorstudy.com',
|
||||
maintainer='Jannis Leidel, Carl Meyer and Brian Rosner',
|
||||
maintainer_email='python-virtualenv@groups.google.com',
|
||||
url='http://www.virtualenv.org',
|
||||
url='https://virtualenv.pypa.io/',
|
||||
license='MIT',
|
||||
py_modules=['virtualenv'],
|
||||
packages=['virtualenv_support'],
|
||||
|
||||
Reference in New Issue
Block a user