Merge pull request #43 from jepler/directory-src

move most python files to src/

.gitignore

@@ -6,11 +6,9 @@
 /.coverage*
 /coverage.xml
 /dist
-/*.egg-info
+*.egg-info
 /htmlcov
-/iersdata.csv
 __pycache__
 *,cover
 /.reuse
-/wwvbdata.html
-/wwvb/__version__.py
+/src/wwvb/__version__.py

Makefile

@@ -1,3 +1,21 @@
+ifeq ("$(origin V)", "command line")
+BUILD_VERBOSE=$(V)
+endif
+ifndef BUILD_VERBOSE
+$(info Use make V=1, make V=2 or set BUILD_VERBOSE similarly in your environment to increase build verbosity.)
+BUILD_VERBOSE = 0
+endif
+ifeq ($(BUILD_VERBOSE),0)
+Q = @
+STEPECHO = @:
+else ifeq ($(BUILD_VERBOSE),1)
+Q = @
+STEPECHO = @echo
+else
+Q =
+STEPECHO = @echo
+endif
+
 PYTHON ?= python3
 
 .PHONY: default
@@ -5,20 +23,20 @@ default: coverage mypy
 
 .PHONY: coverage
 coverage:
-	$(PYTHON) -mcoverage erase
-	$(PYTHON) -mcoverage run --branch -p -m unittest
-	$(PYTHON) -mcoverage combine
-	$(PYTHON) -mcoverage html
-	$(PYTHON) -mcoverage xml
-	$(PYTHON) -mcoverage report --fail-under=100
+	$(Q)$(PYTHON) -mcoverage erase
+	$(Q)env PYTHONPATH=src $(PYTHON) -mcoverage run --branch -p -m unittest discover -s src
+	$(Q)$(PYTHON) -mcoverage combine -q
+	$(Q)$(PYTHON) -mcoverage html
+	$(Q)$(PYTHON) -mcoverage xml
+	$(Q)$(PYTHON) -mcoverage report --fail-under=100
 
 .PHONY: mypy
 mypy:
-	mypy --strict --no-warn-unused-ignores uwwvb.py wwvb
+	$(Q)mypy --strict --no-warn-unused-ignores src
 
 .PHONY: update
 update:
-	$(PYTHON) -mwwvb.updateiers --dist
+	$(Q)env PYTHONPATH=src $(PYTHON) -mwwvb.updateiers --dist
 
 # Copyright (C) 2021 Jeff Epler <jepler@gmail.com>
 # SPDX-FileCopyrightText: 2021 Jeff Epler

pyproject.toml

@@ -16,4 +16,4 @@ requires = [
 ]
 build-backend = "setuptools.build_meta"
 [tool.setuptools_scm]
-write_to = "wwvb/__version__.py"
+write_to = "src/wwvb/__version__.py"

setup.cfg

@@ -23,7 +23,7 @@ classifiers =
 
 [options]
 package_dir =
-    =.
+    =src
 packages = wwvb
 python_requires = >=3.7
 py_modules = uwwvb