minimap2 0.2.25.2 → 0.2.26.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b39dfb4b48657157d832341715e82568012249c35f3f5a8c7bb406578ca6e0a
-  data.tar.gz: 83cb330e21c3cec98622f4fb8e865ae0f8871c2285b13df9eeb57bff4852ebce
+  metadata.gz: 49b59da1af652a8a5ffbde0f5d9e98b32d94a192039d1e948aced9bb926e75d1
+  data.tar.gz: 309fe28a4a58ccc2e5bd818c751fa33a40065756c0961fc96c35af7dbc24abea
 SHA512:
-  metadata.gz: a7d94a3c71bd22f1441db0e54e004f0bde4e537d6066445a0940cdcfe634adc345332614d1dfeb138f732e5b1a15871612526a202d884ebcf7368091c9ba9e71
-  data.tar.gz: f4c453ec32a95c93781453c5914b79c47f2e5272517f16abb3939e07b0282c294820b7f7f175ee7d3b1f184eeb6b3af4cb745464cb37bf1a31fb204f97259128
+  metadata.gz: b9faab29797eecd594b2f724e3c88d38457d2c60a24f01b9dd6ab0aa17a680e12db68755cf3f47d9873427f1577d81770e798f1395db17b39bffdbaf7230c330
+  data.tar.gz: cf3a3ea389fb1cbfabfd08fc17e073643db3c7ae59e74dcc11a75649e90ca2629a5c69fcc1548fab8755a8edb99c89a49e4353077aa3ef4b60bc9c129ec88a55

data/README.md

@@ -169,6 +169,15 @@ Run tests.
 bundle exec rake test
 ```
 
+Release a Gem.
+
+```
+bundle exec rake minimap2:cleanall
+bundle exec rake build
+ls -l pkg # Check the size of the Gem and make sure it does not contain any unused code such as shared libraries or lib/simde.
+bundle exec rake release
+```
+
 </details>
 
 ruby-minimap2 is a library under development and there are many points to be improved.

data/ext/Rakefile

@@ -18,7 +18,14 @@ namespace :minimap2 do
       # Add -fPIC option to Makefile
       sh "git apply ../minimap2.patch"
       sh "cp ../cmappy/cmappy.h ../cmappy/cmappy.c ."
-      sh "make"
+      case RbConfig::CONFIG["host_cpu"]
+      when /arm64/
+        sh "make arm_neon=1 aarch64=1"
+      when /arm/
+        sh "make arm_neon=1"
+      else
+        sh "make"
+      end
       case RbConfig::CONFIG["host_os"]
       when /mswin|msys|mingw|cygwin|bccwin|wince|emc/
         sh "cc *.o -shared -o #{target_fname} -lm -lz -lpthread"

data/ext/minimap2/NEWS.md

@@ -1,3 +1,12 @@
+Release 2.26-r1175 (29 April 2023)
+----------------------------------
+
+Fixed the broken Python package. This is the only change.
+
+(2.25: 25 April 2023, r1173)
+
+
+
 Release 2.25-r1173 (25 April 2023)
 ----------------------------------
 

data/ext/minimap2/README.md

@@ -74,8 +74,8 @@ Detailed evaluations are available from the [minimap2 paper][doi] or the
 Minimap2 is optimized for x86-64 CPUs. You can acquire precompiled binaries from
 the [release page][release] with:
 ```sh
-curl -L https://github.com/lh3/minimap2/releases/download/v2.25/minimap2-2.25_x64-linux.tar.bz2 | tar -jxvf -
-./minimap2-2.25_x64-linux/minimap2
+curl -L https://github.com/lh3/minimap2/releases/download/v2.26/minimap2-2.26_x64-linux.tar.bz2 | tar -jxvf -
+./minimap2-2.26_x64-linux/minimap2
 ```
 If you want to compile from the source, you need to have a C compiler, GNU make
 and zlib development files installed. Then type `make` in the source code

data/ext/minimap2/cookbook.md

@@ -31,8 +31,8 @@ To acquire the data used in this cookbook and to install minimap2 and paftools,
 please follow the command lines below:
 ```sh
 # install minimap2 executables
-curl -L https://github.com/lh3/minimap2/releases/download/v2.25/minimap2-2.25_x64-linux.tar.bz2 | tar jxf -
-cp minimap2-2.25_x64-linux/{minimap2,k8,paftools.js} .  # copy executables
+curl -L https://github.com/lh3/minimap2/releases/download/v2.26/minimap2-2.26_x64-linux.tar.bz2 | tar jxf -
+cp minimap2-2.26_x64-linux/{minimap2,k8,paftools.js} .  # copy executables
 export PATH="$PATH:"`pwd`                               # put the current directory on PATH
 # download example datasets
 curl -L https://github.com/lh3/minimap2/releases/download/v2.10/cookbook-data.tgz | tar zxf -

data/ext/minimap2/minimap.h

@@ -5,7 +5,7 @@
 #include <stdio.h>
 #include <sys/types.h>
 
-#define MM_VERSION "2.25-r1173"
+#define MM_VERSION "2.26-r1175"
 
 #define MM_F_NO_DIAG       (0x001LL) // no exact diagonal hit
 #define MM_F_NO_DUAL       (0x002LL) // skip pairs where query name is lexicographically larger than target name

