gnu: multiqc: Update to 0.9.
Suggested by Raoul Bonnal <ilpuccio.febo@gmail.com>. * gnu/packages/bioinformatics.scm (multiqc): Update to 0.9. [origin]: Add patch. * gnu/packages/patches/multiqc-fix-git-subprocess-error.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it.
This commit is contained in:
		
							parent
							
								
									95d7d0c57f
								
							
						
					
					
						commit
						a29929b32c
					
				
					 3 changed files with 24 additions and 2 deletions
				
			
		| 
						 | 
					@ -730,6 +730,7 @@ dist_patch_DATA =						\
 | 
				
			||||||
  %D%/packages/patches/mpc123-initialize-ao.patch		\
 | 
					  %D%/packages/patches/mpc123-initialize-ao.patch		\
 | 
				
			||||||
  %D%/packages/patches/mplayer2-theora-fix.patch		\
 | 
					  %D%/packages/patches/mplayer2-theora-fix.patch		\
 | 
				
			||||||
  %D%/packages/patches/module-init-tools-moduledir.patch	\
 | 
					  %D%/packages/patches/module-init-tools-moduledir.patch	\
 | 
				
			||||||
 | 
					  %D%/packages/patches/multiqc-fix-git-subprocess-error.patch	\
 | 
				
			||||||
  %D%/packages/patches/mumps-build-parallelism.patch		\
 | 
					  %D%/packages/patches/mumps-build-parallelism.patch		\
 | 
				
			||||||
  %D%/packages/patches/mupdf-build-with-openjpeg-2.1.patch	\
 | 
					  %D%/packages/patches/mupdf-build-with-openjpeg-2.1.patch	\
 | 
				
			||||||
  %D%/packages/patches/mupen64plus-ui-console-notice.patch	\
 | 
					  %D%/packages/patches/mupen64plus-ui-console-notice.patch	\
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -7855,15 +7855,20 @@ replacement for strverscmp.")
 | 
				
			||||||
(define-public multiqc
 | 
					(define-public multiqc
 | 
				
			||||||
  (package
 | 
					  (package
 | 
				
			||||||
    (name "multiqc")
 | 
					    (name "multiqc")
 | 
				
			||||||
    (version "0.6")
 | 
					    (version "0.9")
 | 
				
			||||||
    (source
 | 
					    (source
 | 
				
			||||||
     (origin
 | 
					     (origin
 | 
				
			||||||
       (method url-fetch)
 | 
					       (method url-fetch)
 | 
				
			||||||
       (uri (pypi-uri "multiqc" version))
 | 
					       (uri (pypi-uri "multiqc" version))
 | 
				
			||||||
       (sha256
 | 
					       (sha256
 | 
				
			||||||
        (base32
 | 
					        (base32
 | 
				
			||||||
         "0avw11h63ldpxy5pizc3wl1wa01ha7q10wb240nggsjz3jaqvyiy"))))
 | 
					         "12gs1jw2jrxrij529rnl5kaqxfcqn15yzcsggxkfhdx634ml0cny"))
 | 
				
			||||||
 | 
					       (patches (search-patches "multiqc-fix-git-subprocess-error.patch"))))
 | 
				
			||||||
    (build-system python-build-system)
 | 
					    (build-system python-build-system)
 | 
				
			||||||
 | 
					    (arguments
 | 
				
			||||||
 | 
					     ;; Tests are to be introduced in the next version, see
 | 
				
			||||||
 | 
					     ;; https://github.com/ewels/MultiQC/issues/376
 | 
				
			||||||
 | 
					     `(#:tests? #f))
 | 
				
			||||||
    (propagated-inputs
 | 
					    (propagated-inputs
 | 
				
			||||||
     `(("python-jinja2" ,python-jinja2)
 | 
					     `(("python-jinja2" ,python-jinja2)
 | 
				
			||||||
       ("python-simplejson" ,python-simplejson)
 | 
					       ("python-simplejson" ,python-simplejson)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										16
									
								
								gnu/packages/patches/multiqc-fix-git-subprocess-error.patch
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										16
									
								
								gnu/packages/patches/multiqc-fix-git-subprocess-error.patch
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
					@ -0,0 +1,16 @@
 | 
				
			||||||
 | 
					Without this patch, the incorrect exception is caught when 'git' is not in
 | 
				
			||||||
 | 
					PATH.  See https://github.com/ewels/MultiQC/pull/377.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					diff --git a/multiqc/utils/config.py b/multiqc/utils/config.py
 | 
				
			||||||
 | 
					index 01fa554..4a11793 100755
 | 
				
			||||||
 | 
					--- a/multiqc/utils/config.py
 | 
				
			||||||
 | 
					+++ b/multiqc/utils/config.py
 | 
				
			||||||
 | 
					@@ -28,7 +28,7 @@ try:
 | 
				
			||||||
 | 
					     git_hash = subprocess.check_output(['git', 'rev-parse', 'HEAD'], stderr=subprocess.STDOUT)
 | 
				
			||||||
 | 
					     git_hash_short = git_hash[:7]
 | 
				
			||||||
 | 
					     version = '{} ({})'.format(version, git_hash_short)
 | 
				
			||||||
 | 
					-except subprocess.CalledProcessError:
 | 
				
			||||||
 | 
					+except (subprocess.CalledProcessError, FileNotFoundError):
 | 
				
			||||||
 | 
					     pass
 | 
				
			||||||
 | 
					 os.chdir(cwd)
 | 
				
			||||||
 | 
					 
 | 
				
			||||||
		Reference in a new issue