move sourmash to src/sourmash

sourmash-bio · Nov 1, 2020 · 7707359 · 7707359
1 parent 5cf2215
commit 7707359
Show file tree

Hide file tree

Showing 85 changed files with 19 additions and 30 deletions.
diff --git a/.gitignore b/.gitignore
@@ -18,10 +18,10 @@ sourmash.egg-info
 .coverage
 .pytest_cache
 .python-version
-sourmash/version.py
+src/sourmash/version.py
 *.DS_Store
 .tox
-sourmash/_lowlevel*.py
+src/sourmash/_lowlevel*.py
 .env
 Pipfile
 Pipfile.lock

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,10 +1,4 @@
-include LICENSE Makefile Dockerfile LICENSE Makefile README.md requirements.txt
-include index.ipynb
-include sourmash VERSION
-recursive-include sourmash_lib *
-recursive-include sourmash *
-recursive-include src *.rs
-recursive-include benches *.rs
+include LICENSE Makefile README.md requirements.txt
 include Cargo.toml
 include include/sourmash.h
 prune .eggs

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,16 +1,16 @@
 [build-system]
 requires = [
-    "setuptools >= 42",
-    "setuptools_scm[toml] >= 3.4.0, <4",
+    "setuptools >= 48",
+    "setuptools_scm[toml] >= 4, <5",
     "setuptools_scm_git_archive",
     "milksnake",
     "wheel >= 0.29.0",
 ]
 build-backend = 'setuptools.build_meta'
 
 [tool.setuptools_scm]
-write_to = "sourmash/version.py"
-git_describe_command = "git describe --dirty --tags --long --match v* --first-parent"    
+write_to = "src/sourmash/version.py"
+git_describe_command = "git describe --dirty --tags --long --match v* --first-parent"
 
 [tool.isort]
 known_third_party = ["deprecation", "hypothesis", "mmh3", "numpy", "pkg_resources", "pytest", "screed", "setuptools", "sourmash_tst_utils"]

diff --git a/setup.cfg b/setup.cfg
@@ -29,10 +29,8 @@ project_urls =
 
 [options]
 zip_safe = False
-platforms = any
 packages = find:
-#package_dir =
-#    =src
+platforms = any
 include_package_data = True
 install_requires =
     screed>=1.0
@@ -44,15 +42,12 @@ install_requires =
     cachetools>=4,<5
 python_requires = >=3.7
 
-[options.packages.find]
-#where = src
-exclude =
-    tests
-    benchmarks
-
 [bdist_wheel]
 universal = 1
 
+[options.packages.find]
+where = src
+
 # for explanation of %(extra)s syntax see:
 # https://github.com/pypa/setuptools/issues/1260#issuecomment-438187625
 # this syntax may change in the future
@@ -100,7 +95,7 @@ norecursedirs =
     .asv
     .eggs
 python_files =
