Accepting request 223704 from home:mvyskocil:branches:devel:languages:python
- update to 0.8.1 * fixes on Python 3 on OS/X, and some FreeBSD fixes (thanks Tobias) - added a note wrt disabled tests - add cffi-pytest-integration.patch: allowinf call pytest from setup.py - update to 0.8 * integrated support for C99 variable-sized structures * multi-thread safety * ffi.getwinerror() * a number of small fixes OBS-URL: https://build.opensuse.org/request/show/223704 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-cffi?expand=0&rev=8
This commit is contained in:
Denisart Benjamin
Git OBS Bridge
parent
c16ecb5be2
commit
18c7692885
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b723ab49b48c1604e5a3b5e838b0049eaa61e365408a71e40ba0a42d16472042
|
||||
size 175579
|
||||
3
cffi-0.8.1.tar.gz
Normal file
3
cffi-0.8.1.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:1db1eff2093e31eaaa83b274f8c6d5d2dad2908d43a301185d205e5d256d6818
|
||||
size 195206
|
||||
42
cffi-pytest-integration.patch
Normal file
42
cffi-pytest-integration.patch
Normal file
@ -0,0 +1,42 @@
|
||||
From: Michal Vyskocil <mvyskocil@suse.com>
|
||||
Subject: Py.test integration
|
||||
|
||||
... to allow python setup.py test
|
||||
|
||||
---
|
||||
setup.py | 17 ++++++++++++++++-
|
||||
1 file changed, 16 insertions(+), 1 deletion(-)
|
||||
|
||||
Index: cffi-0.8/setup.py
|
||||
===================================================================
|
||||
--- cffi-0.8.orig/setup.py
|
||||
+++ cffi-0.8/setup.py
|
||||
@@ -2,6 +2,19 @@ import sys, os
|
||||
import subprocess
|
||||
import errno
|
||||
|
||||
+# http://pytest.org/latest/goodpractises.html
|
||||
+from setuptools.command.test import test as TestCommand
|
||||
+
|
||||
+class PyTest(TestCommand):
|
||||
+ def finalize_options(self):
|
||||
+ TestCommand.finalize_options(self)
|
||||
+ self.test_args = ['testing/', ]
|
||||
+ self.test_suite = True
|
||||
+ def run_tests(self):
|
||||
+ #import here, cause outside the eggs aren't loaded
|
||||
+ import pytest
|
||||
+ errno = pytest.main(self.test_args)
|
||||
+ sys.exit(errno)
|
||||
|
||||
sources = ['c/_cffi_backend.c']
|
||||
libraries = ['ffi']
|
||||
@@ -132,5 +145,7 @@ Contact
|
||||
|
||||
install_requires=[
|
||||
'pycparser',
|
||||
- ]
|
||||
+ ],
|
||||
+ tests_require=['pytest'],
|
||||
+ cmdclass = {'test': PyTest},
|
||||
)
|
||||
71
cffi-pytest-support-distutils.patch
Normal file
71
cffi-pytest-support-distutils.patch
Normal file
@ -0,0 +1,71 @@
|
||||
From: Michal Vyskocil <mvyskocil@suse.com>
|
||||
Subject: Skip distutils tests
|
||||
|
||||
... when setuptools is installed.
|
||||
|
||||
It seems that recent setuptools override distutils, which ends with such errors
|
||||
ext = v.get_extension()
|
||||
> assert 'distutils.extension.Extension' in str(ext.__class__)
|
||||
E assert 'distutils.extension.Extension' in 'setuptools.extension.Extension'
|
||||
|
||||
---
|
||||
testing/test_zdistutils.py | 25 +++++++++++--------------
|
||||
1 file changed, 11 insertions(+), 14 deletions(-)
|
||||
|
||||
Index: cffi-0.8/testing/test_zdistutils.py
|
||||
===================================================================
|
||||
--- cffi-0.8.orig/testing/test_zdistutils.py
|
||||
+++ cffi-0.8/testing/test_zdistutils.py
|
||||
@@ -1,25 +1,22 @@
|
||||
import sys, os, imp, math, shutil
|
||||
import py
|
||||
+import pytest
|
||||
from cffi import FFI, FFIError
|
||||
from cffi.verifier import Verifier, _locate_engine_class, _get_so_suffixes
|
||||
from cffi.ffiplatform import maybe_relative_path
|
||||
from testing.udir import udir
|
||||
|
||||
+try:
|
||||
+ import setuptools
|
||||
+ del setuptools
|
||||
+ HAVE_SETUPTOOLS = True
|
||||
+except ImportError:
|
||||
+ HAVE_SETUPTOOLS = False
|
||||
+
|
||||
|
||||
class DistUtilsTest(object):
|
||||
|
||||
- def test_locate_engine_class(self):
|
||||
- cls = _locate_engine_class(FFI(), self.generic)
|
||||
- if self.generic:
|
||||
- # asked for the generic engine, which must not generate a
|
||||
- # CPython extension module
|
||||
- assert not cls._gen_python_module
|
||||
- else:
|
||||
- # asked for the CPython engine: check that we got it, unless
|
||||
- # we are running on top of PyPy, where the generic engine is
|
||||
- # always better
|
||||
- if '__pypy__' not in sys.builtin_module_names:
|
||||
- assert cls._gen_python_module
|
||||
+ distname = 'distutils' if not HAVE_SETUPTOOLS else 'setuptools'
|
||||
|
||||
def test_write_source(self):
|
||||
ffi = FFI()
|
||||
@@ -143,7 +140,7 @@ class DistUtilsTest(object):
|
||||
assert lib.sin(12.3) == math.sin(12.3)
|
||||
v = ffi.verifier
|
||||
ext = v.get_extension()
|
||||
- assert 'distutils.extension.Extension' in str(ext.__class__)
|
||||
+ assert '%s.extension.Extension' % self.distname in str(ext.__class__)
|
||||
assert ext.sources == [maybe_relative_path(v.sourcefilename)]
|
||||
assert ext.name == v.get_module_name()
|
||||
assert ext.define_macros == [('TEST_EXTENSION_OBJECT', '1')]
|
||||
@@ -171,7 +168,7 @@ class DistUtilsTest(object):
|
||||
assert lib.test1eoes(7.0) == 42.0
|
||||
v = ffi.verifier
|
||||
ext = v.get_extension()
|
||||
- assert 'distutils.extension.Extension' in str(ext.__class__)
|
||||
+ assert '%s.extension.Extension' % self.distname in str(ext.__class__)
|
||||
assert ext.sources == [maybe_relative_path(v.sourcefilename),
|
||||
extra_source]
|
||||
assert ext.name == v.get_module_name()
|
||||
@ -1,3 +1,20 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Feb 24 12:09:15 UTC 2014 - mvyskocil@suse.com
|
||||
|
||||
- update to 0.8.1
|
||||
* fixes on Python 3 on OS/X, and some FreeBSD fixes (thanks Tobias)
|
||||
- added a note wrt disabled tests
|
||||
- add cffi-pytest-integration.patch: allowinf call pytest from setup.py
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Nov 18 14:33:39 UTC 2013 - mvyskocil@suse.com
|
||||
|
||||
- update to 0.8
|
||||
* integrated support for C99 variable-sized structures
|
||||
* multi-thread safety
|
||||
* ffi.getwinerror()
|
||||
* a number of small fixes
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Oct 24 10:59:45 UTC 2013 - speilicke@suse.com
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package python-cffi
|
||||
#
|
||||
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -17,23 +17,22 @@
|
||||
|
||||
|
||||
Name: python-cffi
|
||||
Version: 0.7.2
|
||||
Version: 0.8.1
|
||||
Release: 0
|
||||
Summary: Foreign Function Interface for Python calling C code
|
||||
License: MIT
|
||||
Group: Development/Languages/Python
|
||||
Url: http://cffi.readthedocs.org
|
||||
Source: http://pypi.python.org/packages/source/c/cffi/cffi-%{version}.tar.gz
|
||||
Source0: http://pypi.python.org/packages/source/c/cffi/cffi-%{version}.tar.gz
|
||||
#PATCH-FOR-UPSTREAM: integration with setuptools, mvyskocil@suse.com
|
||||
Patch0: cffi-pytest-integration.patch
|
||||
BuildRequires: python-devel
|
||||
BuildRequires: python-setuptools
|
||||
BuildRequires: pkgconfig(libffi)
|
||||
# Documentation requirements:
|
||||
BuildRequires: python-Sphinx
|
||||
# Test requirements:
|
||||
#BuildRequires: python-nose
|
||||
#BuildRequires: python-py
|
||||
BuildRequires: python-pycparser
|
||||
#BuildRequires: python-pytest
|
||||
BuildRequires: python-pytest
|
||||
Requires: python-pycparser
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
%if 0%{?suse_version} && 0%{?suse_version} <= 1110
|
||||
@ -46,6 +45,7 @@ is to provide a convenient and reliable way of calling C code from Python.
|
||||
|
||||
%prep
|
||||
%setup -q -n cffi-%{version}
|
||||
%patch0 -p1
|
||||
|
||||
%build
|
||||
CFLAGS="%{optflags}" python setup.py build
|
||||
@ -54,8 +54,9 @@ python setup.py build_sphinx && rm build/sphinx/html/.buildinfo
|
||||
%install
|
||||
python setup.py install --prefix=%{_prefix} --root=%{buildroot}
|
||||
|
||||
%check
|
||||
python setup.py test
|
||||
#mvyskocil: some test assume distutils beeing available, fix that later
|
||||
#%check
|
||||
#python setup.py test
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user