#3 Please read https://bugzilla.redhat.com/show_bug.cgi?id=1893811#c7
Closed 3 years ago by alciregi. Opened 3 years ago by alciregi.
Unknown source master  into  master

file modified
+1
@@ -5,3 +5,4 @@

  /pydicom-1.4.1.tar.gz

  /pydicom-1.4.2.tar.gz

  /pydicom-2.0.0.tar.gz

+ /pydicom-2.1.1.tar.gz

file modified
+18 -26
@@ -1,3 +1,7 @@

+ # Enable test with --test, because they download data from the net and they don't

+ # work in koji

+ %bcond_with pytest

+ 

  %global modname pydicom

  

  
@@ -14,18 +18,18 @@

  uncompressed pixels. Files can always be read and saved, but compressed pixel

  data cannot easily be modified.

  

- Python 3 version.}

- 

+ Documentation is available at https://pydicom.github.io/pydicom}

  

  Name:           python-%{modname}

- Version:        2.0.0

- Release:        4%{?dist}

+ Version:        2.1.1

+ Release:        2%{?dist}

  Summary:        Read, modify and write DICOM files with python code

  

  # There are generated data (private dict) in special format from GDCM

  License:        MIT and BSD

  URL:            https://github.com/darcymason/%{modname}

  Source0:        https://github.com/darcymason/%{modname}/archive/v%{version}/%{modname}-%{version}.tar.gz

+ 

  BuildArch:      noarch

  

  %description %_description
@@ -34,7 +38,6 @@

  Summary:        %{summary}

  %{?python_provide:%python_provide python3-%{modname}}

  BuildRequires:  python3-devel python3-setuptools python3-six

- BuildRequires:  python3-sphinx python3-sphinx_rtd_theme python3-sphinx-gallery python3-numpydoc python3-sphinx-issues

  # Test deps

  BuildRequires:  python3-numpy python3-dateutil python3-pytest

  Requires:       python3-dateutil
@@ -45,39 +48,26 @@

  

  %description -n python3-%{modname} %_description

  

- 

- %package doc

- Summary:        Python %{modname} documentation

- 

- %description doc

- Documentation for %{name}.

- 

- 

  %prep

  %autosetup -n %{modname}-%{version}

  

  %build

  %py3_build

  

- pushd doc

-   export PYTHONPATH=../

-   make html SPHINXBUILD=sphinx-build-3 BUILDDIR=_build-3

-   find -name '.buildinfo' -delete

-   find -name '.nojekyll' -delete

- popd

- 

  %install

  %py3_install

  

+ %if %{with pytest}

  %check

  # Disable TestPillowHandler_JPEG.test_color_3d because koji is unable to

  # allocate enough RAM during build. Works ok building locally

  # Disable test_handler_util, it fails to build with numpy 1.19

  # reported upstream https://github.com/pydicom/pydicom/issues/1119

  %if 0%{?fedora} > 32

-    %{__python3} -m pytest -k "not test_color_3d and not test_handler_util"

+   %{__python3} -m pytest -k "not test_color_3d and not test_handler_util"

  %else

-    %{__python3} -m pytest -k "not test_color_3d"

+   %{__python3} -m pytest -k "not test_color_3d"

+ %endif

  %endif

  

  %files -n python3-%{modname}
@@ -87,11 +77,13 @@

  %{python3_sitelib}/dicom.py

  %{python3_sitelib}/__pycache__/dicom.*

  

- %files doc

- %license LICENSE

- %doc doc/_build-3/html

- 

  %changelog

+ * Tue Dec 02 2020 Alessio <alciregi AT fedoraproject DOT org> - 2.1.1-2

+ - Removed sphinx-* buildrequire. Removed docs subpackage.

+ 

+ * Mon Nov 30 2020 Alessio <alciregi AT fedoraproject DOT org> - 2.1.1-1

+ - 2.1.1 release

+ 

  * Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-4

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

  

file modified
+1 -1
@@ -1,1 +1,1 @@

- SHA512 (pydicom-2.0.0.tar.gz) = 2e1160a467f3e20e885d5c4fe69f10b5eec5a453f5811b3f4f77a49e64f63ba822516a09114a839bfa5d9f378a6ab824a1cad439bf5c4d52cc8e17752d709ff3

+ SHA512 (pydicom-2.1.1.tar.gz) = 27777f9d7da2f1266375924110cf529a1b3f4d89fa7df1488e0f7a446fe104c7daa5a44323caae9b1ce8d2eca9f2e9e28a339b13c77b5b91cd632d71f96d480f

  • 2.1.1 version
  • Doc building now requires sphinx_copybutton, but it is not packaged in Fedora. However, commenting it in doc/conf.py it seems to work.
  • Many test failing because now some test datasets are downloaded from internet. However test are successful if the package is builded locally.
    • %bcond_with pytest

1 new commit added

  • Removed doc subpackage and sphinx buildrequires.
3 years ago

Pull-Request has been closed by alciregi

3 years ago