rpms/python-admesh
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: rpms:rawhide
Branches Tags
rpms:rawhide
rpms:f43
rpms:main
rpms:f42
rpms:f41
rpms:f40
rpms:f39
rpms:f38
rpms:f37
rpms:f36
rpms:f35
rpms:f34
rpms:f33
rpms:f32
rpms:f31
rpms:f30
rpms:f29
rpms:f28
rpms:f27
rpms:f26
rpms:f25
rpms:f24
rpms:f23
rpms:f21
rpms:f22
..
compare: rpms:f24
Branches Tags
rpms:f43
rpms:main
rpms:rawhide
rpms:f42
rpms:f41
rpms:f40
rpms:f39
rpms:f38
rpms:f37
rpms:f36
rpms:f35
rpms:f34
rpms:f33
rpms:f32
rpms:f31
rpms:f30
rpms:f29
rpms:f28
rpms:f27
rpms:f26
rpms:f25
rpms:f24
rpms:f23
rpms:f21
rpms:f22

No commits in common. "rawhide" and "f24" have entirely different histories.
rawhide ... f24

6 changed files with 101 additions and 202 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

@ -1,6 +1,3 @@
/admesh-0.98.1.tar.gz /admesh-0.98.1.tar.gz
/admesh-0.98.3.tar.gz /admesh-0.98.3.tar.gz
/admesh-0.98.5.tar.gz /admesh-0.98.5.tar.gz
/admesh-0.98.7.tar.gz
/admesh-0.98.8.tar.gz
/admesh-0.98.9.tar.gz

39
17.patch
View file

@ -1,39 +0,0 @@
From 52a68f3d1dd3568dd399ec10b1e5029d0889397d Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Tue, 27 May 2025 08:33:05 -0400
Subject: [PATCH] Drop pytest-runner and "setup.py test" support
---
setup.py | 4 ++--
tox.ini | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/setup.py b/setup.py
index 0f003dd..9476806 100755
--- a/setup.py
+++ b/setup.py
@@ -19,8 +19,8 @@ def _autogen(*args, **kwargs):
author_email='miro@hroncok.cz',
url='https://github.com/admesh/python-admesh',
license='GPLv2+',
- setup_requires=['Cython>=0.22', 'pytest-runner'],
- tests_require=['pytest'],
+ setup_requires=['Cython>=0.22'],
+ extras_require={'test': ['pytest']},
packages=find_packages(),
cmdclass={'build_ext': _autogen},
ext_modules=[Extension("admesh", ["admesh.pyx"], libraries=["admesh"])],
diff --git a/tox.ini b/tox.ini
index b41f291..3e0e723 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,7 +2,8 @@
envlist = py37,py36,py35,py34,py27,pypy3,pypy
[testenv]
deps=Cython
-commands=python setup.py test
+extras=test
+commands=pytest
passenv =
CFLAGS
LDFLAGS

117
changelog
View file

@ -1,117 +0,0 @@
* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.98.9-19
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.98.9-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.98.9-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Tue Jun 13 2023 Python Maint <python-maint@redhat.com> - 0.98.9-16
- Rebuilt for Python 3.12
* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.98.9-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.98.9-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 0.98.9-13
- Rebuilt for Python 3.11
* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.98.9-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.98.9-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 0.98.9-10
- Rebuilt for Python 3.10
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.98.9-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.98.9-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue May 26 2020 Miro Hrončok <mhroncok@redhat.com> - 0.98.9-7
- Rebuilt for Python 3.9
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.98.9-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 0.98.9-5
- Rebuilt for Python 3.8
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.98.9-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.98.9-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.98.9-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Mon Jun 25 2018 Miro Hrončok <mhroncok@redhat.com> - 0.98.9-1
- Update to 0.98.9
- Temporarily skip a test on ppc64
* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 0.98.8-3
- Rebuilt for Python 3.7
* Fri Mar 02 2018 Miro Hrončok <mhroncok@redhat.com> - 0.98.8-2
- Remove legacy Python subpackage
* Wed Feb 14 2018 Miro Hrončok <mhroncok@redhat.com> - 0.98.8-1
- Updated to new version 0.98.8 to fix FTBFS
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.98.7-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.98.7-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.98.7-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Thu Apr 13 2017 Miro Hrončok <mhroncok@redhat.com> - 0.98.7-1
- Updated to new version 0.98.7
- Updated to the new naming scheme
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.98.5-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Mon Dec 19 2016 Miro Hrončok <mhroncok@redhat.com> - 0.98.5-4
- Rebuild for Python 3.6
* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.98.5-3
- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.98.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Tue Dec 08 2015 Miro Hrončok <mhroncok@redhat.com> - 0.98.5-1
- New version 0.98.5, fix FTBFS
* Tue Nov 10 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.98.3-3
- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5
* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.98.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Wed Feb 25 2015 Miro Hrončok <mhroncok@redhat.com> - 0.98.3-1
- New version 0.98.3
* Wed Sep 03 2014 Miro Hrončok <mhroncok@redhat.com> - 0.98.1-1
- New version
- Run tests, add BR pytest
* Wed Sep 03 2014 Miro Hrončok <mhroncok@redhat.com> - 0.98-3
- Set correct executable permissions
- Typo in summary
* Thu Jul 31 2014 Miro Hrončok <mhroncok@redhat.com> - 0.98-2
- Require setuptools.
* Tue Jul 29 2014 Miro Hrončok <mhroncok@redhat.com> - 0.98-1
- Initial package.

137
python-admesh.spec
View file

