rpms/python-py/F-10 import.log, NONE, 1.1 py-0.9.2-fix-test-cache.patch, NONE, 1.1 py-0.9.2-svn15.patch, NONE, 1.1 python-py.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Thomas Moschny
thm at fedoraproject.org
Fri Jan 16 13:26:18 UTC 2009
- Previous message: rpms/man-pages/devel .cvsignore, 1.56, 1.57 man-pages.spec, 1.108, 1.109 sources, 1.55, 1.56
- Next message: rpms/python-py/F-9 import.log, NONE, 1.1 py-0.9.2-fix-test-cache.patch, NONE, 1.1 py-0.9.2-svn15.patch, NONE, 1.1 python-py.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: thm
Update of /cvs/pkgs/rpms/python-py/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5358/F-10
Modified Files:
.cvsignore sources
Added Files:
import.log py-0.9.2-fix-test-cache.patch py-0.9.2-svn15.patch
python-py.spec
Log Message:
Initial import.
--- NEW FILE import.log ---
python-py-0_9_2-6_fc10:F-10:python-py-0.9.2-6.fc10.src.rpm:1232112139
py-0.9.2-fix-test-cache.patch:
--- NEW FILE py-0.9.2-fix-test-cache.patch ---
Index: trunk/py/misc/cache.py
===================================================================
--- trunk/py/misc/cache.py (revision 58575)
+++ trunk/py/misc/cache.py (revision 58576)
@@ -107,9 +107,6 @@
# time function to use for measuring build-times
_time = gettime
- def __init__(self, maxentries=64):
- super(BuildcostAccessCache, self).__init__(maxentries)
-
def build(self, key, builder, *args, **kwargs):
start = self._time()
val = builder(*args, **kwargs)
Index: trunk/py/misc/testing/test_cache.py
===================================================================
--- trunk/py/misc/testing/test_cache.py (revision 58575)
+++ trunk/py/misc/testing/test_cache.py (revision 58576)
@@ -27,6 +27,12 @@
def test_cache_works_somewhat_simple(self):
cache = BuildcostAccessCache()
+ # the default ._time() call used by
+ # BuildcostAccessCache.build can
+ # result into time()-time() == 0 which makes the below
+ # test fail randomly. Let's rather use incrementing
+ # numbers instead.
+ cache._time = py.std.itertools.count().next
for x in range(cache.maxentries):
y = cache.getorbuild(x, lambda: x)
assert x == y
py-0.9.2-svn15.patch:
--- NEW FILE py-0.9.2-svn15.patch ---
Index: py/path/svn/wccommand.py
===================================================================
--- py/path/svn/wccommand.py (Revision 60276)
+++ py/path/svn/wccommand.py (Revision 60277)
@@ -389,6 +389,8 @@
except py.process.cmdexec.Error, e:
if e.err.find('Path is not a working copy directory') != -1:
raise py.error.ENOENT(self, e.err)
+ elif e.err.find("is not under version control") != -1:
+ raise py.error.ENOENT(self, e.err)
raise
# XXX SVN 1.3 has output on stderr instead of stdout (while it does
# return 0!), so a bit nasty, but we assume no output is output
Index: py/path/svn/testing/test_wccommand.py
===================================================================
--- py/path/svn/testing/test_wccommand.py (Revision 60276)
+++ py/path/svn/testing/test_wccommand.py (Revision 60277)
@@ -366,22 +366,21 @@
def test_commit_nonrecursive(self):
root = self.root
somedir = root.join('sampledir')
- somefile = somedir.join('otherfile')
- somefile.write('foo')
+ somedir.mkdir("subsubdir")
somedir.propset('foo', 'bar')
status = somedir.status()
assert len(status.prop_modified) == 1
- assert len(status.modified) == 1
+ assert len(status.added) == 1
somedir.commit('non-recursive commit', rec=0)
status = somedir.status()
assert len(status.prop_modified) == 0
- assert len(status.modified) == 1
+ assert len(status.added) == 1
somedir.commit('recursive commit')
status = somedir.status()
assert len(status.prop_modified) == 0
- assert len(status.modified) == 0
+ assert len(status.added) == 0
def test_commit_return_value(self):
root = self.root
--- NEW FILE python-py.spec ---
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
Name: python-py
Version: 0.9.2
Release: 6%{?dist}
Summary: Innovative python library containing py.test, greenlets and other niceties
Group: Development/Languages
License: MIT and LGPLv2+ and Public Domain and BSD and Python
# - main package: MIT, except:
# - test/rsession/webdata/json.py: LPGLv2+
# - doc/style.css: Public Domain
# - test/web/post_multipart.py: Python
# (see http://code.activestate.com/help/terms)
# - compat/textwrap.py: Python
# - compat/subprocess.py: Python
# - compat/doctest.py: Public Domain
# - compat/optparse.py: BSD
# Note that all but the doctest compat files are removed
# in the prep stage.
URL: http://codespeak.net/py/dist/
Source: http://pypi.python.org/packages/source/p/py/py-%{version}.tar.gz
# r58576 from trunk
Patch0: py-0.9.2-fix-test-cache.patch
# r60277 from trunk
Patch1: py-0.9.2-svn15.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python-devel
BuildRequires: python-setuptools-devel
# needed by the testsuite
BuildRequires: subversion
BuildRequires: python-docutils
%define doctarget %{buildroot}%{_docdir}/%{name}-%{version}
%ifarch ppc ppc64
# until the greenlet issue can be fixed
%define debug_package %{nil}
%endif
%description
The py lib aims at supporting a decent development process addressing
deployment, versioning, testing and documentation perspectives.
%prep
%setup -q -n py-%{version}
%patch0 -p1 -b .test-cache
%patch1 -p0 -b .svn
# remove the compatibility modules, and use system modules instead
for module in doctest optparse textwrap subprocess ; do
rm py/compat/$module.py
echo "from $module import *" > py/compat/system_$module.py
sed -i py/__init__.py -e "s,compat/$module.py,compat/system_$module.py,"
done
%build
CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
%install
rm -rf %{buildroot}
%{__python} setup.py install -O1 --skip-build --root %{buildroot}
# remove shebangs and fix permissions
find %{buildroot}%{python_sitearch} \( -name '*.py' -o -name 'py.*' \) \
-exec sed -i '1{/^#!/d}' {} \; \
-exec chmod u=rw,go=r {} \;
# move and cleanup docs
mkdir -p %{doctarget}
mv %{buildroot}%{python_sitearch}/py/LICENSE %{doctarget}
mv %{buildroot}%{python_sitearch}/py/doc/* %{doctarget}
rm %{doctarget}/*.py*
rmdir %{buildroot}%{python_sitearch}/py/doc
mv %{buildroot}%{python_sitearch}/py/apigen/todo.txt %{doctarget}/todo_apigen.txt
mv %{buildroot}%{python_sitearch}/py/apigen/todo-apigen.txt %{doctarget}/todo-apigen_apigen.txt
mv %{buildroot}%{python_sitearch}/py/compat/LICENSE %{doctarget}/LICENSE_compat
mv %{buildroot}%{python_sitearch}/py/execnet/NOTES %{doctarget}/NOTES_execnet
mv %{buildroot}%{python_sitearch}/py/path/gateway/TODO.txt %{doctarget}/TODO_path_gateway.txt
mv %{buildroot}%{python_sitearch}/py/path/svn/quoting.txt %{doctarget}/quoting_path_svn.txt
mv %{buildroot}%{python_sitearch}/py/c-extension/greenlet/README.txt %{doctarget}/RADME_greenlet.txt
# remove (most) files only used by the testsuite
find %{buildroot}%{python_sitearch} -type d -name testing -prune -exec rm -r {} \;
find %{buildroot}%{python_sitearch} -name 'conftest.py*' -exec rm {} \;
rm -r %{buildroot}%{python_sitearch}/py/io/test
# remove this and that
rm %{buildroot}%{python_sitearch}/py/env.cmd
rm -r %{buildroot}%{python_sitearch}/py/bin
rm %{buildroot}%{python_sitearch}/py/c-extension/greenlet/*.h
rm %{buildroot}%{python_sitearch}/py/c-extension/greenlet/*.c
rm %{buildroot}%{python_sitearch}/py/c-extension/greenlet/setup.*
rm %{buildroot}%{python_sitearch}/py/c-extension/greenlet/test_*
%ifarch ppc ppc64
cp -p py/c-extension/greenlet/dummy_greenlet.py \
%{buildroot}%{python_sitearch}/py/c-extension/greenlet/greenlet.py
rm %{buildroot}%{python_sitearch}/py/c-extension/greenlet/greenlet.so
cat << \EOF > %{doctarget}/README.greenlet.fedora
The native py.magic.greenlet code has been replaced by
dummy_greenlet.py on ppc and ppc64 for this package because it
reproducibly segfaults.
%endif
%check
# on ppc, use dummy greenlets also for the tests
%ifarch ppc ppc64
cp -p py/c-extension/greenlet/dummy_greenlet.py \
py/c-extension/greenlet/greenlet.py
rm py/c-extension/greenlet/*.{c,h}
%endif
# see pylib issue67
rm py/doc/apigen.txt
sed -i '/apigen/d' py/doc/index.txt
PYTHONPATH=$(pwd)/py %{__python} py/bin/py.test py
%clean
rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
%{_bindir}/py.*
%{python_sitearch}/*
%{_docdir}/%{name}-%{version}
%changelog
* Wed Jan 14 2009 Thomas Moschny <thomas.moschny at gmx.de> - 0.9.2-6
- Use system doctest module again, as this wasn't the real cause of
the test failure. Instead, remove the failing test for now.
* Fri Dec 12 2008 Thomas Moschny <thomas.moschny at gmx.de> - 0.9.2-5
- Add patch from trunk fixing a subversion 1.5 problem (pylib
issue66).
- Don't replace doctest compat module (pylib issue67).
* Fri Nov 21 2008 Thomas Moschny <thomas.moschny at gmx.de> - 0.9.2-4
- Use dummy_greenlet on ppc and ppc64.
* Tue Oct 7 2008 Thomas Moschny <thomas.moschny at gmx.de> - 0.9.2-3
- Replace compat modules by stubs using the system modules instead.
- Add patch from trunk fixing a timing issue in the tests.
* Tue Sep 30 2008 Thomas Moschny <thomas.moschny at gmx.de> - 0.9.2-2
- Update license information.
- Fix the tests.
* Sun Sep 7 2008 Thomas Moschny <thomas.moschny at gmx.de> - 0.9.2-1
- Update to 0.9.2.
- Upstream now uses setuptools and installs to %%{python_sitearch}.
- Remove %%{srcname} macro.
- More detailed information about licenses.
* Wed Aug 21 2008 Thomas Moschny <thomas.moschny at gmx.de> - 0.9.1-1
- New package.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-py/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 15 Jan 2009 20:41:44 -0000 1.1
+++ .cvsignore 16 Jan 2009 13:25:48 -0000 1.2
@@ -0,0 +1 @@
+py-0.9.2.tar.gz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-py/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 15 Jan 2009 20:41:44 -0000 1.1
+++ sources 16 Jan 2009 13:25:48 -0000 1.2
@@ -0,0 +1 @@
+2c996d78867f6ad64dc5aabf1185aaf7 py-0.9.2.tar.gz
- Previous message: rpms/man-pages/devel .cvsignore, 1.56, 1.57 man-pages.spec, 1.108, 1.109 sources, 1.55, 1.56
- Next message: rpms/python-py/F-9 import.log, NONE, 1.1 py-0.9.2-fix-test-cache.patch, NONE, 1.1 py-0.9.2-svn15.patch, NONE, 1.1 python-py.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list