Compare commits

...

24 Commits
f23 ... master

Author SHA1 Message Date
Miro Hrončok
0b494fc10f Rebuilt for Python 3.9 2020-05-23 09:32:29 +02:00
Terje Rosten
789654b895 Fix Python 3.9 build 2020-05-21 14:32:43 +02:00
Miro Hrončok
dcde08397f Backport an upstream commit for Python 3.9 compatibility
Resolves https://bugzilla.redhat.com/show_bug.cgi?id=1808355
2020-05-21 12:48:36 +02:00
Fedora Release Engineering
f74d4d6e72 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-01-30 12:32:12 +00:00
Miro Hrončok
696011edae Subpackages python2-greenlet, python2-greenlet-devel have been removed 2019-09-26 11:21:22 +02:00
Miro Hrončok
79b2485b35 Rebuilt for Python 3.8 2019-08-16 15:16:44 +02:00
Fedora Release Engineering
61096279ed - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-07-26 13:48:43 +00:00
Fedora Release Engineering
b26215a168 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-02-02 07:06:42 +00:00
Kevin Fenzi
0016b54b86 Update to 0.4.14.
Drop upstreamed/no longer needed patches.
2018-07-18 15:23:48 -07:00
Miro Hrončok
20df1d0f27 BR gcc-c++ instead of just gcc 2018-07-16 15:34:51 +02:00
Fedora Release Engineering
1a54d0ac89 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-07-14 00:28:43 +00:00
Igor Gnatenko
358f6bcef9
add BuildRequires: gcc
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2018-07-10 10:41:50 +02:00
Miro Hrončok
64fd86d417 Add fix for Python 3.7 2018-07-03 18:49:22 +02:00
Miro Hrončok
bbf9fcdc73 Rebuilt for Python 3.7 2018-06-16 03:21:59 +02:00
Fedora Release Engineering
7116e95c4e - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-02-09 08:12:22 +00:00
Igor Gnatenko
3e5551b801
Update to 0.4.13
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2018-02-02 15:03:48 +01:00
Igor Gnatenko
93670603f1 Update to 0.4.12
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1418486
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1424152
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2018-01-12 10:48:59 +01:00
Fedora Release Engineering
f0d8240613 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild 2017-08-03 06:46:02 +00:00
Fedora Release Engineering
f974bdb993 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild 2017-07-27 10:31:36 +00:00
Fedora Release Engineering
c35be8fa57 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild 2017-02-11 09:12:41 +00:00
Miro Hrončok
e0f18d3965 Rebuild for Python 3.6 2016-12-20 10:27:56 +01:00
Miro Hrončok
56790043cb Fix invalid UTF-8 2016-12-20 10:27:35 +01:00
Kevin Fenzi
883f258244 Update to 0.4.11. Fixes bug #1403514 2016-12-11 12:45:22 -07:00
Peter Robinson
8895940a4d - Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 2015-11-10 16:02:10 +00:00
4 changed files with 144 additions and 106 deletions

4
.gitignore vendored
View File

@ -5,3 +5,7 @@ greenlet-0.3.1.tar.gz
/greenlet-0.4.5.zip /greenlet-0.4.5.zip
/greenlet-0.4.7.zip /greenlet-0.4.7.zip
/greenlet-0.4.9.zip /greenlet-0.4.9.zip
/0.4.11.tar.gz
/greenlet-0.4.12.tar.gz
/greenlet-0.4.13.tar.gz
/greenlet-0.4.14.tar.gz

View File

@ -0,0 +1,48 @@
From d05b62bb75e6a3e217435a1fe0f15a53e692898c Mon Sep 17 00:00:00 2001
From: Victor Stinner <vstinner@python.org>
Date: Wed, 18 Mar 2020 15:09:33 +0100
Subject: [PATCH] Port to Python 3.9
On Python 3.9, define _Py_DEC_REFTOTAL which has been removed by:
https://github.com/python/cpython/commit/49932fec62c616ec88da52642339d83ae719e924
Replace also PyEval_CallObjectWithKeywords() with PyObject_Call(),
since PyEval_CallObjectWithKeywords() has been deprecated in
Python 3.9 and PyObject_Call() has the same behavior. The only
difference is that PyEval_CallObjectWithKeywords() can be called with
args=NULL, but g_initialstub() ensures that args is not NULL.
---
greenlet.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/greenlet.c b/greenlet.c
index ec738b9..d37fc97 100644
--- a/greenlet.c
+++ b/greenlet.c
@@ -109,6 +109,16 @@ extern PyTypeObject PyGreenlet_Type;
#define GREENLET_USE_TRACING 1
#endif
+#ifndef _Py_DEC_REFTOTAL
+ /* _Py_DEC_REFTOTAL macro has been removed from Python 3.9 by:
+ https://github.com/python/cpython/commit/49932fec62c616ec88da52642339d83ae719e924 */
+# ifdef Py_REF_DEBUG
+# define _Py_DEC_REFTOTAL _Py_RefTotal--
+# else
+# define _Py_DEC_REFTOTAL
+# endif
+#endif
+
/* Weak reference to the switching-to greenlet during the slp switch */
static PyGreenlet* volatile ts_target = NULL;
/* Strong reference to the switching from greenlet after the switch */
@@ -820,8 +830,7 @@ static int GREENLET_NOINLINE(g_initialstub)(void* mark)
result = NULL;
} else {
/* call g.run(*args, **kwargs) */
- result = PyEval_CallObjectWithKeywords(
- run, args, kwargs);
+ result = PyObject_Call(run, args, kwargs);
Py_DECREF(args);
Py_XDECREF(kwargs);
}

