From b619478b2edd720184f9eb7ee9af871eacee6995 Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Sat, 3 Sep 2022 13:34:29 -0500 Subject: [PATCH 1/3] Move source to src/ --- .gitignore | 6 ++---- Makefile | 6 +++--- pyproject.toml | 2 +- setup.cfg | 2 +- uwwvb.py => src/uwwvb.py | 0 {wwvb => src/wwvb}/__init__.py | 0 {wwvb => src/wwvb}/decode.py | 0 {wwvb => src/wwvb}/dut1table.py | 0 {wwvb => src/wwvb}/gen.py | 0 {wwvb => src/wwvb}/iersdata.py | 0 {wwvb => src/wwvb}/iersdata_dist.py | 0 {wwvb => src/wwvb}/py.typed | 0 {wwvb => src/wwvb}/testcli.py | 0 {wwvb => src/wwvb}/testdaylight.py | 0 {wwvb => src/wwvb}/testls.py | 0 {wwvb => src/wwvb}/testpm.py | 0 {wwvb => src/wwvb}/testuwwvb.py | 0 {wwvb => src/wwvb}/testwwvb.py | 0 {wwvb => src/wwvb}/tz.py | 0 {wwvb => src/wwvb}/updateiers.py | 0 {wwvb => src/wwvb}/wwvbtk.py | 0 21 files changed, 7 insertions(+), 9 deletions(-) rename uwwvb.py => src/uwwvb.py (100%) rename {wwvb => src/wwvb}/__init__.py (100%) rename {wwvb => src/wwvb}/decode.py (100%) rename {wwvb => src/wwvb}/dut1table.py (100%) rename {wwvb => src/wwvb}/gen.py (100%) rename {wwvb => src/wwvb}/iersdata.py (100%) rename {wwvb => src/wwvb}/iersdata_dist.py (100%) rename {wwvb => src/wwvb}/py.typed (100%) rename {wwvb => src/wwvb}/testcli.py (100%) rename {wwvb => src/wwvb}/testdaylight.py (100%) rename {wwvb => src/wwvb}/testls.py (100%) rename {wwvb => src/wwvb}/testpm.py (100%) rename {wwvb => src/wwvb}/testuwwvb.py (100%) rename {wwvb => src/wwvb}/testwwvb.py (100%) rename {wwvb => src/wwvb}/tz.py (100%) rename {wwvb => src/wwvb}/updateiers.py (100%) rename {wwvb => src/wwvb}/wwvbtk.py (100%) diff --git a/.gitignore b/.gitignore index f1388be..196846b 100644 --- a/.gitignore +++ b/.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 diff --git a/Makefile b/Makefile index ac39b79..84cc44d 100644 --- a/Makefile +++ b/Makefile @@ -6,15 +6,15 @@ default: coverage mypy .PHONY: coverage coverage: $(PYTHON) -mcoverage erase - $(PYTHON) -mcoverage run --branch -p -m unittest - $(PYTHON) -mcoverage combine + $(PYTHON) -mcoverage run --branch -p -m unittest discover -s src + $(PYTHON) -mcoverage combine -q $(PYTHON) -mcoverage html $(PYTHON) -mcoverage xml $(PYTHON) -mcoverage report --fail-under=100 .PHONY: mypy mypy: - mypy --strict --no-warn-unused-ignores uwwvb.py wwvb + mypy --strict --no-warn-unused-ignores src .PHONY: update update: diff --git a/pyproject.toml b/pyproject.toml index facaa1c..2e9615b 100644 --- a/pyproject.toml +++ b/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" diff --git a/setup.cfg b/setup.cfg index 6de309a..2718cdf 100644 --- a/setup.cfg +++ b/setup.cfg @@ -23,7 +23,7 @@ classifiers = [options] package_dir = - =. + =src packages = wwvb python_requires = >=3.7 py_modules = uwwvb diff --git a/uwwvb.py b/src/uwwvb.py similarity index 100% rename from uwwvb.py rename to src/uwwvb.py diff --git a/wwvb/__init__.py b/src/wwvb/__init__.py similarity index 100% rename from wwvb/__init__.py rename to src/wwvb/__init__.py diff --git a/wwvb/decode.py b/src/wwvb/decode.py similarity index 100% rename from wwvb/decode.py rename to src/wwvb/decode.py diff --git a/wwvb/dut1table.py b/src/wwvb/dut1table.py similarity index 100% rename from wwvb/dut1table.py rename to src/wwvb/dut1table.py diff --git a/wwvb/gen.py b/src/wwvb/gen.py similarity index 100% rename from wwvb/gen.py rename to src/wwvb/gen.py diff --git a/wwvb/iersdata.py b/src/wwvb/iersdata.py similarity index 100% rename from wwvb/iersdata.py rename to src/wwvb/iersdata.py diff --git a/wwvb/iersdata_dist.py b/src/wwvb/iersdata_dist.py similarity index 100% rename from wwvb/iersdata_dist.py rename to src/wwvb/iersdata_dist.py diff --git a/wwvb/py.typed b/src/wwvb/py.typed similarity index 100% rename from wwvb/py.typed rename to src/wwvb/py.typed diff --git a/wwvb/testcli.py b/src/wwvb/testcli.py similarity index 100% rename from wwvb/testcli.py rename to src/wwvb/testcli.py diff --git a/wwvb/testdaylight.py b/src/wwvb/testdaylight.py similarity index 100% rename from wwvb/testdaylight.py rename to src/wwvb/testdaylight.py diff --git a/wwvb/testls.py b/src/wwvb/testls.py similarity index 100% rename from wwvb/testls.py rename to src/wwvb/testls.py diff --git a/wwvb/testpm.py b/src/wwvb/testpm.py similarity index 100% rename from wwvb/testpm.py rename to src/wwvb/testpm.py diff --git a/wwvb/testuwwvb.py b/src/wwvb/testuwwvb.py similarity index 100% rename from wwvb/testuwwvb.py rename to src/wwvb/testuwwvb.py diff --git a/wwvb/testwwvb.py b/src/wwvb/testwwvb.py similarity index 100% rename from wwvb/testwwvb.py rename to src/wwvb/testwwvb.py diff --git a/wwvb/tz.py b/src/wwvb/tz.py similarity index 100% rename from wwvb/tz.py rename to src/wwvb/tz.py diff --git a/wwvb/updateiers.py b/src/wwvb/updateiers.py similarity index 100% rename from wwvb/updateiers.py rename to src/wwvb/updateiers.py diff --git a/wwvb/wwvbtk.py b/src/wwvb/wwvbtk.py similarity index 100% rename from wwvb/wwvbtk.py rename to src/wwvb/wwvbtk.py From fd913d0930de5911e98c7b0c63b1582ed1222036 Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Sat, 3 Sep 2022 13:37:58 -0500 Subject: [PATCH 2/3] Quiet the build process --- Makefile | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 84cc44d..0b39812 100644 --- a/Makefile +++ b/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 discover -s src - $(PYTHON) -mcoverage combine -q - $(PYTHON) -mcoverage html - $(PYTHON) -mcoverage xml - $(PYTHON) -mcoverage report --fail-under=100 + $(Q)$(PYTHON) -mcoverage erase + $(Q)$(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 src + $(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 # SPDX-FileCopyrightText: 2021 Jeff Epler From 63769e9529cd120a424f85815c1056baa1171179 Mon Sep 17 00:00:00 2001 From: Jeff Epler Date: Sat, 3 Sep 2022 13:47:04 -0500 Subject: [PATCH 3/3] another place I have to list src --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 0b39812..22fd02a 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ default: coverage mypy .PHONY: coverage coverage: $(Q)$(PYTHON) -mcoverage erase - $(Q)$(PYTHON) -mcoverage run --branch -p -m unittest discover -s src + $(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