Version 1.3.2
This commit is contained in:
@@ -1,103 +0,0 @@
|
||||
From 65fc90154b702ebac22738fe8ecbafc520223408 Mon Sep 17 00:00:00 2001
|
||||
From: Tomas Hrnciar <thrnciar@redhat.com>
|
||||
Date: Wed, 19 May 2021 12:56:24 +0200
|
||||
Subject: [PATCH] python 3.10 compatibility - wrap if clauses in parens in C
|
||||
|
||||
---
|
||||
bottleneck/src/move_template.c | 4 ++--
|
||||
bottleneck/src/nonreduce_axis_template.c | 4 ++--
|
||||
bottleneck/src/nonreduce_template.c | 4 ++--
|
||||
bottleneck/src/reduce_template.c | 4 ++--
|
||||
4 files changed, 8 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/bottleneck/src/move_template.c b/bottleneck/src/move_template.c
|
||||
index 552d706..0215018 100644
|
||||
--- a/bottleneck/src/move_template.c
|
||||
+++ b/bottleneck/src/move_template.c
|
||||
@@ -923,7 +923,7 @@ mover(char *name,
|
||||
}
|
||||
|
||||
/* convert to array if necessary */
|
||||
- if PyArray_Check(a_obj) {
|
||||
+ if (PyArray_Check(a_obj)) {
|
||||
a = (PyArrayObject *)a_obj;
|
||||
}
|
||||
else {
|
||||
@@ -934,7 +934,7 @@ mover(char *name,
|
||||
}
|
||||
|
||||
/* check for byte swapped input array */
|
||||
- if PyArray_ISBYTESWAPPED(a) {
|
||||
+ if (PyArray_ISBYTESWAPPED(a)) {
|
||||
return slow(name, args, kwds);
|
||||
}
|
||||
|
||||
diff --git a/bottleneck/src/nonreduce_axis_template.c b/bottleneck/src/nonreduce_axis_template.c
|
||||
index ebbb4ab..e901b70 100644
|
||||
--- a/bottleneck/src/nonreduce_axis_template.c
|
||||
+++ b/bottleneck/src/nonreduce_axis_template.c
|
||||
@@ -664,7 +664,7 @@ nonreducer_axis(char *name,
|
||||
}
|
||||
|
||||
/* convert to array if necessary */
|
||||
- if PyArray_Check(a_obj) {
|
||||
+ if (PyArray_Check(a_obj)) {
|
||||
a = (PyArrayObject *)a_obj;
|
||||
}
|
||||
else {
|
||||
@@ -675,7 +675,7 @@ nonreducer_axis(char *name,
|
||||
}
|
||||
|
||||
/* check for byte swapped input array */
|
||||
- if PyArray_ISBYTESWAPPED(a) {
|
||||
+ if (PyArray_ISBYTESWAPPED(a)) {
|
||||
return slow(name, args, kwds);
|
||||
}
|
||||
|
||||
diff --git a/bottleneck/src/nonreduce_template.c b/bottleneck/src/nonreduce_template.c
|
||||
index af4d514..efa8967 100644
|
||||
--- a/bottleneck/src/nonreduce_template.c
|
||||
+++ b/bottleneck/src/nonreduce_template.c
|
||||
@@ -205,7 +205,7 @@ nonreducer(char *name,
|
||||
if (!parse_args(args, kwds, &a_obj, &old_obj, &new_obj)) return NULL;
|
||||
|
||||
/* convert to array if necessary */
|
||||
- if PyArray_Check(a_obj) {
|
||||
+ if (PyArray_Check(a_obj)) {
|
||||
a = (PyArrayObject *)a_obj;
|
||||
} else {
|
||||
if (inplace) {
|
||||
@@ -220,7 +220,7 @@ nonreducer(char *name,
|
||||
}
|
||||
|
||||
/* check for byte swapped input array */
|
||||
- if PyArray_ISBYTESWAPPED(a) {
|
||||
+ if (PyArray_ISBYTESWAPPED(a)) {
|
||||
return slow(name, args, kwds);
|
||||
}
|
||||
|
||||
diff --git a/bottleneck/src/reduce_template.c b/bottleneck/src/reduce_template.c
|
||||
index 031e1eb..366fedf 100644
|
||||
--- a/bottleneck/src/reduce_template.c
|
||||
+++ b/bottleneck/src/reduce_template.c
|
||||
@@ -1231,7 +1231,7 @@ reducer(char *name,
|
||||
}
|
||||
|
||||
/* convert to array if necessary */
|
||||
- if PyArray_Check(a_obj) {
|
||||
+ if (PyArray_Check(a_obj)) {
|
||||
a = (PyArrayObject *)a_obj;
|
||||
} else {
|
||||
a = (PyArrayObject *)PyArray_FROM_O(a_obj);
|
||||
@@ -1241,7 +1241,7 @@ reducer(char *name,
|
||||
}
|
||||
|
||||
/* check for byte swapped input array */
|
||||
- if PyArray_ISBYTESWAPPED(a) {
|
||||
+ if (PyArray_ISBYTESWAPPED(a)) {
|
||||
return slow(name, args, kwds);
|
||||
}
|
||||
|
||||
--
|
||||
2.31.1
|
||||
|
||||
+17
-18
@@ -1,17 +1,13 @@
|
||||
%global upname Bottleneck
|
||||
|
||||
Name: python-%{upname}
|
||||
Version: 1.2.1
|
||||
Release: 18%{?dist}
|
||||
Version: 1.3.2
|
||||
Release: 1%{?dist}
|
||||
Summary: Collection of fast NumPy array functions written in Cython
|
||||
|
||||
License: BSD
|
||||
URL: https://pypi.org/project/Bottleneck/
|
||||
Source0: https://files.pythonhosted.org/packages/source/B/%{upname}/%{upname}-%{version}.tar.gz
|
||||
# Backport of upstream commit to make Bottleneck compatible with Python 3.10
|
||||
# Original commit adapted for current version of Bottleneck in rawhide.
|
||||
# https://github.com/pydata/bottleneck/commit/731462221f405ca805f86cb037a42132970b64b2
|
||||
Patch1: 0001-python-3.10-compatibility-wrap-if-clauses-in-parens-.patch
|
||||
|
||||
BuildRequires: gcc
|
||||
|
||||
@@ -33,7 +29,7 @@ This package contains the HTML-docs for %{name}.
|
||||
Summary: Collection of fast NumPy array functions written in Cython
|
||||
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: python3-nose
|
||||
BuildRequires: python3-pytest
|
||||
BuildRequires: python3-numpy
|
||||
BuildRequires: python3-numpydoc
|
||||
BuildRequires: python3-scipy
|
||||
@@ -60,6 +56,10 @@ rm -f doc/sphinxext/numpydoc.py*
|
||||
# Python 2 remark
|
||||
sed -i 's/fid = file(/fid = open(/' doc/source/conf.py
|
||||
|
||||
# Remove the contributors extensions which can't work because we don't
|
||||
# have a repo anyway.
|
||||
sed -i /contributors/d doc/source/conf.py
|
||||
|
||||
%build
|
||||
%py3_build
|
||||
|
||||
@@ -73,13 +73,9 @@ rm -rf %{buildroot}%{python3_sitearch}/bottleneck/src \
|
||||
|
||||
%{_fixperms} %{buildroot}/*
|
||||
|
||||
# Move installed files to temporary location.
|
||||
mkdir -p tmp_inst
|
||||
cp -fpr %{buildroot}/* tmp_inst
|
||||
|
||||
# Build the autodocs.
|
||||
export PYTHONPATH="$PWD/tmp_inst/%{python3_sitearch}"
|
||||
mkdir -p doc/source/_static
|
||||
export PYTHONPATH="%{buildroot}%{python3_sitearch}"
|
||||
export READTHEDOCS=1
|
||||
sphinx-build -b html doc/source doc/html
|
||||
|
||||
# Clean unneeded stuff from docs.
|
||||
@@ -87,24 +83,27 @@ rm -rf doc/html/{.buildinfo,.doctrees}
|
||||
|
||||
|
||||
%check
|
||||
pushd tmp_inst/%{python3_sitearch}
|
||||
nosetests-%{python3_version} -vv
|
||||
pushd %{buildroot}%{python3_sitearch}
|
||||
pytest-%{python3_version} bottleneck -v
|
||||
popd
|
||||
|
||||
rm -rf %{buildroot}%{python3_sitearch}/.pytest_cache
|
||||
|
||||
%files doc
|
||||
%license bottleneck/LICENSE
|
||||
%license LICENSE
|
||||
%doc README* RELEASE* doc/html
|
||||
|
||||
|
||||
%files -n python3-%{upname}
|
||||
%license bottleneck/LICENSE
|
||||
%license LICENSE
|
||||
%doc README* RELEASE*
|
||||
%{python3_sitearch}/bottleneck
|
||||
%{python3_sitearch}/%{upname}-%{version}-py%{python3_version}.egg-info
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu Jun 17 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.3.2-1
|
||||
- Update to latest version (#1768152)
|
||||
|
||||
* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 1.2.1-18
|
||||
- Rebuilt for Python 3.10
|
||||
|
||||
|
||||
@@ -1 +1 @@
|
||||
SHA512 (Bottleneck-1.2.1.tar.gz) = c766999cd1501b9f1dee0177b631ece12824d1f95c33077705f6387c911df583c3556ea22b208e455567f75e6e12e29b95855a6aea316bd1d6113bf47a04cf5a
|
||||
SHA512 (Bottleneck-1.3.2.tar.gz) = 78f1a42c9429783c08de22e3c1815e8e8267a633323b7fd520b120ff21a31f9489717a1ca45b81d0b808aa48d0f17fd08b8018be48d8f78bea5f1fbd17d762d1
|
||||
|
||||
Reference in New Issue
Block a user