merge from develop

Author: Tom Goetz

.github/workflows/pythonapp.yml

@@ -11,6 +11,8 @@ jobs:
     - uses: actions/checkout@v2
       with:
         submodules: 'true'
+    - name: Install uv
+      uses: astral-sh/setup-uv@v6
     - name: Set up Python 3.13
       uses: actions/setup-python@v2
       with:

.gitignore

@@ -97,5 +97,8 @@ GarminConnectConfig.json
 test/test_files
 my-defines.mk
 test/*.txt
+my-defines.mk
+pyproject.toml
+uv.lock
 
 Jupyter/.ipynb_checkpoints/

Fit

@@ -72,9 +72,10 @@ update_venv:
 	$(VENV)/bin/python -m pip install --upgrade pip
 
 $(VENV):
-	$(PYTHON) -m venv --upgrade-deps $(VENV)
+	$(SYS_PYTHON_PATH) -m venv --upgrade-deps $(VENV)
 
 clean_venv:
+	echo "Cleaning venv"
 	rm -rf $(VENV)
 
 version_check:
@@ -94,9 +95,21 @@ publish_check: build
 publish: clean publish_check
 	$(PYTHON_PATH) -m twine upload dist/* --verbose
 
-build: devdeps
+builddeps: $(VENV) devdeps
+
+build: builddeps
+	cp pyproject.toml.in pyproject.toml
+	uv add -r requirements.txt
 	$(PYTHON_PATH) -m build
 
+build_clean:
+	echo "Cleaning build"
+	rm -rf pyproject.toml
+	rm -rf *.egg-info
+	rm -rf build
+	rm -rf dist
+	rm -rf uv.lock
+
 $(PROJECT_BASE)/dist/$(MODULE)-*.whl: build
 
 install: $(PROJECT_BASE)/dist/$(MODULE)-*.whl
@@ -118,7 +131,7 @@ install_pip_all: $(SUBMODULES:%=%-install_pip) install_pip
 reinstall: clean $(PROJECT_BASE)/dist/$(MODULE)-*.whl
 	$(PIP_PATH) install --upgrade --force-reinstall --no-deps $(PROJECT_BASE)/dist/$(MODULE)-*.whl
 
-reinstall_all: clean uninstall_all install_all
+reinstall_all: clean builddeps uninstall_all install_all
 
 $(SUBMODULES:%=%-uninstall):
 	$(MAKE) -C $(subst -uninstall,,$@) uninstall
@@ -184,7 +197,8 @@ $(SUBDIRS:%=%-clean):
 	rm -f garmindb/$(subst -clean,,$@)/*.pyc
 	rm -rf garmindb/$(subst -clean,,$@)/__pycache__
 
-clean: $(SUBMODULES:%=%-clean) $(SUBDIRS:%=%-clean) test_clean
+clean: $(SUBMODULES:%=%-clean) $(SUBDIRS:%=%-clean) test_clean build_clean
+	echo "Cleaning project"
 	rm -f *.pyc
 	rm -f *.log
 	rm -f scripts/*.log
@@ -196,11 +210,9 @@ clean: $(SUBMODULES:%=%-clean) $(SUBDIRS:%=%-clean) test_clean
 	rm -f scripts/*stats.txt
 	rm -f Jupyter/*stats.txt
 	rm -rf __pycache__
-	rm -rf *.egg-info
-	rm -rf build
-	rm -rf dist
 
 realclean: clean clean_venv
+	echo "Done realclean"
 
 checkup: update_garmin
 	garmindb_checkup.py --battery

Makefile

@@ -24,14 +24,10 @@ TIME ?= $(shell which time)
 
 endif
 
-
-# PYTHON3=$(shell which python3)
-PYTHON3=python3
-# PIP3=$(shell which pip3)
-PIP3=pip3
-
-PYTHON ?= $(PYTHON3)
-PIP ?= $(PIP3)
+PYTHON ?= python3
+# what python should the venv be based on?
+SYS_PYTHON_PATH ?= $(shell which python3)
+PIP ?= pip3
 
 
 ifeq ($(PYTHON),)

Tcx

@@ -1,4 +1,4 @@
-flake8==7.2.0
-build==1.2.1
-wheel==0.44.0
-twine==6.1.0
+flake8==7.3.0
+build==1.3.0
+wheel==0.45.1
+twine==6.2.0

defines.mk

@@ -6,9 +6,9 @@
 
 
 python_required = (3, 10, 0)
-dev_python_required = (3, 13, 5)
-python_tested = (3, 13, 5)
-version_info = (3, 6, 6)
+dev_python_required = (3, 13, 9)
+python_tested = (3, 13, 9)
+version_info = (3, 6, 7)
 prerelease = False
 
 

dev-requirements.txt

@@ -5,10 +5,6 @@ description = "Garmin Connect download and analysis"
 authors = [
     {name = "Tom Goetz"},
 ]
-dependencies = [
-    "SQLAlchemy==2.0.41",
-    "garth>=0.5.17"
-]
 requires-python = ">=3.10"
 readme = "README.md"
 license = {text = "GPL"}

garmindb/version_info.py

@@ -1,4 +1,4 @@
-sqlalchemy~=2.0.41
+sqlalchemy~=2.0.44
 python-dateutil
 cached-property
 tqdm