setup for publishing to pypi

.gitmodules

@@ -3,7 +3,7 @@
 	url = ../Fit.git
 [submodule "utilities"]
 	path = utilities
-	url = ../utilities.git
+	url = ../idbutils.git
 [submodule "Tcx"]
 	path = Tcx
 	url = ../Tcx.git

Jupyter/summary.ipynb

@@ -47,13 +47,6 @@
     "graph.graph_activity('weight')\n",
     "\n"
    ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": []
   }
  ]
 }

Makefile

@@ -6,6 +6,8 @@ export PROJECT_BASE=$(CURDIR)
 
 include defines.mk
 
+MODULE=garmindb
+
 
 #
 # Master targets
@@ -15,7 +17,7 @@ all: update_dbs
 # install all needed code
 setup_repo: $(CONF_DIR)/GarminConnectConfig.json $(PROJECT_BASE)/.venv submodules_update
 
-setup_install: devdeps install_all
+setup_install: deps devdeps install_all
 
 setup: setup_repo setup_install
 
@@ -65,23 +67,37 @@ submodules_update:
 $(SUBMODULES:%=%-install):
 	$(MAKE) -C $(subst -install,,$@) install
 
-install:
-	$(PYTHON) setup.py install
+dist: build
+
+publish_check: dist
+	$(PYTHON) -m twine check dist/*
+
+publish: publish_check
+	$(PYTHON) -m twine upload dist/* --verbose
+
+build:
+	$(PYTHON) -m build
+
+install: build
+	$(PIP) install --upgrade --force-reinstall ./dist/$(MODULE)-*.whl
 
 install_all: $(SUBMODULES:%=%-install) install
 
 $(SUBMODULES:%=%-uninstall):
 	$(MAKE) -C $(subst -uninstall,,$@) uninstall
 
 uninstall:
-	$(PIP) uninstall -y garmindb
+	$(PIP) uninstall -y $(MODULE)
 
-uninstall_all: uninstall $(SUBMODULES:%=%-install)
+uninstall_all: uninstall $(SUBMODULES:%=%-uninstall)
 
 $(SUBMODULES:%=%-deps):
 	$(MAKE) -C $(subst -deps,,$@) deps
 
-deps: $(SUBMODULES:%=%-deps)
+pip_upgrade:
+	$(PIP) install --upgrade pip
+
+deps: pip_upgrade $(SUBMODULES:%=%-deps)
 	$(PIP) install --upgrade --requirement requirements.txt
 
 $(SUBMODULES:%=%-devdeps):
@@ -133,14 +149,14 @@ backup: $(BACKUP_DIR)
 	zip -r $(BACKUP_DIR)/$(EPOCH)_dbs.zip $(DB_DIR)
 
 graphs:
-	garmin_graphs.py --all
+	garmindb_graphs.py --all
 
 graph_yesterday:
-	garmin_graphs.py --day $(YESTERDAY)
+	garmindb_graphs.py --day $(YESTERDAY)
 
 checkup: update_garmin
-	garmin_checkup.py --battery
-	garmin_checkup.py --goals
+	garmindb_checkup.py --battery
+	garmindb_checkup.py --goals
 
 # define CHECKUP_COURSE_ID in my-defines.mk
 checkup_course:
@@ -152,55 +168,55 @@ daily: all checkup graph_yesterday
 # Garmin targets
 #
 download_all_garmin:
-	garmin.py --all --download
+	garmindb_cli.py --all --download
 
 redownload_garmin_activities:
-	garmin.py --activities --download --overwrite
+	garmindb_cli.py --activities --download --overwrite
 
 garmin:
-	garmin.py --all --download --import --analyze
+	garmindb_cli.py --all --download --import --analyze
 
 build_garmin:
-	garmin.py --all --import --analyze
+	garmindb_cli.py --all --import --analyze
 
 build_garmin_monitoring:
-	garmin.py --monitoring --import --analyze
+	garmindb_cli.py --monitoring --import --analyze
 
 build_garmin_activities:
-	garmin.py --activities --import --analyze
+	garmindb_cli.py --activities --import --analyze
 
 copy_garmin_settings:
-	garmin.py --copy
+	garmindb_cli.py --copy
 
 copy_garmin:
-	garmin.py --all --copy --import --analyze
+	garmindb_cli.py --all --copy --import --analyze
 
 update_garmin:
-	garmin.py --all --download --import --analyze --latest
+	garmindb_cli.py --all --download --import --analyze --latest
 
 copy_garmin_latest:
-	garmin.py --all --copy --import --analyze --latest
+	garmindb_cli.py --all --copy --import --analyze --latest
 
 # define EXPORT_ACTIVITY_ID in my-defines.mk
 export_activity:
-	garmin.py --export-activity $(EXPORT_ACTIVITY_ID)
+	garmindb_cli.py --export-activity $(EXPORT_ACTIVITY_ID)
 
 # define EXPORT_ACTIVITY_ID in my-defines.mk
 basecamp_activity:
-	garmin.py --basecamp-activity $(EXPORT_ACTIVITY_ID)
+	garmindb_cli.py --basecamp-activity $(EXPORT_ACTIVITY_ID)
 
 # define EXPORT_ACTIVITY_ID in my-defines.mk
 google_earth_activity:
-	garmin.py --google-earth-activity $(EXPORT_ACTIVITY_ID)
+	garmindb_cli.py --google-earth-activity $(EXPORT_ACTIVITY_ID)
 
 clean_garmin_dbs:
-	garmin.py --delete_db --all
+	garmindb_cli.py --delete_db --all
 
 clean_garmin_monitoring_dbs:
-	garmin.py --delete_db --monitoring
+	garmindb_cli.py --delete_db --monitoring
 
 clean_garmin_activities_dbs:
-	garmin.py --delete_db --activities
+	garmindb_cli.py --delete_db --activities
 
 
 #

bugreport.sh

@@ -22,11 +22,11 @@ for package in "${PYTHON_PACKAGES_ARRAY[@]}"; do \
     echo "---" >> ${BUGREPORT}; \
 done
 
-if [ -f garmin.py ]; then
+if [ -f garmindb_cli.py ]; then
     echo Getting GarminDB version
     echo --- >> ${BUGREPORT}
     echo -n "GarminDB version " >> ${BUGREPORT}
-    ${PYTHON} garmin.py --version >> ${BUGREPORT}
+    ${PYTHON} garmindb_cli.py --version >> ${BUGREPORT}
 fi
 
 echo Zipping up ${BUGREPORT} and logs

garmindb/analyze.py

@@ -11,7 +11,7 @@
 from tqdm import tqdm
 
 import fitfile
-from utilities.list_and_dict import list_not_none
+from idbutils.list_and_dict import list_not_none
 
 from garmindb import summarydb
 from .garmindb import GarminDb, Attributes, File, Weight, Stress, RestingHeartRate, IntensityHR, Sleep

garmindb/config_manager.py

@@ -8,7 +8,7 @@
 import logging
 import tempfile
 
-from utilities import DbParams
+from idbutils import DbParams
 
 from .config import Config
 

garmindb/copy.py

@@ -11,7 +11,7 @@
 import logging
 
 import fitfile
-from utilities import FileProcessor
+from idbutils import FileProcessor
 
 from .config_manager import ConfigManager
 

garmindb/download.py

@@ -17,7 +17,7 @@
 from tqdm import tqdm
 
 import fitfile.conversions as conversions
-from utilities import RestClient, RestException, RestResponseException
+from idbutils import RestClient, RestException, RestResponseException
 
 from .garmin_connect_config_manager import GarminConnectConfigManager
 from .config_manager import ConfigManager

garmindb/fit_data.py

@@ -11,7 +11,7 @@
 from tqdm import tqdm
 
 import fitfile
-from utilities import FileProcessor
+from idbutils import FileProcessor
 
 
 logger = logging.getLogger(__file__)

garmindb/fitbitdb/fitbit_db.py

@@ -9,16 +9,16 @@
 from sqlalchemy import Column, Integer, Date, Float, Time
 
 import fitfile
-import utilities
+import idbutils
 
 
 logger = logging.getLogger(__name__)
 
-FitBitDb = utilities.DB.create('fitbit', 2, "Database for storing health data from FitBit.")
-Attributes = utilities.DbObject.create('attributes', FitBitDb, 1, base=utilities.KeyValueObject, doc="key-value data from a FitBit device.")
+FitBitDb = idbutils.DB.create('fitbit', 2, "Database for storing health data from FitBit.")
+Attributes = idbutils.DbObject.create('attributes', FitBitDb, 1, base=idbutils.KeyValueObject, doc="key-value data from a FitBit device.")
 
 
-class DaysSummary(FitBitDb.Base, utilities.DbObject):
+class DaysSummary(FitBitDb.Base, idbutils.DbObject):
     """A table that holds summarized information about a day with one row per day."""
 
     __tablename__ = 'days_summary'

garmindb/fitbitdb/import_csv.py

@@ -8,8 +8,8 @@
 import logging
 from tqdm import tqdm
 
-from utilities import CsvImporter
-from utilities import FileProcessor
+from idbutils import CsvImporter
+from idbutils import FileProcessor
 
 from .fitbit_db import FitBitDb, DaysSummary
 

garmindb/garmin_connect_config_manager.py

@@ -9,7 +9,7 @@
 import subprocess
 import datetime
 
-from utilities import JsonConfig
+from idbutils import JsonConfig
 
 from .statistics import Statistics
 from .config_manager import ConfigManager

garmindb/garmindb/activities_db.py

@@ -11,15 +11,15 @@
 from sqlalchemy.orm import relationship
 from sqlalchemy.ext.hybrid import hybrid_property
 
-import utilities
+import idbutils
 
 
 logger = logging.getLogger(__name__)
 
-ActivitiesDb = utilities.DB.create('garmin_activities', 13, "Database for storing activities data.")
+ActivitiesDb = idbutils.DB.create('garmin_activities', 13, "Database for storing activities data.")
 
 
-class ActivitiesLocationSegment(utilities.DbObject):
+class ActivitiesLocationSegment(idbutils.DbObject):
     """Object representing a databse object for storing location segnment from an activity."""
 
     # degrees
@@ -31,7 +31,7 @@ class ActivitiesLocationSegment(utilities.DbObject):
     @hybrid_property
     def start_loc(self):
         """Return the starting location of activity segment as a Location instance."""
-        return utilities.Location(self.start_lat, self.start_long)
+        return idbutils.Location(self.start_lat, self.start_long)
 
     @start_loc.setter
     def start_loc(self, start_location):
@@ -41,7 +41,7 @@ def start_loc(self, start_location):
     @hybrid_property
     def stop_loc(self):
         """Return the ending location of activity segment as a Location instance."""
-        return utilities.Location(self.stop_lat, self.stop_long)
+        return idbutils.Location(self.stop_lat, self.stop_long)
 
     @stop_loc.setter
     def stop_loc(self, stop_location):
@@ -181,15 +181,15 @@ def s_get_activity(cls, session, activity_id):
     @hybrid_property
     def start_loc(self):
         """Return the lap start location."""
-        return utilities.Location(self.start_lat, self.start_long)
+        return idbutils.Location(self.start_lat, self.start_long)
 
     @start_loc.setter
     def start_loc(self, start_location):
         self.start_lat = start_location.lat_deg
         self.start_long = start_location.long_deg
 
 
-class ActivityRecords(ActivitiesDb.Base, utilities.DbObject):
+class ActivityRecords(ActivitiesDb.Base, idbutils.DbObject):
     """Encapsilates record for a single point in time from an activity."""
 
     __tablename__ = 'activity_records'
@@ -221,15 +221,15 @@ def s_get_activity(cls, session, activity_id):
     @hybrid_property
     def position(self):
         """Return the location where the record was recorded."""
-        return utilities.Location(self.position_lat, self.position_long)
+        return idbutils.Location(self.position_lat, self.position_long)
 
     @position.setter
     def position(self, location):
         self.position_lat = location.lat_deg
         self.position_long = location.long_deg
 
 
-class SportActivities(utilities.DbObject):
+class SportActivities(idbutils.DbObject):
     """Base class for all sport based activity tables."""
 
     @declared_attr
@@ -266,7 +266,7 @@ def create_view(cls, db):
     @classmethod
     def google_map_loc(cls, label):
         """Return a literal column composed of a google map URL for either the start or stop location off the activity."""
-        return literal_column(utilities.Location.google_maps_url('activities.%s_lat' % label, 'activities.%s_long' % label) + ' AS %s_loc' % label)
+        return literal_column(idbutils.Location.google_maps_url('activities.%s_lat' % label, 'activities.%s_long' % label) + ' AS %s_loc' % label)
 
 
 class StepsActivities(ActivitiesDb.Base, SportActivities):