[MRG] MinHash class refactoring

.travis.yml

@@ -110,8 +110,6 @@ jobs:
       python: 3.7
       env:
         - TOXENV=docs
-    - <<: *test
-      python: 2.7
 
     - &wheel
       stage: build wheel and send to github releases

README.md

@@ -54,7 +54,7 @@ A quickstart tutorial [is available](https://sourmash.readthedocs.io/en/latest/t
 
 ### Requirements
 
-sourmash runs under both Python 2.7.x and Python 3.5+.  The base
+sourmash runs under Python 3.7 and later.  The base
 requirements are screed, cffi, numpy, matplotlib, and scipy.  Conda
 (see below) will install everything necessary, and is our recommended
 installation method.

benchmarks/benchmarks.py

@@ -1,11 +1,7 @@
-from __future__ import unicode_literals
 import random
 
 
-try:
-    from sourmash._minhash import MinHash
-except:
-    from sourmash.minhash import MinHash
+from sourmash.minhash import MinHash
 
 
 def load_sequences():

doc/conf.py

@@ -301,4 +301,4 @@
 # If true, do not generate a @detailmenu in the "Top" node's menu.
 #texinfo_no_detailmenu = False
 
-autodoc_mock_imports = ["sourmash._minhash"]
+autodoc_mock_imports = ["sourmash.minhash"]

doc/developer.md

@@ -7,7 +7,7 @@ You can get the latest development master branch with:
 ```
 git clone https://github.com/dib-lab/sourmash.git
 ```
-sourmash runs under both Python 2.7.x and Python 3.5+.  The base
+sourmash runs under Python 3.7 and later.  The base
 requirements are screed and cffi, together with a Rust environment (for the
 extension code). We suggest using `rustup` to install the Rust environment:
 
@@ -34,7 +34,7 @@ run the Rust tests.
 
 ### If you're having trouble installing or using the development environment
 
-If you are getting an error that contains `ImportError: cannot import name 'to_bytes' from 'sourmash._minhash'`, then it's likely you need to update Rust and clean up your environment. Some installation issues can be solved by simply removing the intermediate build files with: 
+If you are getting an error that contains `ImportError: cannot import name 'to_bytes' from 'sourmash.minhash'`, then it's likely you need to update Rust and clean up your environment. Some installation issues can be solved by simply removing the intermediate build files with: 
 
 ```
 make clean

doc/requirements.md

@@ -1,6 +1,5 @@
 # Computational requirements
 
-
 sourmash has no particular memory requirements; it will need to hold
 the largest single sequence you have in memory, but the individual
 signatures are quite small and we do no special buffer allocation.
@@ -11,8 +10,8 @@ in a second or so on a rather slow 2016 Mac laptop.
 
 MinHash sketches and signatures are quite small on disk.
 
-sourmash should run with little modification on Linux and Mac OS X,
-under Python 2.7.11 and Python 3.5.  Please see [the development repository README][0]
+sourmash should run with no modification on Linux and Mac OS X,
+under Python 3.7 and later.  Please see [the development repository README][0]
 for
 information on source code, tests, and continuous integration.
 [0]:https://github.com/dib-lab/sourmash/blob/master/README.md

setup.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import os
 from setuptools import setup, find_packages
 import sys
@@ -37,9 +36,8 @@ def build_native(spec):
     "Operating System :: POSIX :: Linux",
     "Operating System :: MacOS :: MacOS X",
     "Programming Language :: Rust",
-    "Programming Language :: Python :: 2.7",
-    "Programming Language :: Python :: 3.5",
-    "Programming Language :: Python :: 3.6",
+    "Programming Language :: Python :: 3.7",
+    "Programming Language :: Python :: 3.8",
     "Topic :: Scientific/Engineering :: Bio-Informatics",
 ]
 
@@ -63,7 +61,6 @@ def build_native(spec):
         ]
     },
     "install_requires": ['screed>=0.9', 'cffi>=1.14.0', 'numpy',
-                         'enum34; python_version < "3.4"',
                          'matplotlib', 'scipy', 'deprecation>=2.0.6'],
     "setup_requires": [
         "setuptools>=38.6.0",

sourmash/__init__.py

@@ -2,7 +2,6 @@
 """
 An implementation of a MinHash bottom sketch, applied to k-mers in DNA.
 """
-from __future__ import print_function
 import re
 import math
 import os
@@ -25,7 +24,7 @@
             "use the PyPI ones."
         )
 
-from ._minhash import MinHash, get_minhash_default_seed, get_minhash_max_hash
+from .minhash import MinHash, get_minhash_default_seed, get_minhash_max_hash
 
 DEFAULT_SEED = get_minhash_default_seed()
 MAX_HASH = get_minhash_max_hash()

sourmash/__main__.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import sourmash