data/ext/minimap2/minimap2.1

@@ -1,4 +1,4 @@
-.TH minimap2 1 "25 April 2023" "minimap2-2.25 (r1173)" "Bioinformatics tools"
+.TH minimap2 1 "29 April 2023" "minimap2-2.26 (r1175)" "Bioinformatics tools"
 .SH NAME
 .PP
 minimap2 - mapping and alignment between collections of DNA sequences

data/ext/minimap2/misc/paftools.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env k8
 
-var paftools_version = '2.25-r1173';
+var paftools_version = '2.26-r1175';
 
 /*****************************
  ***** Library functions *****

data/ext/minimap2/python/mappy.pyx

@@ -3,7 +3,7 @@ from libc.stdlib cimport free
 cimport cmappy
 import sys
 
-__version__ = '2.25'
+__version__ = '2.26'
 
 cmappy.mm_reset_timer()
 

data/ext/minimap2/setup.py

@@ -1,40 +1,29 @@
 try:
 	from setuptools import setup, Extension
-	from setuptools.command.build_ext import build_ext
 except ImportError:
 	from distutils.core import setup
 	from distutils.extension import Extension
-	from distutils.command.build_ext import build_ext
 
-import sys, platform, subprocess
+import sys, platform
 
+sys.path.append('python')
+
+extra_compile_args = ['-DHAVE_KALLOC']
+include_dirs = ["."]
+
+if platform.machine() in ["aarch64", "arm64"]:
+	include_dirs.append("sse2neon/")
+	extra_compile_args.extend(['-ftree-vectorize', '-DKSW_SSE2_ONLY', '-D__SSE2__'])
+else:
+	extra_compile_args.append('-msse4.1') # WARNING: ancient x86_64 CPUs don't have SSE4
 
 def readme():
 	with open('python/README.rst') as f:
 		return f.read()
 
-
-class LibMM2Build(build_ext):
-	# Uses Makefile to build library, avoids duplicating logic
-	# determining which objects to compile but does require
-	# end users to have Make (since precompiled wheels are not
-	# distributed on PyPI).
-	def run(self):
-		def compile_libminimap2(*args, **kwargs):
-			cmd = ['make', 'libminimap2.a'] + list(args)
-			subprocess.check_call(cmd)
-		options = []
-		if platform.machine() in ["aarch64", "arm64"]:
-			options = ["arm_neon=1", "aarch64=1"]
-		self.execute(
-			compile_libminimap2, options,
-			'Compiling libminimap2 using Makefile')
-		build_ext.run(self)
-
-
 setup(
 	name = 'mappy',
-	version = '2.25',
+	version = '2.26',
 	url = 'https://github.com/lh3/minimap2',
 	description = 'Minimap2 python binding',
 	long_description = readme(),
@@ -43,15 +32,16 @@ setup(
 	license = 'MIT',
 	keywords = 'sequence-alignment',
 	scripts = ['python/minimap2.py'],
-	cmdclass = {'build_ext': LibMM2Build},
-	ext_modules = [
-		Extension(
-			'mappy',
-			sources = ['python/mappy.pyx'],
-			depends = ['python/cmappy.h', 'python/cmappy.pxd'],
-			include_dirs = ['.'],
-			extra_objects = ['libminimap2.a'],
-			libraries = ['z', 'm', 'pthread'])],
+	ext_modules = [Extension('mappy',
+		sources = ['python/mappy.pyx', 'align.c', 'bseq.c', 'lchain.c', 'seed.c', 'format.c', 'hit.c', 'index.c', 'pe.c', 'options.c',
+				   'ksw2_extd2_sse.c', 'ksw2_exts2_sse.c', 'ksw2_extz2_sse.c', 'ksw2_ll_sse.c',
+				   'kalloc.c', 'kthread.c', 'map.c', 'misc.c', 'sdust.c', 'sketch.c', 'esterr.c', 'splitidx.c'],
+		depends = ['minimap.h', 'bseq.h', 'kalloc.h', 'kdq.h', 'khash.h', 'kseq.h', 'ksort.h',
+				   'ksw2.h', 'kthread.h', 'kvec.h', 'mmpriv.h', 'sdust.h',
+				   'python/cmappy.h', 'python/cmappy.pxd'],
+		extra_compile_args = extra_compile_args,
+		include_dirs = include_dirs,
+		libraries = ['z', 'm', 'pthread'])],
 	classifiers = [
 		'Development Status :: 5 - Production/Stable',
 		'License :: OSI Approved :: MIT License',

data/lib/minimap2/version.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
 module Minimap2
-  # Minimap2-2.25 (r1173)
-  VERSION = "0.2.25.2"
+  VERSION = "0.2.26.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minimap2
 version: !ruby/object:Gem::Version
-  version: 0.2.25.2
+  version: 0.2.26.1
 platform: ruby
 authors:
 - kojix2
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-01 00:00:00.000000000 Z
+date: 2023-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -150,7 +150,7 @@ homepage: https://github.com/kojix2/ruby-minimap2
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -165,8 +165,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
-signing_key: 
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 4
 summary: minimap2
 test_files: []