-    sourmash/*.py
+    src/sourmash/*.py
     tests/*.py
 testpaths =
     tests

diff --git a/setup.py b/setup.py
@@ -29,4 +29,5 @@ def build_native(spec):
 
 setup(
   milksnake_tasks=[build_native],
+  package_dir={"": "src"},
 )
diff --git a/sourmash/__init__.py → src/sourmash/__init__.py b/sourmash/__init__.py → src/sourmash/__init__.py
diff --git a/sourmash/__main__.py → src/sourmash/__main__.py b/sourmash/__main__.py → src/sourmash/__main__.py
diff --git a/sourmash/cli/.gitignore → src/sourmash/cli/.gitignore b/sourmash/cli/.gitignore → src/sourmash/cli/.gitignore
diff --git a/sourmash/cli/__init__.py → src/sourmash/cli/__init__.py b/sourmash/cli/__init__.py → src/sourmash/cli/__init__.py
diff --git a/sourmash/cli/categorize.py → src/sourmash/cli/categorize.py b/sourmash/cli/categorize.py → src/sourmash/cli/categorize.py
diff --git a/sourmash/cli/compare.py → src/sourmash/cli/compare.py b/sourmash/cli/compare.py → src/sourmash/cli/compare.py
diff --git a/sourmash/cli/compute.py → src/sourmash/cli/compute.py b/sourmash/cli/compute.py → src/sourmash/cli/compute.py
diff --git a/sourmash/cli/gather.py → src/sourmash/cli/gather.py b/sourmash/cli/gather.py → src/sourmash/cli/gather.py
diff --git a/sourmash/cli/import_csv.py → src/sourmash/cli/import_csv.py b/sourmash/cli/import_csv.py → src/sourmash/cli/import_csv.py
diff --git a/sourmash/cli/index.py → src/sourmash/cli/index.py b/sourmash/cli/index.py → src/sourmash/cli/index.py
diff --git a/sourmash/cli/info.py → src/sourmash/cli/info.py b/sourmash/cli/info.py → src/sourmash/cli/info.py
diff --git a/sourmash/cli/lca/__init__.py → src/sourmash/cli/lca/__init__.py b/sourmash/cli/lca/__init__.py → src/sourmash/cli/lca/__init__.py
diff --git a/sourmash/cli/lca/classify.py → src/sourmash/cli/lca/classify.py b/sourmash/cli/lca/classify.py → src/sourmash/cli/lca/classify.py
diff --git a/sourmash/cli/lca/compare_csv.py → src/sourmash/cli/lca/compare_csv.py b/sourmash/cli/lca/compare_csv.py → src/sourmash/cli/lca/compare_csv.py
diff --git a/sourmash/cli/lca/gather.py → src/sourmash/cli/lca/gather.py b/sourmash/cli/lca/gather.py → src/sourmash/cli/lca/gather.py
diff --git a/sourmash/cli/lca/index.py → src/sourmash/cli/lca/index.py b/sourmash/cli/lca/index.py → src/sourmash/cli/lca/index.py
diff --git a/sourmash/cli/lca/rankinfo.py → src/sourmash/cli/lca/rankinfo.py b/sourmash/cli/lca/rankinfo.py → src/sourmash/cli/lca/rankinfo.py
diff --git a/sourmash/cli/lca/summarize.py → src/sourmash/cli/lca/summarize.py b/sourmash/cli/lca/summarize.py → src/sourmash/cli/lca/summarize.py
diff --git a/sourmash/cli/migrate.py → src/sourmash/cli/migrate.py b/sourmash/cli/migrate.py → src/sourmash/cli/migrate.py
diff --git a/sourmash/cli/multigather.py → src/sourmash/cli/multigather.py b/sourmash/cli/multigather.py → src/sourmash/cli/multigather.py
diff --git a/sourmash/cli/plot.py → src/sourmash/cli/plot.py b/sourmash/cli/plot.py → src/sourmash/cli/plot.py
diff --git a/sourmash/cli/sbt_combine.py → src/sourmash/cli/sbt_combine.py b/sourmash/cli/sbt_combine.py → src/sourmash/cli/sbt_combine.py
diff --git a/sourmash/cli/search.py → src/sourmash/cli/search.py b/sourmash/cli/search.py → src/sourmash/cli/search.py
diff --git a/sourmash/cli/sig/__init__.py → src/sourmash/cli/sig/__init__.py b/sourmash/cli/sig/__init__.py → src/sourmash/cli/sig/__init__.py
diff --git a/sourmash/cli/sig/cat.py → src/sourmash/cli/sig/cat.py b/sourmash/cli/sig/cat.py → src/sourmash/cli/sig/cat.py
diff --git a/sourmash/cli/sig/describe.py → src/sourmash/cli/sig/describe.py b/sourmash/cli/sig/describe.py → src/sourmash/cli/sig/describe.py
diff --git a/sourmash/cli/sig/downsample.py → src/sourmash/cli/sig/downsample.py b/sourmash/cli/sig/downsample.py → src/sourmash/cli/sig/downsample.py
diff --git a/sourmash/cli/sig/export.py → src/sourmash/cli/sig/export.py b/sourmash/cli/sig/export.py → src/sourmash/cli/sig/export.py
diff --git a/sourmash/cli/sig/extract.py → src/sourmash/cli/sig/extract.py b/sourmash/cli/sig/extract.py → src/sourmash/cli/sig/extract.py
diff --git a/sourmash/cli/sig/filter.py → src/sourmash/cli/sig/filter.py b/sourmash/cli/sig/filter.py → src/sourmash/cli/sig/filter.py
diff --git a/sourmash/cli/sig/flatten.py → src/sourmash/cli/sig/flatten.py b/sourmash/cli/sig/flatten.py → src/sourmash/cli/sig/flatten.py
diff --git a/sourmash/cli/sig/ingest.py → src/sourmash/cli/sig/ingest.py b/sourmash/cli/sig/ingest.py → src/sourmash/cli/sig/ingest.py
diff --git a/sourmash/cli/sig/intersect.py → src/sourmash/cli/sig/intersect.py b/sourmash/cli/sig/intersect.py → src/sourmash/cli/sig/intersect.py
diff --git a/sourmash/cli/sig/merge.py → src/sourmash/cli/sig/merge.py b/sourmash/cli/sig/merge.py → src/sourmash/cli/sig/merge.py
diff --git a/sourmash/cli/sig/overlap.py → src/sourmash/cli/sig/overlap.py b/sourmash/cli/sig/overlap.py → src/sourmash/cli/sig/overlap.py
diff --git a/sourmash/cli/sig/rename.py → src/sourmash/cli/sig/rename.py b/sourmash/cli/sig/rename.py → src/sourmash/cli/sig/rename.py
diff --git a/sourmash/cli/sig/split.py → src/sourmash/cli/sig/split.py b/sourmash/cli/sig/split.py → src/sourmash/cli/sig/split.py
diff --git a/sourmash/cli/sig/subtract.py → src/sourmash/cli/sig/subtract.py b/sourmash/cli/sig/subtract.py → src/sourmash/cli/sig/subtract.py
diff --git a/sourmash/cli/sketch/__init__.py → src/sourmash/cli/sketch/__init__.py b/sourmash/cli/sketch/__init__.py → src/sourmash/cli/sketch/__init__.py
diff --git a/sourmash/cli/sketch/dna.py → src/sourmash/cli/sketch/dna.py b/sourmash/cli/sketch/dna.py → src/sourmash/cli/sketch/dna.py
diff --git a/sourmash/cli/sketch/protein.py → src/sourmash/cli/sketch/protein.py b/sourmash/cli/sketch/protein.py → src/sourmash/cli/sketch/protein.py
diff --git a/sourmash/cli/sketch/translate.py → src/sourmash/cli/sketch/translate.py b/sourmash/cli/sketch/translate.py → src/sourmash/cli/sketch/translate.py
diff --git a/sourmash/cli/storage/__init__.py → src/sourmash/cli/storage/__init__.py b/sourmash/cli/storage/__init__.py → src/sourmash/cli/storage/__init__.py
diff --git a/sourmash/cli/storage/convert.py → src/sourmash/cli/storage/convert.py b/sourmash/cli/storage/convert.py → src/sourmash/cli/storage/convert.py
diff --git a/sourmash/cli/utils.py → src/sourmash/cli/utils.py b/sourmash/cli/utils.py → src/sourmash/cli/utils.py
diff --git a/sourmash/cli/watch.py → src/sourmash/cli/watch.py b/sourmash/cli/watch.py → src/sourmash/cli/watch.py
diff --git a/sourmash/command_compute.py → src/sourmash/command_compute.py b/sourmash/command_compute.py → src/sourmash/command_compute.py
diff --git a/sourmash/command_sketch.py → src/sourmash/command_sketch.py b/sourmash/command_sketch.py → src/sourmash/command_sketch.py
diff --git a/sourmash/commands.py → src/sourmash/commands.py b/sourmash/commands.py → src/sourmash/commands.py
diff --git a/sourmash/compare.py → src/sourmash/compare.py b/sourmash/compare.py → src/sourmash/compare.py
diff --git a/sourmash/exceptions.py → src/sourmash/exceptions.py b/sourmash/exceptions.py → src/sourmash/exceptions.py
diff --git a/sourmash/fig.py → src/sourmash/fig.py b/sourmash/fig.py → src/sourmash/fig.py
diff --git a/sourmash/hll.py → src/sourmash/hll.py b/sourmash/hll.py → src/sourmash/hll.py
diff --git a/sourmash/index.py → src/sourmash/index.py b/sourmash/index.py → src/sourmash/index.py
diff --git a/sourmash/lca/__init__.py → src/sourmash/lca/__init__.py b/sourmash/lca/__init__.py → src/sourmash/lca/__init__.py
diff --git a/sourmash/lca/__main__.py → src/sourmash/lca/__main__.py b/sourmash/lca/__main__.py → src/sourmash/lca/__main__.py
diff --git a/sourmash/lca/command_classify.py → src/sourmash/lca/command_classify.py b/sourmash/lca/command_classify.py → src/sourmash/lca/command_classify.py
diff --git a/sourmash/lca/command_compare_csv.py → src/sourmash/lca/command_compare_csv.py b/sourmash/lca/command_compare_csv.py → src/sourmash/lca/command_compare_csv.py
diff --git a/sourmash/lca/command_gather.py → src/sourmash/lca/command_gather.py b/sourmash/lca/command_gather.py → src/sourmash/lca/command_gather.py
diff --git a/sourmash/lca/command_index.py → src/sourmash/lca/command_index.py b/sourmash/lca/command_index.py → src/sourmash/lca/command_index.py
diff --git a/sourmash/lca/command_rankinfo.py → src/sourmash/lca/command_rankinfo.py b/sourmash/lca/command_rankinfo.py → src/sourmash/lca/command_rankinfo.py
diff --git a/sourmash/lca/command_summarize.py → src/sourmash/lca/command_summarize.py b/sourmash/lca/command_summarize.py → src/sourmash/lca/command_summarize.py
diff --git a/sourmash/lca/lca_db.py → src/sourmash/lca/lca_db.py b/sourmash/lca/lca_db.py → src/sourmash/lca/lca_db.py
diff --git a/sourmash/lca/lca_utils.py → src/sourmash/lca/lca_utils.py b/sourmash/lca/lca_utils.py → src/sourmash/lca/lca_utils.py
diff --git a/sourmash/logging.py → src/sourmash/logging.py b/sourmash/logging.py → src/sourmash/logging.py
diff --git a/sourmash/minhash.py → src/sourmash/minhash.py b/sourmash/minhash.py → src/sourmash/minhash.py
diff --git a/sourmash/nodegraph.py → src/sourmash/nodegraph.py b/sourmash/nodegraph.py → src/sourmash/nodegraph.py
diff --git a/sourmash/np_utils.py → src/sourmash/np_utils.py b/sourmash/np_utils.py → src/sourmash/np_utils.py
diff --git a/sourmash/sbt.py → src/sourmash/sbt.py b/sourmash/sbt.py → src/sourmash/sbt.py
diff --git a/sourmash/sbt_storage.py → src/sourmash/sbt_storage.py b/sourmash/sbt_storage.py → src/sourmash/sbt_storage.py
diff --git a/sourmash/sbtmh.py → src/sourmash/sbtmh.py b/sourmash/sbtmh.py → src/sourmash/sbtmh.py
diff --git a/sourmash/search.py → src/sourmash/search.py b/sourmash/search.py → src/sourmash/search.py
diff --git a/sourmash/sig/__init__.py → src/sourmash/sig/__init__.py b/sourmash/sig/__init__.py → src/sourmash/sig/__init__.py
diff --git a/sourmash/sig/__main__.py → src/sourmash/sig/__main__.py b/sourmash/sig/__main__.py → src/sourmash/sig/__main__.py
diff --git a/sourmash/signature.py → src/sourmash/signature.py b/sourmash/signature.py → src/sourmash/signature.py
diff --git a/sourmash/sourmash_args.py → src/sourmash/sourmash_args.py b/sourmash/sourmash_args.py → src/sourmash/sourmash_args.py
diff --git a/sourmash/utils.py → src/sourmash/utils.py b/sourmash/utils.py → src/sourmash/utils.py
diff --git a/tests/test_hll.py b/tests/test_hll.py
@@ -6,7 +6,7 @@
 
 from sourmash.hll import HLL
 
-from . import sourmash_tst_utils as utils
+import sourmash_tst_utils as utils
 
 K = 21  # size of kmer
 ERR_RATE = 0.01

diff --git a/tests/test_sourmash_sketch.py b/tests/test_sourmash_sketch.py
@@ -11,7 +11,7 @@
 import pytest
 import screed
 
-from . import sourmash_tst_utils as utils
+import sourmash_tst_utils as utils
 import sourmash
 from sourmash import MinHash
 from sourmash.sbt import SBT, Node

diff --git a/tox.ini b/tox.ini
@@ -39,11 +39,10 @@ extras =
     storage
 changedir = tests
 commands = pytest \
-           --basetemp="{envtmpdir}" \
            --cov "{envsitepackagesdir}/sourmash" \
            --cov-config "{toxinidir}/tox.ini" \
            --junitxml {toxworkdir}/junit.{envname}.xml \
-           {posargs}
+           {posargs:.}
 
 [testenv:pypy]
 deps =
@@ -140,12 +139,12 @@ exclude_lines =
     ^if __name__ == ['"]__main__['"]:$
 
 [coverage:paths]
-source = sourmash/
+source = src/sourmash/
          */.tox/*/lib/python*/site-packages/sourmash
          */.tox/pypy*/site-packages/sourmash
          */.tox\*\Lib\site-packages\sourmash
-         */sourmash
-         *\sourmash
+         */src/sourmash
+         *\src\sourmash
 
 [travis]
 python =