View File

@ -1,141 +1,127 @@
%global modname greenlet %global modname greenlet
%global with_python3 1
Name: python-%{modname} Name: python-%{modname}
Version: 0.4.9 Version: 0.4.14
Release: 1%{?dist} Release: 8%{?dist}
Summary: Lightweight in-process concurrent programming Summary: Lightweight in-process concurrent programming
Group: Development/Libraries
License: MIT License: MIT
URL: http://pypi.python.org/pypi/%{modname} URL: https://github.com/python-greenlet/greenlet
Source0: http://pypi.python.org/packages/source/g/%{modname}/%{modname}-%{version}.zip Source0: %{url}/archive/%{version}/%{modname}-%{version}.tar.gz
BuildRequires: gcc-c++
Patch1: %{url}/commit/c644ca6823994b958e004b3e00b587723181b58e.patch
BuildRequires: python2-devel %global _description \
BuildRequires: python-setuptools The greenlet package is a spin-off of Stackless, a version of CPython\
%if 0%{?with_python3} that supports micro-threads called "tasklets". Tasklets run\
BuildRequires: python-tools pseudo-concurrently (typically in a single or a few OS-level threads)\
BuildRequires: python3-devel
BuildRequires: python3-setuptools
%endif # if with_python3
%description
The greenlet package is a spin-off of Stackless, a version of CPython
that supports micro-threads called "tasklets". Tasklets run
pseudo-concurrently (typically in a single or a few OS-level threads)
and are synchronized with data exchanges on "channels". and are synchronized with data exchanges on "channels".
%package -n python2-%{modname} %description %{_description}
Summary: %{summary}
%{?python_provide:%python_provide python2-%{modname}}
Group: Development/Libraries
%description -n python2-%{modname}
The greenlet package is a spin-off of Stackless, a version of CPython
that supports micro-threads called "tasklets". Tasklets run
pseudo-concurrently (typically in a single or a few OS-level threads)
and are synchronized with data exchanges on "channels".
This is the Python 2 version of greenlet.
%package -n python2-%{modname}-devel
Summary: C development headers for python2-greenlet
%{?python_provide:%python_provide python2-%{modname}-devel}
Group: Development/Libraries
Requires: python2-%{modname} = %{version}-%{release}
%description -n python2-%{modname}-devel
This package contains header files required for C modules development.
%if 0%{?with_python3}
%package -n python3-%{modname} %package -n python3-%{modname}
Summary: %{summary} Summary: %{summary}
%{?python_provide:%python_provide python3-%{modname}} %{?python_provide:%python_provide python3-%{modname}}
Group: Development/Libraries BuildRequires: python3-devel
BuildRequires: python3-setuptools
%description -n python3-%{modname} %description -n python3-%{modname} %{_description}
The greenlet package is a spin-off of Stackless, a version of CPython
that supports micro-threads called "tasklets". Tasklets run
pseudo-concurrently (typically in a single or a few OS-level threads)
and are synchronized with data exchanges on "channels".
This is the Python 3 version of greenlet. Python 3 version.
%package -n python3-greenlet-devel %package -n python3-%{modname}-devel
Summary: C development headers for python3-greenlet Summary: C development headers for python3-%{modname}
%{?python_provide:%python_provide python3-%{modname}-devel} %{?python_provide:%python_provide python3-%{modname}-devel}
Group: Development/Libraries Requires: python3-%{modname}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: python3-%{modname} = %{version}-%{release}
%description -n python3-%{modname}-devel %description -n python3-%{modname}-devel
This package contains header files required for C modules development. %{summary}.
%endif # if with_python3 Python 3 version.
%prep %prep
%setup -q -n greenlet-%{version} %autosetup -n %{modname}-%{version} -p1
chmod 644 benchmarks/*.py
%if 0%{?with_python3}
rm -rf %{py3dir}
cp -a . %{py3dir}
%endif # if with_python3
%build %build
%py2_build %py3_build
%if 0%{?with_python3}
pushd %{py3dir}
%py3_build
popd
%endif # if with_python3
%install %install
# Install python 3 first, so that python 2 gets precedence: %py3_install
%if 0%{?with_python3}
pushd %{py3dir}
%py3_install
popd
%endif # if with_python3
%py2_install
%check %check
# Run the upstream test suite and benchmarking suite to further exercise the code %{__python3} setup.py test
%{__python2} setup.py test
PYTHONPATH=$(pwd) %{__python2} benchmarks/chain.py
%if 0%{?with_python3}
PYTHONPATH=
pushd %{py3dir}
%{__python3} setup.py test || :
2to3 -w --no-diffs -n benchmarks/chain.py
PYTHONPATH=$(pwd) %{__python3} benchmarks/chain.py
%endif # if with_python3
%files -n python2-%{modname} %files -n python3-%{modname}
%license LICENSE LICENSE.PSF %license LICENSE LICENSE.PSF
%doc AUTHORS NEWS README.rst %doc AUTHORS NEWS README.rst
%doc doc/greenlet.txt benchmarks %{python3_sitearch}/%{modname}-*.egg-info
%{python_sitearch}/greenlet.so %{python3_sitearch}/%{modname}*.so
%{python_sitearch}/greenlet*.egg-info
%files -n python2-%{modname}-devel
%license LICENSE LICENSE.PSF
%doc AUTHORS NEWS README.rst
%{_includedir}/python2*/greenlet
%if 0%{?with_python3}
%files -n python3-greenlet
%license LICENSE LICENSE.PSF
%doc AUTHORS NEWS README.rst
%doc doc/greenlet.txt benchmarks
%{python3_sitearch}/greenlet.cpython-*.so
%{python3_sitearch}/greenlet*.egg-info
%files -n python3-greenlet-devel %files -n python3-greenlet-devel
%license LICENSE LICENSE.PSF %{_includedir}/python%{python3_version}*/%{modname}/
%doc AUTHORS NEWS README.rst
%{_includedir}/python3*/greenlet
%endif # if with_python3
%changelog %changelog
* Sat May 23 2020 Miro Hrončok <mhroncok@redhat.com> - 0.4.14-8
- Rebuilt for Python 3.9
* Thu May 21 2020 Miro Hrončok <mhroncok@redhat.com> - 0.4.14-7
- Fix Python 3.9 build
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.14-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Thu Sep 26 2019 Miro Hrončok <mhroncok@redhat.com> - 0.4.14-5
- Subpackages python2-greenlet, python2-greenlet-devel have been removed
See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal
* Fri Aug 16 2019 Miro Hrončok <mhroncok@redhat.com> - 0.4.14-4
- Rebuilt for Python 3.8
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.14-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.14-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Wed Jul 18 2018 Kevin Fenzi <kevin@scrye.com> - 0.4.14-1
- Update to 0.4.14.
- Drop upstreamed/no longer needed patches.
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.13-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Tue Jul 03 2018 Miro Hrončok <mhroncok@redhat.com> - 0.4.13-4
- Add fix for Python 3.7
* Sat Jun 16 2018 Miro Hrončok <mhroncok@redhat.com> - 0.4.13-3
- Rebuilt for Python 3.7
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.13-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Fri Feb 02 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.4.13-1
- Update to 0.4.13
* Fri Jan 12 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.4.12-1
- Update to 0.4.12
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.11-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.11-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.11-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Tue Dec 20 2016 Miro Hrončok <mhroncok@redhat.com> - 0.4.11-2
- Rebuild for Python 3.6
* Sun Dec 11 2016 Kevin Fenzi <kevin@scrye.com> - 0.4.11-1
- Update to 0.4.11. Fixes bug #1403514
* Tue Nov 10 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.9-2
- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5
* Sun Oct 25 2015 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.4.9-1 * Sun Oct 25 2015 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.4.9-1
- Update to 0.4.9 - Update to 0.4.9
- Use %license macro - Use %license macro
@ -152,7 +138,7 @@ PYTHONPATH=$(pwd) %{__python3} benchmarks/chain.py
* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.5-2 * Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Sun Mar 29 2015 Terje Røsten <terje.rosten@ntnu.no> - 0.4.5-1 * Sun Mar 29 2015 Terje Røsten <terje.rosten@ntnu.no> - 0.4.5-1
- 0.4.5 - 0.4.5
- Add python3 subpackage - Add python3 subpackage
- Ship license files - Ship license files

View File

@ -1 +1 @@
c6659cdb2a5e591723e629d2eef22e82 greenlet-0.4.9.zip SHA512 (greenlet-0.4.14.tar.gz) = c86802a0df56b78482b029a0eaf624ca8f14d0e704480b30a8a35e343b3e4a16e80b6f169a970a39935b39d56aafc25bada0738199818b5892ca398a809d54ef