mirror of
https://github.com/pypa/pip
synced 2023-12-13 21:30:23 +01:00
Merge
This commit is contained in:
commit
73c352ddab
2
pip.py
2
pip.py
|
@ -439,8 +439,8 @@ class InstallCommand(Command):
|
|||
install_options = options.install_options or []
|
||||
index_urls = [options.index_url] + options.extra_index_urls
|
||||
if options.no_index:
|
||||
index_urls = []
|
||||
logger.notify('Ignoring indexes: %s' % ','.join(index_urls))
|
||||
index_urls = []
|
||||
finder = PackageFinder(
|
||||
find_links=options.find_links,
|
||||
index_urls=index_urls)
|
||||
|
|
7
setup.py
7
setup.py
|
@ -1,12 +1,9 @@
|
|||
import sys
|
||||
if sys.platform == 'win32':
|
||||
from setuptools import setup
|
||||
else:
|
||||
from distutils.core import setup
|
||||
from setuptools import setup
|
||||
import os
|
||||
|
||||
|
||||
version = '0.4'
|
||||
version = '0.4.1'
|
||||
|
||||
doc_dir = os.path.join(os.path.dirname(__file__), 'docs')
|
||||
index_filename = os.path.join(doc_dir, 'index.txt')
|
||||
|
|
Loading…
Reference in a new issue