[Python-checkins] r53877 - in sandbox/branches/setuptools-0.6: EasyInstall.txt pkg_resources.py setuptools/command/develop.py setuptools/command/easy_install.py setuptools/package_index.py
phillip.eby
python-checkins at python.org
Fri Feb 23 21:30:01 CET 2007
Author: phillip.eby
Date: Fri Feb 23 21:29:58 2007
New Revision: 53877
Modified:
sandbox/branches/setuptools-0.6/EasyInstall.txt
sandbox/branches/setuptools-0.6/pkg_resources.py
sandbox/branches/setuptools-0.6/setuptools/command/develop.py
sandbox/branches/setuptools-0.6/setuptools/command/easy_install.py
sandbox/branches/setuptools-0.6/setuptools/package_index.py
Log:
Added ``--local-snapshots-ok`` flag, to allow building eggs from
projects installed using ``setup.py develop``. (backport from trunk)
Modified: sandbox/branches/setuptools-0.6/EasyInstall.txt
==============================================================================
--- sandbox/branches/setuptools-0.6/EasyInstall.txt (original)
+++ sandbox/branches/setuptools-0.6/EasyInstall.txt Fri Feb 23 21:29:58 2007
@@ -383,6 +383,13 @@
even if they're installed elsewhere on the machine, and ``-d`` indicates the
directory to place the eggs in.)
+You can also build the eggs from local development packages that were installed
+with the ``setup.py develop`` command, by including the ``-l`` option, e.g.::
+
+ easy_install -zmaxld somedir SomePackage
+
+This will use locally-available source distributions to build the eggs.
+
Packaging Others' Projects As Eggs
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -887,6 +894,25 @@
script directories, and does not override the ones set on the command line
or in a configuration file.
+``--local-snapshots-ok, -l`` (New in 0.6c6)
+ Normally, EasyInstall prefers to only install *released* versions of
+ projects, not in-development ones, because such projects may not
+ have a currently-valid version number. So, it usually only installs them
+ when their ``setup.py`` directory is explicitly passed on the command line.
+
+ However, if this option is used, then any in-development projects that were
+ installed using the ``setup.py develop`` command, will be used to build
+ eggs, effectively upgrading the "in-development" project to a snapshot
+ release. Normally, this option is used only in conjunction with the
+ ``--always-copy`` option to create a distributable snapshot of every egg
+ needed to run an application.
+
+ Note that if you use this option, you must make sure that there is a valid
+ version number (such as an SVN revision number tag) for any in-development
+ projects that may be used, as otherwise EasyInstall may not be able to tell
+ what version of the project is "newer" when future installations or
+ upgrades are attempted.
+
.. _non-root installation:
@@ -1201,6 +1227,9 @@
* Fixed distutils-style scripts originally built on Windows having their line
endings doubled when installed on any platform.
+
+ * Added ``--local-snapshots-ok`` flag, to allow building eggs from projects
+ installed using ``setup.py develop``.
0.6c5
* Fixed ``.dll`` files on Cygwin not having executable permisions when an egg
Modified: sandbox/branches/setuptools-0.6/pkg_resources.py
==============================================================================
--- sandbox/branches/setuptools-0.6/pkg_resources.py (original)
+++ sandbox/branches/setuptools-0.6/pkg_resources.py Fri Feb 23 21:29:58 2007
@@ -1676,7 +1676,7 @@
if not line.strip(): continue
for item in find_distributions(os.path.join(path_item,line.rstrip())):
yield item
-
+ break
register_finder(ImpWrapper,find_on_path)
_namespace_handlers = {}
Modified: sandbox/branches/setuptools-0.6/setuptools/command/develop.py
==============================================================================
--- sandbox/branches/setuptools-0.6/setuptools/command/develop.py (original)
+++ sandbox/branches/setuptools-0.6/setuptools/command/develop.py Fri Feb 23 21:29:58 2007
@@ -31,7 +31,7 @@
self.uninstall = None
self.egg_path = None
easy_install.initialize_options(self)
-
+ self.setup_path = None
@@ -61,6 +61,7 @@
" directory to "+target
)
+
# Make a distribution for the package's source
self.dist = Distribution(
target,
@@ -68,16 +69,15 @@
project_name = ei.egg_name
)
-
-
-
-
-
-
-
-
-
-
+ p = self.egg_base.replace(os.sep,'/')
+ if p!= os.curdir:
+ p = '../' * (p.count('/')+1)
+ self.setup_path = p
+ p = normalize_path(os.path.join(self.install_dir, self.egg_path, p))
+ if p != normalize_path(os.curdir):
+ raise DistutilsOptionError(
+ "Can't get a consistent path to setup script from"
+ " installation directory", p, normalize_path(os.curdir))
def install_for_development(self):
@@ -95,7 +95,7 @@
log.info("Creating %s (link to %s)", self.egg_link, self.egg_base)
if not self.dry_run:
f = open(self.egg_link,"w")
- f.write(self.egg_path)
+ f.write(self.egg_path + "\n" + self.setup_path)
f.close()
# postprocess the installed distro, fixing up .pth, installing scripts,
# and handling requirements
@@ -106,7 +106,7 @@
if os.path.exists(self.egg_link):
log.info("Removing %s (link to %s)", self.egg_link, self.egg_base)
contents = [line.rstrip() for line in file(self.egg_link)]
- if contents != [self.egg_path]:
+ if contents not in ([self.egg_path], [self.egg_path, self.setup_path]):
log.warn("Link points to %s: uninstall aborted", contents)
return
if not self.dry_run:
Modified: sandbox/branches/setuptools-0.6/setuptools/command/easy_install.py
==============================================================================
--- sandbox/branches/setuptools-0.6/setuptools/command/easy_install.py (original)
+++ sandbox/branches/setuptools-0.6/setuptools/command/easy_install.py Fri Feb 23 21:29:58 2007
@@ -70,18 +70,18 @@
('editable', 'e', "Install specified packages in editable form"),
('no-deps', 'N', "don't install dependencies"),
('allow-hosts=', 'H', "pattern(s) that hostnames must match"),
+ ('local-snapshots-ok', 'l', "allow building eggs from local checkouts"),
]
boolean_options = [
'zip-ok', 'multi-version', 'exclude-scripts', 'upgrade', 'always-copy',
'delete-conflicting', 'ignore-conflicts-at-my-risk', 'editable',
- 'no-deps',
+ 'no-deps', 'local-snapshots-ok',
]
negative_opt = {'always-unzip': 'zip-ok'}
create_index = PackageIndex
-
def initialize_options(self):
- self.zip_ok = None
+ self.zip_ok = self.local_snapshots_ok = None
self.install_dir = self.script_dir = self.exclude_scripts = None
self.index_url = None
self.find_links = None
@@ -177,7 +177,8 @@
self.find_links = self.find_links.split()
else:
self.find_links = []
-
+ if self.local_snapshots_ok:
+ self.package_index.scan_egg_links(self.shadow_path+sys.path)
self.package_index.add_find_links(self.find_links)
self.set_undefined_options('install_lib', ('optimize','optimize'))
if not isinstance(self.optimize,int):
@@ -202,7 +203,6 @@
self.outputs = []
-
def run(self):
if self.verbose<>self.distribution.verbose:
log.set_verbosity(self.verbose)
Modified: sandbox/branches/setuptools-0.6/setuptools/package_index.py
==============================================================================
--- sandbox/branches/setuptools-0.6/setuptools/package_index.py (original)
+++ sandbox/branches/setuptools-0.6/setuptools/package_index.py Fri Feb 23 21:29:58 2007
@@ -228,20 +228,20 @@
else:
self.warn(msg, url)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ def scan_egg_links(self, search_path):
+ for item in search_path:
+ if os.path.isdir(item):
+ for entry in os.listdir(item):
+ if entry.endswith('.egg-link'):
+ self.scan_egg_link(item, entry)
+
+ def scan_egg_link(self, path, entry):
+ lines = filter(None, map(str.strip, file(os.path.join(path, entry))))
+ if len(lines)==2:
+ for dist in find_distributions(os.path.join(path, lines[0])):
+ dist.location = os.path.join(path, *lines)
+ dist.precedence = SOURCE_DIST
+ self.add(dist)
def process_index(self,url,page):
More information about the Python-checkins
mailing list