Compare commits
No commits in common. "master" and "f31" have entirely different histories.
|
|
@ -39,9 +39,3 @@ Cython-0.12.1.tar.gz
|
|||
/Cython-0.29.11.tar.gz
|
||||
/Cython-0.29.12.tar.gz
|
||||
/Cython-0.29.13.tar.gz
|
||||
/Cython-0.29.14.tar.gz
|
||||
/Cython-0.29.15.tar.gz
|
||||
/Cython-0.29.16.tar.gz
|
||||
/Cython-0.29.17.tar.gz
|
||||
/Cython-0.29.19.tar.gz
|
||||
/Cython-0.29.21.tar.gz
|
||||
|
|
|
|||
101
Cython.spec
101
Cython.spec
|
|
@ -4,24 +4,15 @@
|
|||
%bcond_without tests
|
||||
|
||||
Name: Cython
|
||||
Version: 0.29.21
|
||||
Version: 0.29.13
|
||||
%global upver %{version_no_tilde %{nil}}
|
||||
Release: 4%{?dist}
|
||||
Release: 2%{?dist}
|
||||
Summary: Language for writing Python extension modules
|
||||
|
||||
License: ASL 2.0
|
||||
URL: http://www.cython.org
|
||||
Source: https://github.com/cython/cython/archive/%{upver}/%{srcname}-%{version}.tar.gz
|
||||
|
||||
# Partially work around issues with class and static methods
|
||||
# See https://bugzilla.redhat.com/show_bug.cgi?id=1788506
|
||||
# Mostly backported from upstream: https://github.com/cython/cython/pull/3106
|
||||
# This also:
|
||||
# - Removes staticmethod optimizations for normal functions
|
||||
# - Removes failing test for staticmethod fused functions, which still fail
|
||||
# See also: https://github.com/cython/cython/issues/3614
|
||||
Patch3106: class-static-method-workaround.patch
|
||||
|
||||
BuildRequires: gcc
|
||||
%if %{with tests}
|
||||
BuildRequires: gcc-c++
|
||||
|
|
@ -33,6 +24,16 @@ for writing Python extension modules.
|
|||
|
||||
%description %{_description}
|
||||
|
||||
%package -n python2-%{srcname}
|
||||
Summary: %{summary}
|
||||
%{?python_provide:%python_provide python2-%{srcname}}
|
||||
BuildRequires: python2-devel
|
||||
BuildRequires: python2-setuptools
|
||||
|
||||
%description -n python2-%{srcname} %{_description}
|
||||
|
||||
Python 2 version.
|
||||
|
||||
%package -n python3-%{srcname}
|
||||
Summary: %{summary}
|
||||
%{?python_provide:%python_provide python3-%{srcname}}
|
||||
|
|
@ -43,16 +44,11 @@ Obsoletes: Cython < %{?epoch:%{epoch}:}%{version}-%{release}
|
|||
BuildRequires: python3-devel
|
||||
BuildRequires: python3-setuptools
|
||||
%if %{with tests}
|
||||
BuildRequires: python3-coverage
|
||||
BuildRequires: python3-numpy
|
||||
BuildRequires: python3-jedi
|
||||
%endif
|
||||
|
||||
# A small templating library is bundled in Cython/Tempita
|
||||
# Upstream version 0.5.2 is available from https://pypi.org/project/Tempita
|
||||
# but the bundled copy is patched and reorganized.
|
||||
# Upstream homepage is inaccessible.
|
||||
Provides: bundled(python3dist(tempita))
|
||||
|
||||
%description -n python3-%{srcname} %{_description}
|
||||
|
||||
Python 3 version.
|
||||
|
|
@ -70,6 +66,7 @@ cython-mode is an Emacs major mode for editing Cython source files.
|
|||
%autosetup -n %{upname}-%{upver} -p1
|
||||
|
||||
%build
|
||||
%py2_build
|
||||
%py3_build
|
||||
|
||||
# emacs-cython-mode build
|
||||
|
|
@ -80,6 +77,10 @@ cp -p Tools/cython-mode.el .
|
|||
|
||||
|
||||
%install
|
||||
%py2_install
|
||||
rm -rf %{buildroot}%{python2_sitelib}/setuptools/tests
|
||||
rm %{buildroot}%{_bindir}/*
|
||||
|
||||
%py3_install
|
||||
rm -rf %{buildroot}%{python3_sitelib}/setuptools/tests
|
||||
|
||||
|
|
@ -92,13 +93,27 @@ cp -p cython-mode-init.el cython-mode-init.elc %{buildroot}%{_emacs_sitestartdir
|
|||
|
||||
%if %{with tests}
|
||||
%check
|
||||
%{python3} runtests.py -vv --no-pyregr %{?_smp_mflags} \
|
||||
for python in %{__python2} %{__python3}; do
|
||||
|
||||
$python runtests.py -vv --no-pyregr %{?_smp_mflags} \
|
||||
%ifarch s390x ppc64
|
||||
--exclude numpy_subarray # https://github.com/cython/cython/issues/1982
|
||||
%endif
|
||||
%ifarch %{ix86}
|
||||
--exclude run.parallel # https://github.com/cython/cython/issues/2807
|
||||
%endif
|
||||
|
||||
done
|
||||
%endif
|
||||
|
||||
%files -n python2-%{srcname}
|
||||
%license LICENSE.txt
|
||||
%doc *.txt Demos Doc Tools
|
||||
%{python2_sitearch}/%{srcname}-*.egg-info/
|
||||
%{python2_sitearch}/%{srcname}/
|
||||
%{python2_sitearch}/pyximport/
|
||||
%{python2_sitearch}/%{upname}.py*
|
||||
|
||||
%files -n python3-%{srcname}
|
||||
%license LICENSE.txt
|
||||
%doc *.txt Demos Doc Tools
|
||||
|
|
@ -117,56 +132,6 @@ cp -p cython-mode-init.el cython-mode-init.elc %{buildroot}%{_emacs_sitestartdir
|
|||
%{_emacs_sitestartdir}/cython*.el*
|
||||
|
||||
%changelog
|
||||
* Fri Nov 13 2020 Miro Hrončok <mhroncok@redhat.com> - 0.29.21-4
|
||||
- Drop build dependency on coverage
|
||||
|
||||
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.29.21-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Wed Jul 22 2020 Gwyn Ciesla <gwync@protonmail.com> - 0.29.21-2
|
||||
- Re-enable tests.
|
||||
|
||||
* Wed Jul 22 2020 Gwyn Ciesla <gwync@protonmail.com> - 0.29.21-1
|
||||
- 0.29.21
|
||||
|
||||
* Wed May 27 2020 sguelton@redhat.com - 0.29.19-1
|
||||
- Update to 0.29.19
|
||||
|
||||
* Mon May 25 2020 Miro Hrončok <mhroncok@redhat.com> - 0.29.17-4
|
||||
- Rebuilt for Python 3.9
|
||||
|
||||
* Fri May 22 2020 Miro Hrončok <mhroncok@redhat.com> - 0.29.17-3
|
||||
- Bootstrap for Python 3.9
|
||||
|
||||
* Wed May 13 2020 Petr Viktorin <pviktori@redhat.com> - 0.29.17-2
|
||||
- Backport classmethod fixes
|
||||
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1788506
|
||||
|
||||
* Tue Apr 28 2020 Marcel Plch <mplch@redhat.com> - 0.29.17-1
|
||||
- Update to 0.29.17
|
||||
|
||||
* Wed Mar 25 2020 Miro Hrončok <mhroncok@redhat.com> - 0.29.16-1
|
||||
- Update to 0.29.16 (#1816785)
|
||||
|
||||
* Sat Feb 08 2020 Miro Hrončok <mhroncok@redhat.com> - 0.29.15-1
|
||||
- Update to 0.29.15 (#1800158)
|
||||
|
||||
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.29.14-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Mon Nov 04 2019 Miro Hrončok <mhroncok@redhat.com> - 0.29.14-1
|
||||
- Update to 0.29.14 (#1768034)
|
||||
- Python 2 subpackage has been removed
|
||||
|
||||
* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 0.29.13-5
|
||||
- Rebuilt for Python 3.8.0rc1 (#1748018)
|
||||
|
||||
* Thu Aug 15 2019 Miro Hrončok <mhroncok@redhat.com> - 0.29.13-4
|
||||
- Rebuilt for Python 3.8
|
||||
|
||||
* Thu Aug 15 2019 Miro Hrončok <mhroncok@redhat.com> - 0.29.13-3
|
||||
- Bootstrap for Python 3.8
|
||||
|
||||
* Thu Aug 01 2019 Gwyn Ciesla <gwync@protonmail.com> 0.29.13-2
|
||||
- Rebuild with new numpy.
|
||||
|
||||
|
|
|
|||
|
|
@ -1,114 +0,0 @@
|
|||
diff -U3 -r cython-0.29.17.orig/Cython/Compiler/ExprNodes.py cython-0.29.17/Cython/Compiler/ExprNodes.py
|
||||
--- cython-0.29.17.orig/Cython/Compiler/ExprNodes.py 2020-04-26 13:48:48.000000000 +0200
|
||||
+++ cython-0.29.17/Cython/Compiler/ExprNodes.py 2020-05-15 17:44:55.157172257 +0200
|
||||
@@ -2295,8 +2295,10 @@
|
||||
setter = 'PyDict_SetItem'
|
||||
namespace = Naming.moddict_cname
|
||||
elif entry.is_pyclass_attr:
|
||||
- code.globalstate.use_utility_code(UtilityCode.load_cached("SetNameInClass", "ObjectHandling.c"))
|
||||
- setter = '__Pyx_SetNameInClass'
|
||||
+ # Special-case setting __new__
|
||||
+ n = "SetNewInClass" if self.name == "__new__" else "SetNameInClass"
|
||||
+ code.globalstate.use_utility_code(UtilityCode.load_cached(n, "ObjectHandling.c"))
|
||||
+ setter = '__Pyx_' + n
|
||||
else:
|
||||
assert False, repr(entry)
|
||||
code.put_error_if_neg(
|
||||
diff -U3 -r cython-0.29.17.orig/Cython/Compiler/Nodes.py cython-0.29.17/Cython/Compiler/Nodes.py
|
||||
--- cython-0.29.17.orig/Cython/Compiler/Nodes.py 2020-04-26 13:48:48.000000000 +0200
|
||||
+++ cython-0.29.17/Cython/Compiler/Nodes.py 2020-05-15 17:44:55.159172253 +0200
|
||||
@@ -2872,7 +2872,6 @@
|
||||
func = decorator.decorator
|
||||
if func.is_name:
|
||||
self.is_classmethod |= func.name == 'classmethod'
|
||||
- self.is_staticmethod |= func.name == 'staticmethod'
|
||||
|
||||
if self.is_classmethod and env.lookup_here('classmethod'):
|
||||
# classmethod() was overridden - not much we can do here ...
|
||||
diff -U3 -r cython-0.29.17.orig/Cython/Utility/ObjectHandling.c cython-0.29.17/Cython/Utility/ObjectHandling.c
|
||||
--- cython-0.29.17.orig/Cython/Utility/ObjectHandling.c 2020-04-26 13:48:48.000000000 +0200
|
||||
+++ cython-0.29.17/Cython/Utility/ObjectHandling.c 2020-05-15 17:44:55.160172251 +0200
|
||||
@@ -1163,6 +1163,30 @@
|
||||
#define __Pyx_SetNameInClass(ns, name, value) PyObject_SetItem(ns, name, value)
|
||||
#endif
|
||||
|
||||
+/////////////// SetNewInClass.proto ///////////////
|
||||
+
|
||||
+static int __Pyx_SetNewInClass(PyObject *ns, PyObject *name, PyObject *value);
|
||||
+
|
||||
+/////////////// SetNewInClass ///////////////
|
||||
+//@requires: SetNameInClass
|
||||
+
|
||||
+// Special-case setting __new__: if it's a Cython function, wrap it in a
|
||||
+// staticmethod. This is similar to what Python does for a Python function
|
||||
+// called __new__.
|
||||
+static int __Pyx_SetNewInClass(PyObject *ns, PyObject *name, PyObject *value) {
|
||||
+#ifdef __Pyx_CyFunction_USED
|
||||
+ int ret;
|
||||
+ if (__Pyx_CyFunction_Check(value)) {
|
||||
+ PyObject *staticnew = PyStaticMethod_New(value);
|
||||
+ if (unlikely(!staticnew)) return -1;
|
||||
+ ret = __Pyx_SetNameInClass(ns, name, staticnew);
|
||||
+ Py_DECREF(staticnew);
|
||||
+ return ret;
|
||||
+ }
|
||||
+#endif
|
||||
+ return __Pyx_SetNameInClass(ns, name, value);
|
||||
+}
|
||||
+
|
||||
|
||||
/////////////// GetModuleGlobalName.proto ///////////////
|
||||
//@requires: PyDictVersioning
|
||||
Only in cython-0.29.17.orig: cython-0.29.17
|
||||
diff -U3 -r cython-0.29.17.orig/tests/run/cyfunction.pyx cython-0.29.17/tests/run/cyfunction.pyx
|
||||
--- cython-0.29.17.orig/tests/run/cyfunction.pyx 2020-04-26 13:48:48.000000000 +0200
|
||||
+++ cython-0.29.17/tests/run/cyfunction.pyx 2020-05-15 17:44:55.160172251 +0200
|
||||
@@ -376,6 +376,18 @@
|
||||
def meth(self): pass
|
||||
|
||||
|
||||
+class TestStaticmethod(object):
|
||||
+ """
|
||||
+ >>> x = TestStaticmethod()
|
||||
+ >>> x.staticmeth(42)
|
||||
+ 42
|
||||
+ >>> x.staticmeth.__get__(42)()
|
||||
+ 42
|
||||
+ """
|
||||
+ @staticmethod
|
||||
+ def staticmeth(arg): return arg
|
||||
+
|
||||
+
|
||||
cdef class TestOptimisedBuiltinMethod:
|
||||
"""
|
||||
>>> obj = TestOptimisedBuiltinMethod()
|
||||
diff -U3 -r cython-0.29.17.orig/tests/run/fused_def.pyx cython-0.29.17/tests/run/fused_def.pyx
|
||||
--- cython-0.29.17.orig/tests/run/fused_def.pyx 2020-04-26 13:48:48.000000000 +0200
|
||||
+++ cython-0.29.17/tests/run/fused_def.pyx 2020-05-15 18:03:39.436752174 +0200
|
||||
@@ -268,14 +268,6 @@
|
||||
def test_fused_def_super():
|
||||
"""
|
||||
>>> test_fused_def_super()
|
||||
- long 10
|
||||
- long 11
|
||||
- long 11
|
||||
- long 12
|
||||
- short 12
|
||||
- long 13
|
||||
- short 13
|
||||
- long 14
|
||||
<class 'fused_def.SubClass'> long 14
|
||||
<class 'fused_def.SubClass'> long 15
|
||||
<class 'fused_def.SubClass'> long 15
|
||||
@@ -296,11 +288,6 @@
|
||||
obj = SubClass()
|
||||
cls = SubClass
|
||||
|
||||
- obj.mystaticmethod(obj, 10)
|
||||
- cls.mystaticmethod(obj, 11)
|
||||
- obj.mystaticmethod[cy.short](obj, 12)
|
||||
- cls.mystaticmethod[cy.short](obj, 13)
|
||||
-
|
||||
obj.myclassmethod(14)
|
||||
cls.myclassmethod(15)
|
||||
obj.myclassmethod[cy.short](16)
|
||||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (Cython-0.29.21.tar.gz) = 2c0c3e3fff07106eb98862f71cd5dec9ff29460cf9b9e4de74537ca5e033f7523989beb5fbdc14723beaf94a535976f75c803e791b87e017961d9694b8c37679
|
||||
SHA512 (Cython-0.29.13.tar.gz) = 79efebfddabf31a046ae86a2c2170e0956098f4b1c7b8bbd338d30be7c96c31ee2d648332fc16ad9cf1e5d0ea4ca1a070b2d31ccbeae0c0f86a2f7700b92f656
|
||||
|
|
|
|||
Loading…
Reference in New Issue