From 4d9e548945ec9491166ecb82534d16094cec9ff9 Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Mon, 8 Jul 2019 13:04:00 +0200 Subject: [PATCH] Fix naming hyphenation from boilerplate --- CONTRIBUTING.rst | 6 ------ README.rst | 4 ++-- {merkle-tree-stream => merkle_tree_stream}/__init__.py | 2 +- pyproject.toml | 2 +- setup.cfg | 2 +- test/test_version.py | 2 +- tox.ini | 10 +++++----- 7 files changed, 11 insertions(+), 17 deletions(-) rename {merkle-tree-stream => merkle_tree_stream}/__init__.py (71%) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 24a7a36..0f4fe03 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -53,12 +53,6 @@ Make a new release tag: $ git tag x.x.x $ git push --tags -If you have a development install locally, you can verify: - -.. code-block:: bash - - $ merkle-tree-stream --version - Then run the release process: .. code-block:: bash diff --git a/README.rst b/README.rst index 622fa6f..00ae367 100644 --- a/README.rst +++ b/README.rst @@ -1,8 +1,8 @@ .. _header: -************************ +****************** merkle-tree-stream -************************ +****************** .. image:: https://img.shields.io/badge/license-MIT-brightgreen.svg :target: LICENSE diff --git a/merkle-tree-stream/__init__.py b/merkle_tree_stream/__init__.py similarity index 71% rename from merkle-tree-stream/__init__.py rename to merkle_tree_stream/__init__.py index 4d429f8..4dc634a 100644 --- a/merkle-tree-stream/__init__.py +++ b/merkle_tree_stream/__init__.py @@ -7,6 +7,6 @@ except ImportError: try: - __version__ = pkg_resources.get_distribution('merkle-tree-stream').version + __version__ = pkg_resources.get_distribution('merkle_tree_stream').version except Exception: __version__ = 'unknown' diff --git a/pyproject.toml b/pyproject.toml index 343e51d..07b72d6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -16,7 +16,7 @@ include = '\.pyi?$' directory = "changelog/" filename = "CHANGELOG.rst" package = "merkle-tree-stream" -package_dir = "merkle-tree-stream" +package_dir = "merkle_tree_stream" [[tool.towncrier.type]] directory = "removal" diff --git a/setup.cfg b/setup.cfg index 7a50782..81f099b 100644 --- a/setup.cfg +++ b/setup.cfg @@ -5,7 +5,7 @@ testpaths = test max-line-length = 80 [isort] -known_first_party = merkle-tree-stream +known_first_party = merkle_tree_stream known_third_party = pytest line_length = 80 multi_line_output = 3 diff --git a/test/test_version.py b/test/test_version.py index 085ba9a..38e370c 100644 --- a/test/test_version.py +++ b/test/test_version.py @@ -4,6 +4,6 @@ def test_version_fails_gracefully(mocker): target = 'pkg_resources.get_distribution' with mocker.patch(target, side_effect=Exception()): - from merkle-tree-stream.__init__ import __version__ + from merkle_tree_stream.__init__ import __version__ assert __version__ == 'unknown' diff --git a/tox.ini b/tox.ini index 216c91a..21ed0ae 100644 --- a/tox.ini +++ b/tox.ini @@ -18,7 +18,7 @@ deps = pytest-cov pytest-mock commands = - pytest test/ --cov={toxinidir}/merkle-tree-stream/ --no-cov-on-fail {posargs} + pytest test/ --cov={toxinidir}/merkle_tree_stream/ --no-cov-on-fail {posargs} [testenv:lint] description = lint the source @@ -26,7 +26,7 @@ skipdist = True deps = flake8 commands = - flake8 {posargs} merkle-tree-stream/ test/ + flake8 {posargs} merkle_tree_stream/ test/ [testenv:sort] description = sort the source @@ -34,7 +34,7 @@ skipdist = True deps = isort commands = - isort {posargs:-rc -c} -sp setup.cfg merkle-tree-stream/ test/ + isort {posargs:-rc -c} -sp setup.cfg merkle_tree_stream/ test/ [testenv:format] description = format the source @@ -43,7 +43,7 @@ basepython = python3.6 deps = black commands = - black {posargs:--check} merkle-tree-stream/ test/ + black {posargs:--check} merkle_tree_stream/ test/ [testenv:type] description = type check the source @@ -52,7 +52,7 @@ skipdist = True deps = mypy commands = - mypy merkle-tree-stream/ test/ + mypy merkle_tree_stream/ test/ [testenv:docs] description = build the documentation