Dev

.editorconfig

@@ -34,5 +34,5 @@ indent_size = 2
 max_line_length = 79
 
 
-[{COMMIT_EDITMSG,MERGE_MSG,SQUASH_MSG,git-rebase-todo}]
+[{COMMIT_EDITMSG,MERGE_MSG,SQUASH_MSG,TAG_EDITMSG,git-rebase-todo}]
 max_line_length = 72

.geminiignore

@@ -0,0 +1,6 @@
+.venv
+.pytest_cache
+__pycache__
+*.sql
+*.db
+

.github/workflows/install-linux.yml

@@ -15,16 +15,16 @@ jobs:
 
     strategy:
       matrix:
-        python-version: ["3.10"]
+        python-version: ["3.11", "3.5"]
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: recursive
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
           # update-environment: false
@@ -35,7 +35,7 @@ jobs:
 
       # NOTE: see above NOTE, we are still using deprecated cache restore
       - name: Reload Cache / pip
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.cache/pip
           # NOTE: only cares about base requirements.txt
@@ -52,6 +52,6 @@ jobs:
 
       - name: Basic Tests / CLI / Integration
         run: |
-          n -v
-          nutra -d recipe init -f
+          n --version
+          nutra --debug recipe init -f
           nutra --no-pager recipe

.github/workflows/install-win32.yml

@@ -17,18 +17,18 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: recursive
 
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
           # update-environment: false
 
       - name: Reload Cache / pip
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~\AppData\Local\pip\Cache
           # NOTE: only cares about base requirements.txt
@@ -43,8 +43,8 @@ jobs:
 
       - name: Basic Tests / CLI / Integration
         run: |
-          n -v
-          nutra -d init -y
+          n --version
+          nutra --debug init -y
           nutra --no-pager nt
           nutra --no-pager sort -c 789
           nutra --no-pager search ultraviolet mushrooms

.github/workflows/lint.yml

@@ -16,15 +16,15 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: recursive
 
       - name: Fetch master (for incremental diff, lint filter mask)
         run: git fetch origin master
 
       - name: Reload Cache / pip
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: 3
           cache: "pip" # caching pip dependencies

.github/workflows/test.yml

@@ -12,7 +12,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: recursive
 

.pylintrc

@@ -1,6 +1,6 @@
 [MASTER]
 
-fail-under=9.93
+fail-under=9.95
 
 
 [MESSAGES CONTROL]

CHANGELOG.rst

