From 59542fc2bf240096270fe0ed2ff20d19550eac00 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sun, 22 Jan 2023 09:43:13 -0500 Subject: [PATCH 01/18] Update to 7.20.0 (close RHBZ#2162603) --- .gitignore | 1 + snakemake.spec | 13 ++++++++----- sources | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 41d20bd..866dbb2 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /snakemake-7.18.1.tar.gz /snakemake-7.18.2.tar.gz /snakemake-7.19.1.tar.gz +/snakemake-7.20.0.tar.gz diff --git a/snakemake.spec b/snakemake.spec index 1881de7..e7b7301 100644 --- a/snakemake.spec +++ b/snakemake.spec @@ -12,15 +12,18 @@ Finally, Snakemake workflows can entail a description of required software, which will be automatically deployed to any execution environment.} Name: snakemake -Version: 7.19.1 +Version: 7.20.0 Release: %autorelease Summary: Workflow management system to create reproducible and scalable data analyses # The entire project is (SPDX) MIT, except: -# - versioneer.py is LicenseRef-Fedora-Public-Domain (“License: Public Domain”) -# but does not contribute to the license of the binary RPM -# SPDX -License: MIT +# - versioneer.py is Unlicense +# - snakemake/_version.py says: +# This file is released into the public domain. +# which would be LicenseRef-Fedora-Public-Domain, except that the comments in +# versioneer.py make it clear that Unlicense is intended for the generated +# files as well. +License: MIT AND Unlicense URL: https://snakemake.readthedocs.io/en/stable/index.html Source0: https://github.com/snakemake/snakemake/archive/v%{version}/snakemake-%{version}.tar.gz diff --git a/sources b/sources index 928268b..dbce9d7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (snakemake-7.19.1.tar.gz) = d35d4f61eef4f25a7f4b5f1869e10e259fe9aad11704ee59cd4f9c0ba1a2f58cde197be57eee6ed478bedc865971b584c1a3802e2044bb9817be5d5c4d1800d1 +SHA512 (snakemake-7.20.0.tar.gz) = 527ad7d91ad502845c86e41e7ac19f2d206f76ce49c2dc50b4ecf0a95b13bd73fa44091f4e5f32af764c9e5fbe55490a22e124c046ac8c62bb990222eefc4e86 From fc6248a03af49aaad88f5104a8b52e7dbd52c249 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 8 Feb 2023 16:18:27 -0500 Subject: [PATCH 02/18] Update to 7.21.0 (close RHBZ#2166983) --- .gitignore | 1 + snakemake.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 866dbb2..53fdb3a 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /snakemake-7.18.2.tar.gz /snakemake-7.19.1.tar.gz /snakemake-7.20.0.tar.gz +/snakemake-7.21.0.tar.gz diff --git a/snakemake.spec b/snakemake.spec index e7b7301..d7e6ba9 100644 --- a/snakemake.spec +++ b/snakemake.spec @@ -12,7 +12,7 @@ Finally, Snakemake workflows can entail a description of required software, which will be automatically deployed to any execution environment.} Name: snakemake -Version: 7.20.0 +Version: 7.21.0 Release: %autorelease Summary: Workflow management system to create reproducible and scalable data analyses diff --git a/sources b/sources index dbce9d7..3db7b60 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (snakemake-7.20.0.tar.gz) = 527ad7d91ad502845c86e41e7ac19f2d206f76ce49c2dc50b4ecf0a95b13bd73fa44091f4e5f32af764c9e5fbe55490a22e124c046ac8c62bb990222eefc4e86 +SHA512 (snakemake-7.21.0.tar.gz) = a183d5810a4882ff9e31f6cbc157667f6980cbd2bd52d89521bd09161a11511343a69dbbdb2bcc390b14e9d87bc219a58fff8309c56e0fe193bf14f26531b611 From a54d2f9237b7b057928f52736310c7d10e240b95 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Mon, 13 Feb 2023 11:13:06 -0500 Subject: [PATCH 03/18] Update to 7.22.0 (close RHBZ#2169240) --- .gitignore | 1 + snakemake.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 53fdb3a..041c205 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /snakemake-7.19.1.tar.gz /snakemake-7.20.0.tar.gz /snakemake-7.21.0.tar.gz +/snakemake-7.22.0.tar.gz diff --git a/snakemake.spec b/snakemake.spec index d7e6ba9..4a10894 100644 --- a/snakemake.spec +++ b/snakemake.spec @@ -12,7 +12,7 @@ Finally, Snakemake workflows can entail a description of required software, which will be automatically deployed to any execution environment.} Name: snakemake -Version: 7.21.0 +Version: 7.22.0 Release: %autorelease Summary: Workflow management system to create reproducible and scalable data analyses diff --git a/sources b/sources index 3db7b60..dc0cc22 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (snakemake-7.21.0.tar.gz) = a183d5810a4882ff9e31f6cbc157667f6980cbd2bd52d89521bd09161a11511343a69dbbdb2bcc390b14e9d87bc219a58fff8309c56e0fe193bf14f26531b611 +SHA512 (snakemake-7.22.0.tar.gz) = d9d1667edb3f14a89d30ea7be99b8011935bddd2936a2ab81a9ec095c5fd0f7644477d9e4c1b1a08ff4b32a4e397c2923395b7a8a1cbc873c6304447be156412 From 39b75841a0ead26e4aa122621ad54476ec6291e4 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sat, 11 Mar 2023 14:26:14 -0500 Subject: [PATCH 04/18] Update to 7.24.1 (close RHBZ#2171148) --- .gitignore | 1 + snakemake.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 041c205..a116143 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /snakemake-7.20.0.tar.gz /snakemake-7.21.0.tar.gz /snakemake-7.22.0.tar.gz +/snakemake-7.24.1.tar.gz diff --git a/snakemake.spec b/snakemake.spec index 4a10894..ca58fc2 100644 --- a/snakemake.spec +++ b/snakemake.spec @@ -12,7 +12,7 @@ Finally, Snakemake workflows can entail a description of required software, which will be automatically deployed to any execution environment.} Name: snakemake -Version: 7.22.0 +Version: 7.24.1 Release: %autorelease Summary: Workflow management system to create reproducible and scalable data analyses diff --git a/sources b/sources index dc0cc22..4f23fdb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (snakemake-7.22.0.tar.gz) = d9d1667edb3f14a89d30ea7be99b8011935bddd2936a2ab81a9ec095c5fd0f7644477d9e4c1b1a08ff4b32a4e397c2923395b7a8a1cbc873c6304447be156412 +SHA512 (snakemake-7.24.1.tar.gz) = 6aaccaa62ecc29015cc598f2fbc3d5628af293251ba337c18a3b244d9d479dd22e52f8e052d47f5ccd10a930a20a8521a5646df9bb23b38170c33fc6d40ae452 From 02ba907167b94e145398c29c61e2dd7bab2f5734 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sat, 29 Apr 2023 10:17:54 -0400 Subject: [PATCH 05/18] Update to 7.25.2 (close RHBZ#2178275) --- .gitignore | 1 + snakemake.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index a116143..8643933 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ /snakemake-7.21.0.tar.gz /snakemake-7.22.0.tar.gz /snakemake-7.24.1.tar.gz +/snakemake-7.25.2.tar.gz diff --git a/snakemake.spec b/snakemake.spec index ca58fc2..388ec01 100644 --- a/snakemake.spec +++ b/snakemake.spec @@ -12,7 +12,7 @@ Finally, Snakemake workflows can entail a description of required software, which will be automatically deployed to any execution environment.} Name: snakemake -Version: 7.24.1 +Version: 7.25.2 Release: %autorelease Summary: Workflow management system to create reproducible and scalable data analyses diff --git a/sources b/sources index 4f23fdb..b20338e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (snakemake-7.24.1.tar.gz) = 6aaccaa62ecc29015cc598f2fbc3d5628af293251ba337c18a3b244d9d479dd22e52f8e052d47f5ccd10a930a20a8521a5646df9bb23b38170c33fc6d40ae452 +SHA512 (snakemake-7.25.2.tar.gz) = 27cfb3075c62aa165709d0a1aee84d91a68957e22bb265b88e17c7438d531525a2d6ab972bb1323d7f7b5bdca19b0f446b9a30a9beed2dd866b094f67f5102e9 From 21d9bbaf32be9da94f152f64f93c4e3df65781db Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Sat, 6 May 2023 09:01:15 -0400 Subject: [PATCH 06/18] Update to 7.25.3 (close RHBZ#2193279J) --- .gitignore | 1 + snakemake.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 8643933..0fb2e4e 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ /snakemake-7.22.0.tar.gz /snakemake-7.24.1.tar.gz /snakemake-7.25.2.tar.gz +/snakemake-7.25.3.tar.gz diff --git a/snakemake.spec b/snakemake.spec index 388ec01..19c7c01 100644 --- a/snakemake.spec +++ b/snakemake.spec @@ -12,7 +12,7 @@ Finally, Snakemake workflows can entail a description of required software, which will be automatically deployed to any execution environment.} Name: snakemake -Version: 7.25.2 +Version: 7.25.3 Release: %autorelease Summary: Workflow management system to create reproducible and scalable data analyses diff --git a/sources b/sources index b20338e..604e5a3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (snakemake-7.25.2.tar.gz) = 27cfb3075c62aa165709d0a1aee84d91a68957e22bb265b88e17c7438d531525a2d6ab972bb1323d7f7b5bdca19b0f446b9a30a9beed2dd866b094f67f5102e9 +SHA512 (snakemake-7.25.3.tar.gz) = 795d5345aa7cebafe2c5d251d91a686a9aae8a69e277060ee768a76c64909cd9b1864984a72a4d97f5f5f2ab08b411fa0d9c0c56ca521d6f1dfc8609198354b6 From 934e14efcb651684e1b9ba8f4d1aa9dfb27f2cc5 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Mon, 22 May 2023 14:50:57 -0400 Subject: [PATCH 07/18] Update to 7.26.0 (close RHBZ#2203471) --- .gitignore | 1 + snakemake.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 0fb2e4e..ca6ef7d 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ /snakemake-7.24.1.tar.gz /snakemake-7.25.2.tar.gz /snakemake-7.25.3.tar.gz +/snakemake-7.26.0.tar.gz diff --git a/snakemake.spec b/snakemake.spec index 19c7c01..ffd7e5f 100644 --- a/snakemake.spec +++ b/snakemake.spec @@ -12,7 +12,7 @@ Finally, Snakemake workflows can entail a description of required software, which will be automatically deployed to any execution environment.} Name: snakemake -Version: 7.25.3 +Version: 7.26.0 Release: %autorelease Summary: Workflow management system to create reproducible and scalable data analyses diff --git a/sources b/sources index 604e5a3..9610fd4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (snakemake-7.25.3.tar.gz) = 795d5345aa7cebafe2c5d251d91a686a9aae8a69e277060ee768a76c64909cd9b1864984a72a4d97f5f5f2ab08b411fa0d9c0c56ca521d6f1dfc8609198354b6 +SHA512 (snakemake-7.26.0.tar.gz) = cf2cfb80e739dc9c1738a80390d611f774965f87b730aef7d80c70d953969d7f7e4abeb24191146f5fdc8d79ae34c43dbd4fd7753e6aa3eef68e8e74af4d163d From dd5f87b403a72b8f3d520824a033e1bedcc5e7f2 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Mon, 22 May 2023 15:04:41 -0400 Subject: [PATCH 08/18] Add a generated man page --- snakemake.spec | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/snakemake.spec b/snakemake.spec index ffd7e5f..3fa0dc7 100644 --- a/snakemake.spec +++ b/snakemake.spec @@ -35,6 +35,8 @@ Patch: snakemake-7.11.0-docs-no-animated-demo.patch BuildRequires: python3-devel +BuildRequires: help2man + %if %{with tests} # See test-environment.yml for a listing of test dependencies, along with a lot # of other cruft. @@ -111,6 +113,17 @@ PYTHONPATH="${PWD}" %make_build -C docs latexpdf SPHINXOPTS='%{?_smp_mflags}' %pyproject_install %pyproject_save_files snakemake +# We wait until %%install to generate the man page so that we can use the +# proper script entry point. The generated man page is not perfect, but it is +# good enough to be useful. +install -d %{buildroot}%{_mandir}/man1 +PATH="${PATH-}:%{buildroot}%{_bindir}" \ + PYTHONPATH='%{buildroot}%{python3_sitelib}' \ + help2man --no-info --name='%{summary}' snakemake \ + > %{buildroot}%{_mandir}/man1/snakemake.1 +# No man page for snakemake-bash-completion since it is not intended for manual +# invocation. + %check %if %{with tests} # Lint output “Migrate long run directives into scripts or notebooks …” is @@ -129,6 +142,8 @@ k="${k-}${k+ and }not test_slurm_" %files -f %{pyproject_files} %{_bindir}/snakemake +%{_mandir}/man1/snakemake.1* + %{_bindir}/snakemake-bash-completion %files doc From 7dd074baa3d65bfd2ec82aed7db6350946de18ed Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Mon, 22 May 2023 15:10:39 -0400 Subject: [PATCH 09/18] Install bash completions --- snakemake.spec | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/snakemake.spec b/snakemake.spec index 3fa0dc7..387881a 100644 --- a/snakemake.spec +++ b/snakemake.spec @@ -124,6 +124,13 @@ PATH="${PATH-}:%{buildroot}%{_bindir}" \ # No man page for snakemake-bash-completion since it is not intended for manual # invocation. +# Generate and install shell completions. +install -d %{buildroot}%{bash_completions_dir} +PATH="${PATH-}:%{buildroot}%{_bindir}" \ + PYTHONPATH='%{buildroot}%{python3_sitelib}' \ + snakemake --bash-completion \ + > %{buildroot}%{bash_completions_dir}/snakemake.bash + %check %if %{with tests} # Lint output “Migrate long run directives into scripts or notebooks …” is @@ -145,6 +152,7 @@ k="${k-}${k+ and }not test_slurm_" %{_mandir}/man1/snakemake.1* %{_bindir}/snakemake-bash-completion +%{bash_completions_dir}/snakemake.bash %files doc %license LICENSE.md From e106accc5ff638c45d0537e2bfe972439bfa4615 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Mon, 22 May 2023 15:20:22 -0400 Subject: [PATCH 10/18] Install vim syntax highlighting support --- snakemake.spec | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/snakemake.spec b/snakemake.spec index 387881a..d1c25ae 100644 --- a/snakemake.spec +++ b/snakemake.spec @@ -37,6 +37,11 @@ BuildRequires: python3-devel BuildRequires: help2man +BuildRequires: vim-filesystem +Requires: vim-filesystem + +Provides: vim-snakemake = %{version}-%{release} + %if %{with tests} # See test-environment.yml for a listing of test dependencies, along with a lot # of other cruft. @@ -88,6 +93,9 @@ sed -r -i 's@"python"@"%{python3}"@g' tests/test_linting.py sed -r -i '/sphinxcontrib-napoleon/d' docs/requirements.txt # Since pdflatex cannot handle Unicode inputs in general: echo "latex_engine = 'xelatex'" >> docs/conf.py +# Copy and rename vim extensions readme for use in the main documentation +# directory. +cp -vp misc/vim/README.md README-vim.md %generate_buildrequires # Generate BR’s for all supported extras to ensure they do not FTI @@ -131,6 +139,12 @@ PATH="${PATH-}:%{buildroot}%{_bindir}" \ snakemake --bash-completion \ > %{buildroot}%{bash_completions_dir}/snakemake.bash +# Install vim syntax highlighting +install -d '%{buildroot}%{_datadir}/vim/vimfiles' +cp -vrp misc/vim/* '%{buildroot}%{_datadir}/vim/vimfiles' +find '%{buildroot}%{_datadir}/vim/vimfiles' \ + -type f -name 'README.*' -print -delete + %check %if %{with tests} # Lint output “Migrate long run directives into scripts or notebooks …” is @@ -154,11 +168,16 @@ k="${k-}${k+ and }not test_slurm_" %{_bindir}/snakemake-bash-completion %{bash_completions_dir}/snakemake.bash +%{_datadir}/vim/vimfiles/ftdetect/snakemake.vim +%{_datadir}/vim/vimfiles/ftplugin/snakemake/ +%{_datadir}/vim/vimfiles/syntax/snakemake.vim + %files doc %license LICENSE.md %doc CHANGELOG.md %doc CODE_OF_CONDUCT.md %doc README.md +%doc README-vim.md %if %{with doc_pdf} %doc docs/_build/latex/Snakemake.pdf %endif From b5bf37d4e2c542cb2244a5eb54afc997170194d5 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Mon, 22 May 2023 15:44:01 -0400 Subject: [PATCH 11/18] Install nano syntax highlighting support --- snakemake.spec | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/snakemake.spec b/snakemake.spec index d1c25ae..f558d06 100644 --- a/snakemake.spec +++ b/snakemake.spec @@ -93,9 +93,12 @@ sed -r -i 's@"python"@"%{python3}"@g' tests/test_linting.py sed -r -i '/sphinxcontrib-napoleon/d' docs/requirements.txt # Since pdflatex cannot handle Unicode inputs in general: echo "latex_engine = 'xelatex'" >> docs/conf.py -# Copy and rename vim extensions readme for use in the main documentation -# directory. -cp -vp misc/vim/README.md README-vim.md +# Copy and rename nano and vim extensions readmes for use in the main +# documentation directory. +for editor in nano vim +do + cp -vp "misc/${editor}/README.md" "README-${editor}.md" +done %generate_buildrequires # Generate BR’s for all supported extras to ensure they do not FTI @@ -139,6 +142,10 @@ PATH="${PATH-}:%{buildroot}%{_bindir}" \ snakemake --bash-completion \ > %{buildroot}%{bash_completions_dir}/snakemake.bash +# Install nano syntax highlighting +install -t '%{buildroot}%{_datadir}/nano' -D -m 0644 -p \ + misc/nano/syntax/snakemake.nanorc + # Install vim syntax highlighting install -d '%{buildroot}%{_datadir}/vim/vimfiles' cp -vrp misc/vim/* '%{buildroot}%{_datadir}/vim/vimfiles' @@ -168,6 +175,11 @@ k="${k-}${k+ and }not test_slurm_" %{_bindir}/snakemake-bash-completion %{bash_completions_dir}/snakemake.bash +# This is not owned by the filesystem package, and there is no nano-filesystem +# subpackage, so we co-own the directory to avoid depending on nano. +%dir %{_datadir}/nano/ +%{_datadir}/nano/snakemake.nanorc + %{_datadir}/vim/vimfiles/ftdetect/snakemake.vim %{_datadir}/vim/vimfiles/ftplugin/snakemake/ %{_datadir}/vim/vimfiles/syntax/snakemake.vim @@ -177,6 +189,7 @@ k="${k-}${k+ and }not test_slurm_" %doc CHANGELOG.md %doc CODE_OF_CONDUCT.md %doc README.md +%doc README-nano.md %doc README-vim.md %if %{with doc_pdf} %doc docs/_build/latex/Snakemake.pdf From ad3250599da938d3b36b5a96689fc890331802cf Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 29 Jun 2023 12:26:12 -0400 Subject: [PATCH 12/18] Use new (rpm 4.17.1+) bcond style --- snakemake.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/snakemake.spec b/snakemake.spec index f558d06..f4667cf 100644 --- a/snakemake.spec +++ b/snakemake.spec @@ -1,7 +1,7 @@ -%bcond_without tests +%bcond tests 1 # Sphinx-generated HTML documentation is not suitable for packaging; see # https://bugzilla.redhat.com/show_bug.cgi?id=2006555 for discussion. -%bcond_without doc_pdf +%bcond doc_pdf 1 %global _description %{expand: The Snakemake workflow management system is a tool to create reproducible and From 48b1c49075e6de53f4a046bd974a3a755fdc1bd2 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 29 Jun 2023 12:33:36 -0400 Subject: [PATCH 13/18] Update to 7.30.1 (close RHBZ#2214110) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Adds a metapackage for the new “azure” extra --- .gitignore | 1 + snakemake.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index ca6ef7d..466b216 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ /snakemake-7.25.2.tar.gz /snakemake-7.25.3.tar.gz /snakemake-7.26.0.tar.gz +/snakemake-7.30.1.tar.gz diff --git a/snakemake.spec b/snakemake.spec index f4667cf..21a245b 100644 --- a/snakemake.spec +++ b/snakemake.spec @@ -12,7 +12,7 @@ Finally, Snakemake workflows can entail a description of required software, which will be automatically deployed to any execution environment.} Name: snakemake -Version: 7.26.0 +Version: 7.30.1 Release: %autorelease Summary: Workflow management system to create reproducible and scalable data analyses @@ -77,7 +77,7 @@ BuildRequires: /usr/bin/rsvg-convert # No metapackage for “pep” extra because the following are not packaged: # - python3-eido # - python3-peppy -%pyproject_extras_subpkg -n snakemake reports messaging google-cloud +%pyproject_extras_subpkg -n snakemake reports messaging google-cloud azure %prep %autosetup -n snakemake-%{version} -p1 @@ -102,7 +102,7 @@ done %generate_buildrequires # Generate BR’s for all supported extras to ensure they do not FTI -%pyproject_buildrequires -x reports,messaging,google-cloud %{?with_doc_pdf:docs/requirements.txt} +%pyproject_buildrequires -x reports,messaging,google-cloud,azure %{?with_doc_pdf:docs/requirements.txt} %build %pyproject_wheel @@ -137,6 +137,9 @@ PATH="${PATH-}:%{buildroot}%{_bindir}" \ # Generate and install shell completions. install -d %{buildroot}%{bash_completions_dir} +# Since 7.29.0, snakemake --bash-completion no longer works without a Snakefile +# https://github.com/snakemake/snakemake/issues/2336 +touch Snakefile PATH="${PATH-}:%{buildroot}%{_bindir}" \ PYTHONPATH='%{buildroot}%{python3_sitelib}' \ snakemake --bash-completion \ diff --git a/sources b/sources index 9610fd4..75e5761 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (snakemake-7.26.0.tar.gz) = cf2cfb80e739dc9c1738a80390d611f774965f87b730aef7d80c70d953969d7f7e4abeb24191146f5fdc8d79ae34c43dbd4fd7753e6aa3eef68e8e74af4d163d +SHA512 (snakemake-7.30.1.tar.gz) = 9ffd72d66a4ee91a50d91d28397400112fa195375567cdd8959c5e790c06923c99a7bc036e1e30efcbae3d8d586ef5f3821e18ec01e56497b217899ef7952bc7 From 661eb80d46452cd9eff1b79a934b0fb6d7f55e9b Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Wed, 2 Aug 2023 11:37:41 -0400 Subject: [PATCH 14/18] Update to 7.31.1 (close RHBZ#2224675) --- .gitignore | 1 + snakemake.spec | 19 ++++++++++++++++--- sources | 2 +- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 466b216..8b9a7b7 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ /snakemake-7.25.3.tar.gz /snakemake-7.26.0.tar.gz /snakemake-7.30.1.tar.gz +/snakemake-7.31.1.tar.gz diff --git a/snakemake.spec b/snakemake.spec index 21a245b..f9aac66 100644 --- a/snakemake.spec +++ b/snakemake.spec @@ -12,7 +12,7 @@ Finally, Snakemake workflows can entail a description of required software, which will be automatically deployed to any execution environment.} Name: snakemake -Version: 7.30.1 +Version: 7.31.1 Release: %autorelease Summary: Workflow management system to create reproducible and scalable data analyses @@ -167,8 +167,21 @@ k="${k-}${k+ and }not test_tes" # Require a running slurm instance; maybe this is possible to set up # temporarily in the offline build environment, but we don’t know how. k="${k-}${k+ and }not test_slurm_" -# tests/test_google_lifesciences.py needs a network connection (and GCP credentials) -%pytest -v -k "${k-}" --ignore tests/test_google_lifesciences.py + +# Needs a network connection (and GCP credentials): +ignore="${ignore-} --ignore=tests/test_google_lifesciences.py" +# ______ ERROR collecting tests/test_conda_python_script/test_script.py ______ +# import file mismatch: +# imported module 'test_script' has this __file__ attribute: +# /builddir/build/BUILD/snakemake-7.31.1/tests/test_conda_python_3_7_script/test_script.py +# which is not the same as the test file we want to collect: +# /builddir/build/BUILD/snakemake-7.31.1/tests/test_conda_python_script/test_script.py +# HINT: remove __pycache__ / .pyc files and/or use a unique basename for your test file modules +# +# Plus, this would add an unwanted BuildRequires on %%{py3_dist Pillow}. +ignore="${ignore-} --ignore-glob=tests/test_conda_python_3_7_script/*" + +%pytest -v -k "${k-}" ${ignore-} %endif %files -f %{pyproject_files} diff --git a/sources b/sources index 75e5761..83b8900 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (snakemake-7.30.1.tar.gz) = 9ffd72d66a4ee91a50d91d28397400112fa195375567cdd8959c5e790c06923c99a7bc036e1e30efcbae3d8d586ef5f3821e18ec01e56497b217899ef7952bc7 +SHA512 (snakemake-7.31.1.tar.gz) = 4c5c8f993054936a7862652f040ab0e67d4143e493724f79e7e6a7fbd1e39930b040d07eda59bbc5fb63f1b9e47bb4a0a8d695b91647c8a264fed55c252e56fc From accc35ddf787e494755c6c6050994ee709371e04 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Fri, 4 Aug 2023 09:53:09 -0400 Subject: [PATCH 15/18] Update to 7.32.0 (close RHBZ#2229001) --- .gitignore | 1 + snakemake.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 8b9a7b7..c2baa5e 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ /snakemake-7.26.0.tar.gz /snakemake-7.30.1.tar.gz /snakemake-7.31.1.tar.gz +/snakemake-7.32.0.tar.gz diff --git a/snakemake.spec b/snakemake.spec index f9aac66..215470e 100644 --- a/snakemake.spec +++ b/snakemake.spec @@ -12,7 +12,7 @@ Finally, Snakemake workflows can entail a description of required software, which will be automatically deployed to any execution environment.} Name: snakemake -Version: 7.31.1 +Version: 7.32.0 Release: %autorelease Summary: Workflow management system to create reproducible and scalable data analyses diff --git a/sources b/sources index 83b8900..6046fa4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (snakemake-7.31.1.tar.gz) = 4c5c8f993054936a7862652f040ab0e67d4143e493724f79e7e6a7fbd1e39930b040d07eda59bbc5fb63f1b9e47bb4a0a8d695b91647c8a264fed55c252e56fc +SHA512 (snakemake-7.32.0.tar.gz) = 25ea119d21f5de1652fa8b924f7dc36a1266db7bcc444d473149566002656f09d087487179c9dbbc1167bb0a58d615eb666401d027e48261744f279b1892ee47 From cffcef4887d7ecc71c5c201d0a4ade44b7265ca4 Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 10 Aug 2023 08:56:19 +0000 Subject: [PATCH 16/18] [packit] 7.32.2 upstream release MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Upstream tag: v7.32.2 Upstream commit: 1c5d1547 If you need to do any change in this pull request, you need to locally fetch the source branch of it and push it (with a fix) to your fork (as it is not possible to push to the branch created in the Packit’s fork): ``` git fetch https://src.fedoraproject.org/forks/packit/rpms/snakemake.git refs/heads/*:refs/remotes/packit/* git checkout packit/7.32.2-rawhide-update-pull_from_upstream ``` --- .gitignore | 1 + README.packit | 3 +++ snakemake.spec | 2 +- sources | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 README.packit diff --git a/.gitignore b/.gitignore index c2baa5e..9675d54 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ /snakemake-7.30.1.tar.gz /snakemake-7.31.1.tar.gz /snakemake-7.32.0.tar.gz +/snakemake-7.32.2.tar.gz diff --git a/README.packit b/README.packit new file mode 100644 index 0000000..d7c433c --- /dev/null +++ b/README.packit @@ -0,0 +1,3 @@ +This repository is maintained by packit. +https://packit.dev/ +The file was generated using packit 0.78.2.post2+g81828af. diff --git a/snakemake.spec b/snakemake.spec index 215470e..396e3dc 100644 --- a/snakemake.spec +++ b/snakemake.spec @@ -12,7 +12,7 @@ Finally, Snakemake workflows can entail a description of required software, which will be automatically deployed to any execution environment.} Name: snakemake -Version: 7.32.0 +Version: 7.32.2 Release: %autorelease Summary: Workflow management system to create reproducible and scalable data analyses diff --git a/sources b/sources index 6046fa4..d99a083 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (snakemake-7.32.0.tar.gz) = 25ea119d21f5de1652fa8b924f7dc36a1266db7bcc444d473149566002656f09d087487179c9dbbc1167bb0a58d615eb666401d027e48261744f279b1892ee47 +SHA512 (snakemake-7.32.2.tar.gz) = 4658fa2bbcf2ce68a22d89e74707d5fd364cdcfda5219233dc4605738f83c299c605dbad643a888764b6c5cce1d152f0a37fd9de9e979b95733ed0f7bec8c554 From 3fad9f5840d0e234f12fa42d39338cb3b2d19c89 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 10 Aug 2023 09:22:04 -0400 Subject: [PATCH 17/18] Update to 7.32.3 --- .gitignore | 1 + snakemake.spec | 2 +- sources | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 9675d54..c6a0a09 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ /snakemake-7.31.1.tar.gz /snakemake-7.32.0.tar.gz /snakemake-7.32.2.tar.gz +/snakemake-7.32.3.tar.gz diff --git a/snakemake.spec b/snakemake.spec index 396e3dc..7b8b3d8 100644 --- a/snakemake.spec +++ b/snakemake.spec @@ -12,7 +12,7 @@ Finally, Snakemake workflows can entail a description of required software, which will be automatically deployed to any execution environment.} Name: snakemake -Version: 7.32.2 +Version: 7.32.3 Release: %autorelease Summary: Workflow management system to create reproducible and scalable data analyses diff --git a/sources b/sources index d99a083..0e22ad4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (snakemake-7.32.2.tar.gz) = 4658fa2bbcf2ce68a22d89e74707d5fd364cdcfda5219233dc4605738f83c299c605dbad643a888764b6c5cce1d152f0a37fd9de9e979b95733ed0f7bec8c554 +SHA512 (snakemake-7.32.3.tar.gz) = 675d1206bda44309f38b4cde441584f4c6243c1c63fb3ab07a781e3538c604e66ef013f75a27dd3b11f620611cf583e4e2fca5531a5492cef5cbd85f44f0b77e From e322b6777a2fe13c978b5f36489409c2cedf18c2 Mon Sep 17 00:00:00 2001 From: Packit Date: Mon, 18 Sep 2023 18:56:36 +0000 Subject: [PATCH 18/18] [packit] 7.32.4 upstream release Upstream tag: v7.32.4 Upstream commit: 0998cc57 --- .gitignore | 1 + README.packit | 2 +- snakemake.spec | 2 +- sources | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index c6a0a09..7635a3f 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ /snakemake-7.32.0.tar.gz /snakemake-7.32.2.tar.gz /snakemake-7.32.3.tar.gz +/snakemake-7.32.4.tar.gz diff --git a/README.packit b/README.packit index d7c433c..786c2a0 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.78.2.post2+g81828af. +The file was generated using packit 0.80.0.post8+gf2b5fcbc. diff --git a/snakemake.spec b/snakemake.spec index 7b8b3d8..46fd73f 100644 --- a/snakemake.spec +++ b/snakemake.spec @@ -12,7 +12,7 @@ Finally, Snakemake workflows can entail a description of required software, which will be automatically deployed to any execution environment.} Name: snakemake -Version: 7.32.3 +Version: 7.32.4 Release: %autorelease Summary: Workflow management system to create reproducible and scalable data analyses diff --git a/sources b/sources index 0e22ad4..41d1ecb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (snakemake-7.32.3.tar.gz) = 675d1206bda44309f38b4cde441584f4c6243c1c63fb3ab07a781e3538c604e66ef013f75a27dd3b11f620611cf583e4e2fca5531a5492cef5cbd85f44f0b77e +SHA512 (snakemake-7.32.4.tar.gz) = 34fef61528b18facab798652c88ed5c698ef02161e023255fdd024b7c7781c4e582cdb04b2740fdff9b6f3600acaec719742984acee57920bb48ef3b5af99d9a