rpms/python-cherrypy2/devel README.fedora, 1.1, 1.2 python-cherrypy2.spec, 1.1, 1.2

Toshio くらとみ (toshio) fedora-extras-commits at redhat.com
Sat Jun 14 15:09:45 UTC 2008


Author: toshio

Update of /cvs/pkgs/rpms/python-cherrypy2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32011

Modified Files:
	README.fedora python-cherrypy2.spec 
Log Message:

* Sat Jun 14 2008 Toshio Kuratomi <toshio at fedoraproject.org> 2.3.0-4
- Update README.fedora to fix some code examples and confusing wording.



Index: README.fedora
===================================================================
RCS file: /cvs/pkgs/rpms/python-cherrypy2/devel/README.fedora,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- README.fedora	21 Jan 2008 21:06:31 -0000	1.1
+++ README.fedora	14 Jun 2008 15:09:05 -0000	1.2
@@ -28,12 +28,13 @@
 1) Manually change your python path to place the egg directory before
    site-packages.  Note that if you do it this way you will either have to
    change your code whenever a new version comes out (for instance, if a
-   bugfix release, CherryPy-2.2.2, is released.)  The code would look
+   bugfix release, CherryPy-2.3.1, is released.)  The code would look
    something like this::
 
-     import sys, os, distutils
+     import sys, os
+     from distutils.sysconfig import get_python_lib
      compatCherryPyPath = os.path.join(
-            distutils.sysconfig.get_python_lib(), 'CherryPy-2.2.1-py2.5.egg')
+            get_python_lib(), 'CherryPy-2.3.0-py2.5.egg')
      sys.path.insert(0, compatCherryPyPath)
      import cherrypy
 
@@ -60,7 +61,7 @@
 
    When you use setup.py to install this script it will create a script that
    looks like this::
-      
+
       #!/usr/bin/python
       __requires__ = 'Nifty==1.0'
       import sys
@@ -77,3 +78,11 @@
 circumstances, these are the only methods that the setuptools author and
 we are able to say will work in all circumstances in this environment.  Other
 methods may not work reliably in some versions of setuptools.
+
+In particular, if you have both the python-cherrypy (at version 3.x) and
+python-cherrypy2 packages installed, this will not work::
+
+  from pkg_resources import require
+  require("CherryPy>=2.3,<3.0alpha")
+  import cherrypy
+  print cherrypy.__version__


Index: python-cherrypy2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-cherrypy2/devel/python-cherrypy2.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-cherrypy2.spec	21 Jan 2008 21:06:31 -0000	1.1
+++ python-cherrypy2.spec	14 Jun 2008 15:09:05 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           python-cherrypy2
 Version:        2.3.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A pythonic, object-oriented web development framework
 Group:          Development/Libraries
 License:        BSD
@@ -32,6 +32,7 @@
 
 This is a compat package for programs which still need the 2.x branch of
 CherryPy.
+
 %prep
 %setup -q -n CherryPy-%{version}
 %patch0 -p1
@@ -47,6 +48,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{python_sitelib}
+touch $RPM_BUILD_ROOT%{python_sitelib}/easy-install.pth
 easy_install -m --prefix $RPM_BUILD_ROOT%{_usr} dist/*.egg
 find $RPM_BUILD_ROOT%{python_sitelib}/ -type f -exec chmod -x \{\} \;
 
@@ -64,6 +66,9 @@
 %{python_sitelib}/*
 
 %changelog
+* Sat Jun 14 2008 Toshio Kuratomi <toshio at fedoraproject.org> 2.3.0-4
+- Update README.fedora to fix some code examples and confusing wording.
+
 * Wed Jan 16 2008 Toshio Kuratomi <toshio at fedoraproject.org> 2.3.0-3
 - Merge changes from current python-cherrypy package.
 - Update to 2.3.0.




More information about the fedora-extras-commits mailing list