From f869aec3dd0cbd792974e849f742017de9460b9e Mon Sep 17 00:00:00 2001 From: Miro Hrončok Date: Aug 01 2018 15:51:23 +0000 Subject: Update to 2.7.0 (#1595001), make doc noarch --- diff --git a/.gitignore b/.gitignore index dcdd683..d19d78e 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /numpy-stl-2.3.2.tar.gz /numpy-stl-2.4.1.tar.gz /numpy-stl-v2.6.0.tar.xz +/numpy-stl-v2.7.0.tar.xz diff --git a/numpy-stl-python37.patch b/numpy-stl-python37.patch deleted file mode 100644 index 65c930b..0000000 --- a/numpy-stl-python37.patch +++ /dev/null @@ -1,72 +0,0 @@ -From c472e634aa6aa4c42adef5601541b641c79f6bf0 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= -Date: Mon, 25 Jun 2018 13:18:24 +0200 -Subject: [PATCH] Support Python 3.7 (PEP 479) - -See https://www.python.org/dev/peps/pep-0479/ -Fixes https://github.com/WoLpH/numpy-stl/issues/82 ---- - .travis.yml | 7 +++++++ - stl/stl.py | 2 +- - tox.ini | 5 ++++- - 3 files changed, 12 insertions(+), 2 deletions(-) - -diff --git a/.travis.yml b/.travis.yml -index a5af03b..b1b1aad 100644 ---- a/.travis.yml -+++ b/.travis.yml -@@ -13,6 +13,13 @@ env: - - TOX_ENV=py34-nix - - TOX_ENV=py35-nix - - TOX_ENV=py36-nix -+matrix: -+ include: -+ - env: TOX_ENV=py37-nix -+ python: '3.7-dev' -+ install: pip install coveralls flake8 tox -+ # be more verbose not to timeout: -+ script: tox -vv -e $TOX_ENV - install: - - pip install -r tests/requirements.txt - - pip install coveralls flake8 tox -diff --git a/stl/stl.py b/stl/stl.py -index f4007ed..ec8225d 100644 ---- a/stl/stl.py -+++ b/stl/stl.py -@@ -214,7 +214,7 @@ def get(prefix=''): - except AssertionError as e: # pragma: no cover - raise RuntimeError(recoverable[0], e) - except StopIteration: -- raise -+ return - - @classmethod - def _load_ascii(cls, fh, header, speedups=True): -diff --git a/tox.ini b/tox.ini -index 275a844..f8a1057 100644 ---- a/tox.ini -+++ b/tox.ini -@@ -1,5 +1,5 @@ - [tox] --envlist = {py27,py33,py34,py35,py36}-{windows-32,windows-64,nix}, docs, flake8 -+envlist = {py27,py33,py34,py35,py36,py37}-{windows-32,windows-64,nix}, docs, flake8 - skip_missing_interpreters = True - - [testenv] -@@ -12,6 +12,7 @@ basepython = - py34-nix: python3.4 - py35-nix: python3.5 - py36-nix: python3.6 -+ py37-nix: python3.7 - py27-windows-32: C:\\Python27\\python.exe - py27-windows-64: C:\\Python27-x64\\python.exe - py34-windows-32: C:\\Python34\\python.exe -@@ -20,6 +21,8 @@ basepython = - py35-windows-64: C:\\Python35-x64\\python.exe - py36-windows-32: C:\\Python36\\python.exe - py36-windows-64: C:\\Python36-x64\\python.exe -+ py37-windows-32: C:\\Python37\\python.exe -+ py37-windows-64: C:\\Python37-x64\\python.exe - - [testenv:flake8] - basepython=python diff --git a/python-numpy-stl.spec b/python-numpy-stl.spec index 3b25f01..ed8b0a9 100644 --- a/python-numpy-stl.spec +++ b/python-numpy-stl.spec @@ -1,17 +1,14 @@ %global pypi_name numpy-stl Name: python-%{pypi_name} -Version: 2.6.0 -Release: 2%{?dist} +Version: 2.7.0 +Release: 1%{?dist} Summary: Library for reading, writing and modifying STL files License: BSD URL: https://github.com/WoLpH/numpy-stl/ Source0: %{url}/releases/download/v%{version}/%{pypi_name}-v%{version}.tar.xz -# https://github.com/WoLpH/numpy-stl/pull/83 -Patch0: %{pypi_name}-python37.patch - BuildRequires: gcc BuildRequires: python3-devel @@ -45,6 +42,7 @@ fastest STL editing libraries for Python available. %package doc Summary: %{name} documentation Suggests: python3-%{pypi_name} +BuildArch: noarch %description doc Documentation for %{name}. @@ -84,6 +82,10 @@ rm -rf html/.{doctrees,buildinfo} %doc html %changelog +* Wed Aug 01 2018 Miro Hrončok - 2.7.0-1 +- Update to 2.7.0 (#1595001) +- Make doc subpackage noarch + * Sat Jul 14 2018 Fedora Release Engineering - 2.6.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 5865784..ee52875 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (numpy-stl-v2.6.0.tar.xz) = 85f070df8dcfc59088e18c76397eab4179713324fb312d8676fe6751c7491e7e6e1591bf35d50dc3375d2de9cecd3ade2fda765e06393796099fdf4a092f9c1a +SHA512 (numpy-stl-v2.7.0.tar.xz) = 257216cbc94b5ba837a370351a284a1395101ae56b8a61db74379ab4204d3bca2cf3d8dff076d89f2a46ea6a1771c9c6dd54be6329d32e859486063be30ccb7c