@@ -12,6 +12,18 @@ and this project adheres to `Semantic Versioning <https://semver.org/spec/v2.0.0
 [0.2.8] - Unreleased
 ########################################################################
 
+Added
+~~~~~
+
+- ``Nutrient`` class, and partially completed ``nnest`` nested list.
+- Print statement for average of 1-rep maxes (for 3 different formulas)
+- ``print_header()`` function inside of ``services/analyze.py``
+
+Removed
+~~~~~~~
+
+- ``-d`` and ``-v`` shortcuts for ``--debug`` and ``--version``
+
 
 
 [0.2.7] - 2023-03-27

Makefile

@@ -6,7 +6,7 @@ SHELL=/bin/bash
 .PHONY: _help
 _help:
 	@printf "\nUsage: make <command>, valid commands:\n\n"
-	@grep "##" $(MAKEFILE_LIST) | grep -v IGNORE_ME | sed -e 's/##//' | column -t -s $$'\t'
+	@grep "##" $(MAKEFILE_LIST) | grep -v ^# | grep -v IGNORE_ME | sed -e 's/##//' | column -t -s $$'\t'
 
 
 
@@ -16,11 +16,15 @@ _help:
 
 .PHONY: init
 init:	## Set up a Python virtual environment
+	# Fetch submodule
 	git submodule update --init
+	# Re-add virtual environment
 	rm -rf .venv
 	${PY_SYS_INTERPRETER} -m venv .venv
+	# Upgrade dependencies and pip, if NOT running in CI automation
 	- if [ -z "${CI}" ]; then ${PY_SYS_INTERPRETER} -m venv --upgrade-deps .venv; fi
 	direnv allow
+	@echo "INFO: Successfully initialized venv, run 'make deps' now!"
 
 # include .env
 SKIP_VENV ?=
@@ -29,7 +33,8 @@ PWD ?= $(shell pwd)
 .PHONY: _venv
 _venv:
 	# Test to enforce venv usage across important make targets
-	[ "${SKIP_VENV}" ] || [ "${PYTHON}" = "${PWD}/.venv/bin/python" ]
+	test "${SKIP_VENV}" || test "${PYTHON}" = "${PWD}/.venv/bin/python"
+	@echo "OK"
 
 
 
@@ -54,10 +59,12 @@ REQ_LINT := requirements-lint.txt
 REQ_TEST := requirements-test.txt
 REQ_TEST_OLD := requirements-test-old.txt
 
+# TODO: this is a fragile hack (to get it to work in CI and locally too)
 PIP_OPT_ARGS ?= $(shell if [ "$(SKIP_VENV)" ]; then echo "--user"; fi)
 
 .PHONY: deps
 deps: _venv	## Install requirements
+	# Install requirements
 	${PIP} install wheel
 	${PIP} install ${PIP_OPT_ARGS} -r requirements.txt
 	- ${PIP} install ${PIP_OPT_ARGS} -r ${REQ_OPT}
@@ -69,42 +76,65 @@ deps: _venv	## Install requirements
 # Format, lint, test
 # ---------------------------------------
 
-.PHONY: format
-format: _venv	## Format with isort & black
-	if [ "${CHANGED_FILES_PY_FLAG}" ]; then isort ${CHANGED_FILES_PY} ; fi
-	if [ "${CHANGED_FILES_PY_FLAG}" ]; then black ${CHANGED_FILES_PY} ; fi
-
-
-LINT_LOCS := ntclient/ tests/ setup.py
+# LINT_LOCS := ntclient/ tests/ setup.py
 CHANGED_FILES_RST ?= $(shell git diff origin/master --name-only --diff-filter=MACRU \*.rst)
 CHANGED_FILES_PY ?= $(shell git diff origin/master --name-only --diff-filter=MACRU \*.py)
-CHANGED_FILES_PY_FLAG ?= $(shell if [ "$(CHANGED_FILES_PY)" ]; then echo 1; fi)
+
+.PHONY: format
+format: _venv	## Format with isort & black
+ifneq ($(CHANGED_FILES_PY),)
+	isort ${CHANGED_FILES_PY}
+	black ${CHANGED_FILES_PY}
+	-git --no-pager diff --stat
+	@echo "OK"
+	@git diff --quiet || echo "NOTE: You may want to run: git add ."
+else
+	$(info No changed Python files, skipping.)
+endif
 
 .PHONY: lint
 lint: _venv	## Lint code and documentation
+ifneq ($(CHANGED_FILES_RST),)
 	# lint RST
-	if [ "${CHANGED_FILES_RST}" ]; then doc8 --quiet ${CHANGED_FILES_RST}; fi
+	doc8 --quiet ${CHANGED_FILES_RST}
+	@echo "OK"
+else
+	$(info No changed RST files, skipping.)
+endif
+ifneq ($(CHANGED_FILES_PY),)
 	# check formatting: Python
-	if [ "${CHANGED_FILES_PY_FLAG}" ]; then isort --diff --check ${CHANGED_FILES_PY} ; fi
-	if [ "${CHANGED_FILES_PY_FLAG}" ]; then black --check ${CHANGED_FILES_PY} ; fi
+	isort --diff --check ${CHANGED_FILES_PY}
+	black --check ${CHANGED_FILES_PY}
 	# lint Python
-	if [ "${CHANGED_FILES_PY_FLAG}" ]; then pycodestyle --statistics ${CHANGED_FILES_PY}; fi
-	if [ "${CHANGED_FILES_PY_FLAG}" ]; then bandit -q -c .banditrc -r ${CHANGED_FILES_PY}; fi
-	if [ "${CHANGED_FILES_PY_FLAG}" ]; then flake8 ${CHANGED_FILES_PY}; fi
-	if [ "${CHANGED_FILES_PY_FLAG}" ]; then mypy ${CHANGED_FILES_PY}; fi
-	if [ "${CHANGED_FILES_PY_FLAG}" ]; then pylint ${CHANGED_FILES_PY}; fi
+	pycodestyle --statistics ${CHANGED_FILES_PY}
+	bandit -q -c .banditrc -r ${CHANGED_FILES_PY}
+	flake8 ${CHANGED_FILES_PY}
+	mypy ${CHANGED_FILES_PY}
+	pylint ${CHANGED_FILES_PY}
+	@echo "OK"
+else
+	$(info No changed Python files, skipping.)
+endif
 
 .PHONY: pylint
 pylint:
-	if [ "${CHANGED_FILES_PY_FLAG}" ]; then pylint ${CHANGED_FILES_PY}; fi
+ifneq ($(CHANGED_FILES_PY),)
+	pylint ${CHANGED_FILES_PY}
+else
+	$(info No changed Python files, skipping.)
+endif
 
 .PHONY: mypy
 mypy:
-	if [ "${CHANGED_FILES_PY_FLAG}" ]; then mypy ${CHANGED_FILES_PY}; fi
+ifneq ($(CHANGED_FILES_PY),)
+	mypy ${CHANGED_FILES_PY}
+else
+	$(info No changed Python files, skipping.)
+endif
 
 
 .PHONY: test
-test: _venv	## Run CLI unittests
+test: _venv	## Run CLI unit tests
 	coverage run
 	coverage report
 	- grep fail_under setup.cfg
@@ -144,7 +174,7 @@ install:	## pip install .
 	${PY_SYS_INTERPRETER} -m pip install . || ${PY_SYS_INTERPRETER} -m pip install --user .
 	${PY_SYS_INTERPRETER} -m pip show nutra
 	- ${PY_SYS_INTERPRETER} -c 'import shutil; print(shutil.which("nutra"));'
-	nutra -v
+	nutra --version
 
 
 
@@ -156,16 +186,19 @@ RECURSIVE_CLEAN_LOCS ?= $(shell find ntclient/ tests/ \
 -name __pycache__ \
 -o -name .coverage \
 -o -name .mypy_cache \
--o -name .pytest_cache)
+-o -name .pytest_cache \
+)
 
 .PHONY: clean
 clean:	## Clean up __pycache__ and leftover bits
 	rm -f .coverage ntclient/ntsqlite/sql/nt.sqlite3
 	rm -rf build/
 	rm -rf nutra.egg-info/
 	rm -rf .pytest_cache/ .mypy_cache/
+ifneq ($(RECURSIVE_CLEAN_LOCS),)
 	# Recursively find & remove
-	if [ "${RECURSIVE_CLEAN_LOCS}" ]; then rm -rf ${RECURSIVE_CLEAN_LOCS}; fi
+	rm -rf ${RECURSIVE_CLEAN_LOCS}
+endif
 
 
 
@@ -175,4 +208,4 @@ clean:	## Clean up __pycache__ and leftover bits
 
 .PHONY: extras/cloc
 extras/cloc:	## Count lines of source code
-	- cloc HEAD
+	- cloc HEAD ntclient/ntsqlite

README.rst

@@ -100,7 +100,7 @@ Install with,
     HOOK='eval "$(direnv hook '$DEFAULT_SHELL')"'
 
     # Install the hook, if not already
-    grep "$HOOK" $SHELL_RC_FILE || echo "$HOOK" >>$SHELL_RC_FILE
+    grep ^"$HOOK"$ $SHELL_RC_FILE || echo "$HOOK" >>$SHELL_RC_FILE
     source $SHELL_RC_FILE
 
 This is what the ``.envrc`` file is for. It automatically activates ``venv``.
@@ -269,4 +269,5 @@ Usage
 Requires internet connection to download initial datasets.
 Run ``nutra init`` for this step.
 
-Run ``n`` or ``nutra`` to output usage (``-h`` flag is optional and defaulted).
+Run ``n`` or ``nutra`` to output usage (``--help`` flag is optional and
+defaulted).

ntclient/__init__.py

@@ -16,38 +16,53 @@
 
 # Package info
 __title__ = "nutra"
-__version__ = "0.2.7"
+__version__ = "0.2.8.dev2"
 __author__ = "Shane Jaroch"
 __email__ = "chown_tee@proton.me"
 __license__ = "GPL v3"
 __copyright__ = "Copyright 2018-2022 Shane Jaroch"
 __url__ = "https://github.com/nutratech/cli"
 
 # Sqlite target versions
-__db_target_nt__ = "0.0.6"
-__db_target_usda__ = "0.0.8"
+# TODO: should this be via versions.csv file?  Don't update in two places?
+__db_target_nt__ = "0.0.7"
+__db_target_usda__ = "0.0.10"
 USDA_XZ_SHA256 = "25dba8428ced42d646bec704981d3a95dc7943240254e884aad37d59eee9616a"
 
 # Global variables
 PROJECT_ROOT = os.path.abspath(os.path.dirname(__file__))
-NUTRA_HOME = os.getenv("NUTRA_HOME", os.path.join(os.path.expanduser("~"), ".nutra"))
-USDA_DB_NAME = "usda.sqlite"
+NUTRA_HOME = os.getenv(
+    "NUTRA_HOME",
+    os.getenv("NUTRA_DIR", os.path.join(os.path.expanduser("~"), ".nutra")),
+)
+USDA_DB_NAME = "usda.sqlite3"
 # NOTE: NT_DB_NAME = "nt.sqlite3" is defined in ntclient.ntsqlite.sql
 
 NTSQLITE_BUILDPATH = os.path.join(PROJECT_ROOT, "ntsqlite", "sql", NT_DB_NAME)
 NTSQLITE_DESTINATION = os.path.join(NUTRA_HOME, NT_DB_NAME)
 
-# Check Python version
+
+def version_check() -> None:
+    """Check Python version"""
+    # pylint: disable=global-statement
+    global PY_SYS_VER, PY_SYS_STR
+    PY_SYS_VER = sys.version_info[0:3]
+    PY_SYS_STR = ".".join(str(x) for x in PY_SYS_VER)
+
+    if PY_SYS_VER < PY_MIN_VER:
+        # TODO: make this testable with: `class CliConfig`?
+        raise RuntimeError(
+            "ERROR: %s requires Python %s or later to run" % (__title__, PY_MIN_STR),
+            "HINT:  You're running Python %s" % PY_SYS_STR,
+        )
+
+
 PY_MIN_VER = (3, 4, 3)
 PY_SYS_VER = sys.version_info[0:3]
 PY_MIN_STR = ".".join(str(x) for x in PY_MIN_VER)
 PY_SYS_STR = ".".join(str(x) for x in PY_SYS_VER)
-if PY_SYS_VER < PY_MIN_VER:
-    # TODO: make this testable with: `class CliConfig`?
-    raise RuntimeError(  # pragma: no cover
-        "ERROR: %s requires Python %s or later to run" % (__title__, PY_MIN_STR),
-        "HINT:  You're running Python %s" % PY_SYS_STR,
-    )
+# Run the check
+version_check()
 
 # Console size, don't print more than it
 BUFFER_WD = shutil.get_terminal_size()[0]