[Checkins] SVN: van.pydeb/trunk/ Obligatory "How could I have done that" release smoothing out documentation bugs and making the command line options more complete. Also prepare 1.1.0 release.
Brian Sutherland
jinty at web.de
Tue May 26 15:29:19 EDT 2009
Log message for revision 100435:
Obligatory "How could I have done that" release smoothing out documentation bugs and making the command line options more complete. Also prepare 1.1.0 release.
Changed:
U van.pydeb/trunk/CHANGES.txt
U van.pydeb/trunk/README.txt
U van.pydeb/trunk/setup.py
U van.pydeb/trunk/van/pydeb/__init__.py
U van.pydeb/trunk/van/pydeb/tests/extras.txt
-=-
Modified: van.pydeb/trunk/CHANGES.txt
===================================================================
--- van.pydeb/trunk/CHANGES.txt 2009-05-26 19:14:06 UTC (rev 100434)
+++ van.pydeb/trunk/CHANGES.txt 2009-05-26 19:29:19 UTC (rev 100435)
@@ -1,7 +1,8 @@
-1.0.1 (unreleased)
+1.1.0 (2009-05-26)
------------------
-* ???
+* Obligatory "How could I have done that" release smoothing out documentation
+ bugs and making the command line options more complete.
1.0.0 (2009-05-26)
------------------
Modified: van.pydeb/trunk/README.txt
===================================================================
--- van.pydeb/trunk/README.txt 2009-05-26 19:14:06 UTC (rev 100434)
+++ van.pydeb/trunk/README.txt 2009-05-26 19:29:19 UTC (rev 100435)
@@ -8,7 +8,7 @@
* Setuptools package names to debian binary and source package names
* Setuptools dependencies to debian dependencies
-This package provides a script ``pydebdep`` which introspects an installed
+This package provides a script ``van-pydeb`` which introspects an installed
.egg-info to extract egg dependency information. The package names are
converted to their debian equivilant and the dependency information is printed
in the format of a dpkg "Depends:" line.
@@ -19,27 +19,27 @@
To extract the dependency info of this package, one can::
$ python2.4 setup.py build
- $ PYTHONPATH=./src python2.4 pydebdep --depends --egg_info src/vanguardistas.pydebdep.egg-info
+ $ PYTHONPATH=./src python2.4 van-pydeb --depends --egg_info src/vanguardistas.van-pydeb.egg-info
python-setuptools, python-vanguardistas
This information can then used in a debian/rules file as follows:
- i="$$(pydebdep --depends --egg_info debian/$(PACKAGE)/usr/lib/python$*/site-packages/$(EGG_NAME).egg-info)" && echo "setuptools:Depends=$$i" >> debian/$(PACKAGE).substvars
+ i="$$(van-pydeb depends --egg-info debian/$(PACKAGE)/usr/lib/python$*/site-packages/$(EGG_NAME).egg-info)" && echo "setuptools:Depends=$$i" >> debian/$(PACKAGE).substvars
The different methods of using this are:
Give the dependencies (including the extra dependencies) of the package:
- pydebdep depends --egg_info debian/$(PACKAGE)/usr/lip/python$*/$(EGG_NAME).egg-info
+ van-pydeb depends --egg-info debian/$(PACKAGE)/usr/lip/python$*/$(EGG_NAME).egg-info
The dependencies of an extra:
- pydebdep depends --egg_info debian/$(PACKAGE)/usr/lip/python$*/$(EGG_NAME).egg-info --extra $(EXTRA)
+ van-pydeb depends --egg-info debian/$(PACKAGE)/usr/lip/python$*/$(EGG_NAME).egg-info --extra $(EXTRA)
The dependencies of 2 extras:
- pydebdep depends --egg_info debian/$(PACKAGE)/usr/lip/python$*/$(EGG_NAME).egg-info --extra $(EXTRA) --extra $(EXTRA2)
+ van-pydeb depends --egg-info debian/$(PACKAGE)/usr/lip/python$*/$(EGG_NAME).egg-info --extra $(EXTRA) --extra $(EXTRA2)
The dependencies of a package excluding the dependencies of extras:
- pydebdep depends --egg_info debian/$(PACKAGE)/usr/lip/python$*/$(EGG_NAME).egg-info --exclude-extra $(EXTRA1) --exclude-extra $(EXTRA2)
+ van-pydeb depends --egg-info debian/$(PACKAGE)/usr/lip/python$*/$(EGG_NAME).egg-info --exclude-extra $(EXTRA1) --exclude-extra $(EXTRA2)
Modified: van.pydeb/trunk/setup.py
===================================================================
--- van.pydeb/trunk/setup.py 2009-05-26 19:14:06 UTC (rev 100434)
+++ van.pydeb/trunk/setup.py 2009-05-26 19:29:19 UTC (rev 100435)
@@ -23,10 +23,10 @@
long_description=long_description,
author="Vanguardistas",
url='http://pypi.python.org/pypi/van.pydeb',
- version='1.0.1dev',
+ version='1.1.0',
license = 'ZPL 2.1',
packages=find_packages(),
- entry_points = {'console_scripts': ['van_pydeb = van.pydeb:main',]},
+ entry_points = {'console_scripts': ['van-pydeb = van.pydeb:main',]},
namespace_packages=["van"],
install_requires=[
'setuptools',
Modified: van.pydeb/trunk/van/pydeb/__init__.py
===================================================================
--- van.pydeb/trunk/van/pydeb/__init__.py 2009-05-26 19:14:06 UTC (rev 100434)
+++ van.pydeb/trunk/van/pydeb/__init__.py 2009-05-26 19:29:19 UTC (rev 100435)
@@ -119,13 +119,13 @@
>>> import os
>>> here = os.path.dirname(__file__)
>>> ex1 = os.path.join(here, 'tests', 'dummy.foo.egg-info')
- >>> exitcode = main(['bin', 'depends', '--egg_info', ex1])
+ >>> exitcode = main(['bin', 'depends', '--egg-info', ex1])
python-bar (<< 0.3~c~pre1), python-dummy, python-foo (>> 0.1), python-foobar
>>> exitcode
0
"""
parser = optparse.OptionParser(usage="usage: %prog command [options]")
- parser.add_option("--egg_info", dest="egg_info",
+ parser.add_option("--egg-info", dest="egg_info",
help="The egg-info directory to use.")
parser.add_option("--exclude-extra", dest="exclude_extras", action="append",
help="Exclude extras from dependencies")
Modified: van.pydeb/trunk/van/pydeb/tests/extras.txt
===================================================================
--- van.pydeb/trunk/van/pydeb/tests/extras.txt 2009-05-26 19:14:06 UTC (rev 100434)
+++ van.pydeb/trunk/van/pydeb/tests/extras.txt 2009-05-26 19:29:19 UTC (rev 100435)
@@ -20,12 +20,12 @@
zope.component has a 'zcml' extra, we should check that by the the dependencies
of this extra are shown in the depends and provides line:
- >>> runit('depends --egg_info %s' % zope_component)
+ >>> runit('depends --egg-info %s' % zope_component)
python-setuptools, python-z3c.recipe.sphinxdoc, python-zodb, python-zope, python-zope.configuration, python-zope.event, python-zope.hookable, python-zope.i18nmessageid, python-zope.interface, python-zope.location, python-zope.proxy, python-zope.security, python-zope.testing
We can have create a provides line for all extras:
- >>> runit('provides --egg_info %s' % zope_component)
+ >>> runit('provides --egg-info %s' % zope_component)
python-zope.component-docs, python-zope.component-hook, python-zope.component-persistentregistry, python-zope.component-test, python-zope.component-zcml
Moving an extra's dependencies into "Suggests:"
@@ -34,12 +34,12 @@
We notice that the "docs" dependency us not a hard one and decide to exclude it
(it goes into Suggests:):
- >>> runit('depends --egg_info %s --exclude-extra docs' % zope_component)
+ >>> runit('depends --egg-info %s --exclude-extra docs' % zope_component)
python-setuptools, python-zodb, python-zope, python-zope.configuration, python-zope.event, python-zope.hookable, python-zope.i18nmessageid, python-zope.interface, python-zope.location, python-zope.proxy, python-zope.security, python-zope.testing
We could also exclude it from the "provides" list:
- >>> runit('provides --egg_info %s --exclude-extra docs' % zope_component)
+ >>> runit('provides --egg-info %s --exclude-extra docs' % zope_component)
python-zope.component-hook, python-zope.component-persistentregistry, python-zope.component-test, python-zope.component-zcml
Moving an extra into a metapackage
@@ -47,19 +47,19 @@
Now we decide to move the 'zcml' extra to it's own metapackage, thus we need to separate out it's dependencies:
- >>> runit('depends --egg_info %s --exclude-extra docs --exclude-extra zcml' % zope_component)
+ >>> runit('depends --egg-info %s --exclude-extra docs --exclude-extra zcml' % zope_component)
python-setuptools, python-zodb, python-zope, python-zope.event, python-zope.hookable, python-zope.interface, python-zope.location, python-zope.testing
- >>> runit('depends --egg_info %s --extra zcml' % zope_component)
+ >>> runit('depends --egg-info %s --extra zcml' % zope_component)
python-zope.configuration, python-zope.i18nmessageid, python-zope.proxy, python-zope.security
We could also have the docs extra included in the metapackage if we wanted:
- >>> runit('depends --egg_info %s --extra zcml --extra docs' % zope_component)
+ >>> runit('depends --egg-info %s --extra zcml --extra docs' % zope_component)
python-z3c.recipe.sphinxdoc, python-zope.configuration, python-zope.i18nmessageid, python-zope.proxy, python-zope.security
And make a "Provides" list for that:
- >>> runit('provides --egg_info %s --extra docs --extra zcml' % zope_component)
+ >>> runit('provides --egg-info %s --extra docs --extra zcml' % zope_component)
python-zope.component-docs, python-zope.component-zcml
Packages that depend on extras
@@ -67,10 +67,10 @@
Depend on the provides list:
- >>> runit('depends --egg_info %s' % zope_app_publication) # doctest: +ELLIPSIS
+ >>> runit('depends --egg-info %s' % zope_app_publication) # doctest: +ELLIPSIS
python-..., python-zope.component-zcml, ...
But packages that don't, get the original dependency:
- >>> runit('depends --egg_info %s' % zope_security) # doctest: +ELLIPSIS
+ >>> runit('depends --egg-info %s' % zope_security) # doctest: +ELLIPSIS
python-..., python-zope.component, ...
More information about the Checkins
mailing list