[Checkins] SVN: zc.buildout/trunk/zc.recipe.egg_/ Finished renaming distribution to eggs and improving setup meta data.

Jim Fulton jim at zope.com
Thu Jun 29 11:11:20 EDT 2006


Log message for revision 68910:
  Finished renaming distribution to eggs and improving setup meta data.
  

Changed:
  U   zc.buildout/trunk/zc.recipe.egg_/README.txt
  D   zc.buildout/trunk/zc.recipe.egg_/setup.cfg
  U   zc.buildout/trunk/zc.recipe.egg_/setup.py
  U   zc.buildout/trunk/zc.recipe.egg_/src/zc/recipe/egg/egg.py
  U   zc.buildout/trunk/zc.recipe.egg_/src/zc/recipe/egg/selecting-python.txt

-=-
Modified: zc.buildout/trunk/zc.recipe.egg_/README.txt
===================================================================
--- zc.buildout/trunk/zc.recipe.egg_/README.txt	2006-06-29 15:07:42 UTC (rev 68909)
+++ zc.buildout/trunk/zc.recipe.egg_/README.txt	2006-06-29 15:11:20 UTC (rev 68910)
@@ -42,3 +42,11 @@
 
 - More control over script generation.  In particular, some way to 
   specify data t be recored in the script.
+
+- Honor the buildout offline option.
+
+- Windows suppprt
+
+  - Generate exe files
+
+  - Make sure tests work under windows

Deleted: zc.buildout/trunk/zc.recipe.egg_/setup.cfg
===================================================================
--- zc.buildout/trunk/zc.recipe.egg_/setup.cfg	2006-06-29 15:07:42 UTC (rev 68909)
+++ zc.buildout/trunk/zc.recipe.egg_/setup.cfg	2006-06-29 15:11:20 UTC (rev 68910)
@@ -1,2 +0,0 @@
-[egg_info]
-tag_svn_revision = 1

Modified: zc.buildout/trunk/zc.recipe.egg_/setup.py
===================================================================
--- zc.buildout/trunk/zc.recipe.egg_/setup.py	2006-06-29 15:07:42 UTC (rev 68909)
+++ zc.buildout/trunk/zc.recipe.egg_/setup.py	2006-06-29 15:11:20 UTC (rev 68910)
@@ -1,15 +1,17 @@
 from setuptools import setup, find_packages
 
+name = "zc.recipe.egg",
+
 setup(
-    name = "zc.recipe.egg",
-    version = "1.0.dev",
+    name = "name",
+    version = "1.0.0a1",
     author = "Jim Fulton",
     author_email = "jim at zope.com",
     description = "Recipe for installing Python package distributions as eggs",
+    long_description = open('README.txt').read(),
     license = "ZPL 2.1",
     keywords = "development build",
     url='http://svn.zope.org/zc.buildout',
-    download_url='http://download.zope.org/distribution',
 
     packages = find_packages('src'),
     include_package_data = True,
@@ -17,6 +19,5 @@
     namespace_packages = ['zc', 'zc.recipe'],
     install_requires = ['zc.buildout', 'setuptools'],
     tests_require = ['zope.testing'],
-    test_suite = 'zc.recipe.eggs.tests.test_suite',
-    entry_points = {'zc.buildout': ['default = zc.recipe.egg:Egg']},    
+    entry_points = {'zc.buildout': ['default = %s:Egg' % name]},    
     )

Modified: zc.buildout/trunk/zc.recipe.egg_/src/zc/recipe/egg/egg.py
===================================================================
--- zc.buildout/trunk/zc.recipe.egg_/src/zc/recipe/egg/egg.py	2006-06-29 15:07:42 UTC (rev 68909)
+++ zc.buildout/trunk/zc.recipe.egg_/src/zc/recipe/egg/egg.py	2006-06-29 15:11:20 UTC (rev 68910)
@@ -53,6 +53,8 @@
 
         This is intended for reuse by similar recipes.
         """
+        options = self.options
+
         distributions = [
             r.strip()
             for r in options.get('eggs', self.name).split('\n')
@@ -67,8 +69,10 @@
             path=[options['_d']]
             )
 
+        return distributions, ws
+
     def install(self):
-        ws = self.working_set()
+        distributions, ws = self.working_set()
         options = self.options
 
         scripts = options.get('scripts')

Modified: zc.buildout/trunk/zc.recipe.egg_/src/zc/recipe/egg/selecting-python.txt
===================================================================
--- zc.buildout/trunk/zc.recipe.egg_/src/zc/recipe/egg/selecting-python.txt	2006-06-29 15:07:42 UTC (rev 68909)
+++ zc.buildout/trunk/zc.recipe.egg_/src/zc/recipe/egg/selecting-python.txt	2006-06-29 15:11:20 UTC (rev 68910)
@@ -39,7 +39,7 @@
     ...
     ... [demo]
     ... recipe = zc.recipe.egg
-    ... distribution = demo <0.3
+    ... eggs = demo <0.3
     ... find-links = %(server)s
     ... index = %(server)s/index
     ... python = python2.3
@@ -117,7 +117,7 @@
     ...
     ... [demo]
     ... recipe = zc.recipe.egg
-    ... distribution = demo <0.3
+    ... eggs = demo <0.3
     ... find-links = %(server)s
     ... index = %(server)s/index
     ... python = python2.4



More information about the Checkins mailing list