diff --git a/.gitignore b/.gitignore index f9b3651..f69d264 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /fsleyes-1.5.0.tar.gz /fsleyes-1.6.1.tar.gz /fsleyes-1.7.0.tar.gz +/fsleyes-1.9.0.tar.gz diff --git a/python-fsleyes.spec b/python-fsleyes.spec index 91718dc..a55aa02 100644 --- a/python-fsleyes.spec +++ b/python-fsleyes.spec @@ -15,7 +15,7 @@ FSLeyes, the FSL image viewer %global forgeurl https://github.com/pauldmccarthy/fsleyes Name: python-fsleyes -Version: 1.7.0 +Version: 1.9.0 Release: %autorelease Summary: FSLeyes, the FSL image viewer @@ -64,26 +64,18 @@ Provides: fsleyes = %{version}-%{release} %prep %forgesetup -# remove jinja version fix -# https://github.com/pauldmccarthy/fsleyes/issues/82 -sed -i 's/jinja2.*/jinja2/' requirements.txt -# relax required pyparsing version -sed -i 's/pyparsing==2.\*/pyparsing/' requirements.txt # extras: not yet packaged in Fedora -sed -i '/file-tree/ d' requirements-extra.txt -# Add extra requirements for autogenerator -cat requirements-extra.txt >> requirements.txt -cat requirements-notebook.txt >> requirements.txt - -# Remove unnecessary upper limit on Pillow: -# https://github.com/pauldmccarthy/fsleyes/issues/7 -# sed -i 's/\(Pillow>=3.2.0\),.*/\1/' requirements.txt +sed -i -e '/"file-tree"/ d' \ + -e '/"file-tree-fsl"/ d' \ + -e '/"coverage"/ d' \ + -e '/"pytest-cov"/ d' \ + pyproject.toml # remove unneeded shebangs find . -name "*py" -exec sed -i '/#!\/usr\/bin\/env python/ d' '{}' \; %generate_buildrequires -%pyproject_buildrequires -r requirements.txt requirements-dev.txt +%pyproject_buildrequires -x extra -x test %build %pyproject_wheel diff --git a/sources b/sources index 1d396d3..eb7fee6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (fsleyes-1.7.0.tar.gz) = a07b8f34d95e814ef4ba2959e06a04f0e8fbaf669e8f7f2eabc4048bebb1b9b2666f1b9ac7ca4a07e162db9d314fafccd04e92021421733690a7b5a8f87a41c5 +SHA512 (fsleyes-1.9.0.tar.gz) = c02a3d7ae157fa92ac2fd7e8ac28f2789ed4bb9f64cc1731ccefb4ad78a05d223093af47845cddc331d3402c0c89574558beba7f2adb905e817dc14750eed20f