diff --git a/.gitignore b/.gitignore index 9d7c64b..795f9e2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,3 @@ /mmtf-python-1.0.6.tar.gz /mmtf-python-1.0.7.tar.gz /mmtf-python-1.0.10.tar.gz -/mmtf-python-1.0.12.tar.gz -/mmtf-python-1.1.0.tar.gz -/mmtf-python-1.1.2.tar.gz -/mmtf-python-1.1.3.tar.gz diff --git a/changelog b/changelog deleted file mode 100644 index 7ced8d7..0000000 --- a/changelog +++ /dev/null @@ -1,104 +0,0 @@ -* Fri Jan 26 2024 Fedora Release Engineering - 1.1.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Mon Jan 22 2024 Fedora Release Engineering - 1.1.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Wed Dec 27 2023 Dominik Mierzejewski 1.1.3-1 -- update to 1.1.3 -- use SPDX identifier in License field - -* Fri Jul 21 2023 Fedora Release Engineering - 1.1.2-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Tue Jun 13 2023 Python Maint - 1.1.2-20 -- Rebuilt for Python 3.12 - -* Fri Jan 20 2023 Fedora Release Engineering - 1.1.2-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Fri Jul 22 2022 Fedora Release Engineering - 1.1.2-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Mon Jun 13 2022 Python Maint - 1.1.2-17 -- Rebuilt for Python 3.11 - -* Fri Jan 21 2022 Fedora Release Engineering - 1.1.2-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Wed Dec 15 2021 Charalampos Stratakis - 1.1.2-15 -- Use pytest instead of the deprecated nose test runner - -* Fri Jul 23 2021 Fedora Release Engineering - 1.1.2-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Fri Jun 04 2021 Python Maint - 1.1.2-13 -- Rebuilt for Python 3.10 - -* Wed Jan 27 2021 Fedora Release Engineering - 1.1.2-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 1.1.2-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue May 26 2020 Miro Hrončok - 1.1.2-10 -- Rebuilt for Python 3.9 - -* Thu Jan 30 2020 Fedora Release Engineering - 1.1.2-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Oct 03 2019 Miro Hrončok - 1.1.2-8 -- Rebuilt for Python 3.8.0rc1 (#1748018) - -* Mon Aug 19 2019 Miro Hrončok - 1.1.2-7 -- Rebuilt for Python 3.8 - -* Fri Jul 26 2019 Fedora Release Engineering - 1.1.2-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sat Feb 02 2019 Fedora Release Engineering - 1.1.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Wed Oct 17 2018 Zbigniew Jędrzejewski-Szmek - 1.1.2-4 -- Subpackage python2-mmtf has been removed - See https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal - -* Sat Jul 14 2018 Fedora Release Engineering - 1.1.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Tue Jun 19 2018 Miro Hrončok - 1.1.2-2 -- Rebuilt for Python 3.7 - -* Wed May 23 2018 Dominik Mierzejewski 1.1.2-1 -- update to 1.1.2 (#1581003) - -* Fri Apr 06 2018 Dominik Mierzejewski 1.1.0-1 -- update to 1.1.0 (#1563660) - -* Wed Mar 07 2018 Dominik Mierzejewski 1.0.12-1 -- update to 1.0.12 (#1549879) - -* Wed Feb 21 2018 Dominik Mierzejewski 1.0.10-1 -- update to 1.0.10 (#1531012) -- use standard check wrapper - -* Fri Feb 09 2018 Fedora Release Engineering - 1.0.7-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 1.0.7-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Thu Jun 29 2017 Dominik Mierzejewski 1.0.7-1 -- update to 1.0.7 (#1466315) - -* Mon Jun 05 2017 Dominik Mierzejewski 1.0.6-2 -- drop redundant macro definitions and use python version macros - -* Sat Jun 03 2017 Dominik Mierzejewski 1.0.6-1 -- update to 1.0.6 -- drop workarounds for issues fixed upstream - -* Thu May 18 2017 Dominik Mierzejewski 1.0.5-1 -- initial build -- include upstream test data missing from tarball -- don't run tests requiring network access diff --git a/python-mmtf.spec b/python-mmtf.spec index 82d7bf3..4149e36 100644 --- a/python-mmtf.spec +++ b/python-mmtf.spec @@ -21,10 +21,10 @@ doi: 10.1145/2945292.2945324\ Name: python-mmtf -Version: 1.1.3 -Release: %autorelease +Version: 1.0.10 +Release: 1%{?dist} Summary: A decoding library for the macromolecular transmission format (MMTF) -License: Apache-2.0 +License: ASL 2.0 URL: https://github.com/rcsb/mmtf-python Source0: https://files.pythonhosted.org/packages/source/m/%{pname}/%{pname}-%{version}.tar.gz BuildArch: noarch @@ -32,14 +32,29 @@ BuildArch: noarch %description %{desc} +%package -n python2-mmtf +Summary: %{summary} +BuildRequires: python2-devel +%if %{with check} +BuildRequires: python2-msgpack +BuildRequires: python2-nose +BuildRequires: python2-numpy +%endif +%{?python_provide:%python_provide python2-mmtf} +Requires: python2-msgpack + +%description -n python2-mmtf +%{desc} + %package -n python3-mmtf Summary: %{summary} BuildRequires: python3-devel %if %{with check} BuildRequires: python3-msgpack -BuildRequires: python3-pytest +BuildRequires: python3-nose BuildRequires: python3-numpy %endif +%{?python_provide:%python_provide python3-mmtf} Requires: python3-msgpack %description -n python3-mmtf @@ -48,25 +63,49 @@ Requires: python3-msgpack %prep %setup -q -n %{pname}-%{version} -%generate_buildrequires -%pyproject_buildrequires - %build -%pyproject_wheel +%py2_build +%py3_build %install -%pyproject_install -%pyproject_save_files -l mmtf +%py2_install +%py3_install +rm %{buildroot}%{_bindir}/sample %if %{with check} %check -%pyproject_check_import - -%pytest mmtf/tests/codec_tests.py +nosetests-%{python2_version} +nosetests-%{python3_version} %endif -%files -n python3-mmtf -f %{pyproject_files} +%files -n python2-mmtf +%license LICENSE.txt %doc CHANGELOG.md README.md +%{python2_sitelib}/mmtf_python-%{version}-py%{python2_version}.egg-info +%{python2_sitelib}/mmtf + +%files -n python3-mmtf +%license LICENSE.txt +%doc CHANGELOG.md README.md +%{python3_sitelib}/mmtf_python-%{version}-py%{python3_version}.egg-info +%{python3_sitelib}/mmtf %changelog -%autochangelog +* Wed Feb 21 2018 Dominik Mierzejewski 1.0.10-1 +- update to 1.0.10 (#1531012) +- use standard check wrapper + +* Thu Jun 29 2017 Dominik Mierzejewski 1.0.7-1 +- update to 1.0.7 (#1466315) + +* Mon Jun 05 2017 Dominik Mierzejewski 1.0.6-2 +- drop redundant macro definitions and use python version macros + +* Sat Jun 03 2017 Dominik Mierzejewski 1.0.6-1 +- update to 1.0.6 +- drop workarounds for issues fixed upstream + +* Thu May 18 2017 Dominik Mierzejewski 1.0.5-1 +- initial build +- include upstream test data missing from tarball +- don't run tests requiring network access diff --git a/sources b/sources index 14839d7..82af65a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mmtf-python-1.1.3.tar.gz) = 44558ea3e38e8eb6431e597253473e49d4a4e3835f790f375f923d3c3702b3c096d5ecaac090a8fabc1cd285d6cfa8dbd3f7d6186d765b92d718ca6d34ad063b +SHA512 (mmtf-python-1.0.10.tar.gz) = 667643a783ca132abd2d1d411c3f97b1ba5201597f00bc066c9ff39fb43e3c48676609daf5f1012de3f66ba76affe722cb804cb611cf336883b1d70d8bce3b2b