@ -1,67 +1,130 @@
Name: python-admesh %global pypi_name admesh
Version: 0.98.9 %global with_python3 1
Release: %autorelease
Name: python-%{pypi_name}
Version: 0.98.5
Release: 2%{?dist}
Summary: Python bindings for ADMesh, STL manipulation library Summary: Python bindings for ADMesh, STL manipulation library
License: GPL-2.0-or-later License: GPLv2+
URL: https://github.com/admesh/python-admesh URL: https://github.com/admesh/python-admesh
Source0: https://files.pythonhosted.org/packages/source/a/admesh/admesh-%{version}.tar.gz Source0: https://pypi.python.org/packages/source/a/%{pypi_name}/%{pypi_name}-%{version}.tar.gz
# https://github.com/admesh/python-admesh/issues/15 BuildRequires: python2-devel
Source1: %{url}/raw/v%{version}/test/utils.py BuildRequires: python-setuptools
BuildRequires: pytest
# Drop pytest-runner and "setup.py test" support BuildRequires: Cython
# https://github.com/admesh/python-admesh/pull/17
# https://fedoraproject.org/wiki/Changes/DeprecatePythonPytestRunner
Patch: %{url}/pull/17.patch
# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
%if 0%{?fedora} >= 42 || 0%{?rhel} >= 11
ExcludeArch: %{ix86}
%endif
BuildRequires: gcc
BuildRequires: admesh-devel >= 0.98 BuildRequires: admesh-devel >= 0.98
%if %{?with_python3}
BuildRequires: python3-devel BuildRequires: python3-devel
BuildRequires: python3-pytest
BuildRequires: python3-setuptools
BuildRequires: python3-Cython
%endif # if with_python3
%description %description
This module provides bindings for the ADMesh library. This module provides bindings for the ADMesh library.
It lets you manipulate 3D models in binary or ASCII STL It lets you manipulate 3D models in binary or ASCII STL
format and partially repair them if necessary. format and partially repair them if necessary.
%package -n python3-admesh
Summary: Python 3 bindings for ADMesh, STL manipulation library
%description -n python3-admesh %if 0%{?with_python3}
%package -n python3-%{pypi_name}
Summary: Python 3 bindings for ADMesh, STL maipulation library
%description -n python3-%{pypi_name}
This module provides bindings for the ADMesh library. This module provides bindings for the ADMesh library.
It lets you manipulate 3D models in binary or ASCII STL It lets you manipulate 3D models in binary or ASCII STL
format and partially repair them if necessary. format and partially repair them if necessary.
%endif # with_python3
%prep %prep
%autosetup -n admesh-%{version} -p1 %setup -q -n %{pypi_name}-%{version}
cp %{SOURCE1} test/ # Remove bundled egg-info
rm -rf %{pypi_name}.egg-info
%if 0%{?with_python3}
rm -rf %{py3dir}
cp -a . %{py3dir}
find %{py3dir} -name '*.py' | xargs sed -i '1s|^#!python|#!%{__python3}|'
%endif # with_python3
%generate_buildrequires
%pyproject_buildrequires -x test
%build %build
%pyproject_wheel %{__python2} setup.py build
%if 0%{?with_python3}
pushd %{py3dir}
%{__python3} setup.py build
popd
%endif # with_python3
%install %install
%pyproject_install %{__python2} setup.py install --skip-build --root %{buildroot}
%pyproject_save_files -l admesh
%if 0%{?with_python3}
pushd %{py3dir}
%{__python3} setup.py install --skip-build --root %{buildroot}
popd
%endif # with_python3
%check %check
%pyproject_check_import export PYTHONPATH=`echo build/lib.linux-*/`
%pytest -v py.test-%{python2_version} -v
%files -n python3-admesh -f %{pyproject_files} %if 0%{?with_python3}
%doc README.rst pushd %{py3dir}
export PYTHONPATH=`echo build/lib.linux-*/`
py.test-%{python3_version} -v
popd
%endif # with_python3
%files
%doc README.rst COPYING
%attr(0755,root,root) %{python2_sitearch}/%{pypi_name}.so
%{python2_sitearch}/%{pypi_name}-%{version}-py?.?.egg-info
%if 0%{?with_python3}
%files -n python3-%{pypi_name}
%doc README.rst COPYING
%attr(0755,root,root) %{python3_sitearch}/%{pypi_name}.*.so
%{python3_sitearch}/%{pypi_name}-%{version}-py?.?.egg-info
%endif # with_python3
%changelog %changelog
%autochangelog * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.98.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Tue Dec 08 2015 Miro Hrončok <mhroncok@redhat.com> - 0.98.5-1
- New version 0.98.5, fix FTBFS
* Tue Nov 10 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.98.3-3
- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5
* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.98.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Wed Feb 25 2015 Miro Hrončok <mhroncok@redhat.com> - 0.98.3-1
- New version 0.98.3
* Wed Sep 03 2014 Miro Hrončok <mhroncok@redhat.com> - 0.98.1-1
- New version
- Run tests, add BR pytest
* Wed Sep 03 2014 Miro Hrončok <mhroncok@redhat.com> - 0.98-3
- Set correct executable permissions
- Typo in summary
* Thu Jul 31 2014 Miro Hrončok <mhroncok@redhat.com> - 0.98-2
- Require setuptools.
* Tue Jul 29 2014 Miro Hrončok <mhroncok@redhat.com> - 0.98-1
- Initial package.

2
sources
View file

@ -1 +1 @@
SHA512 (admesh-0.98.9.tar.gz) = 8b9776af5f39d3d1365f62531b4981022467e4ff60c22e758800278ff3fbb155d5f80c5ee5515790328d226cb7b2cd5bf905f36871c2f95fbb07b6d563b4eb7f 7355334427fcc6fe3a428b7f7b33ad13 admesh-0.98.5.tar.gz

5
utils.py
View file

@ -1,5 +0,0 @@
import os
def asset(filename):
return os.path.join(os.path.dirname(__file__), filename)