Skip to content

Commit 38803af

Browse files
committed
Changes to be committed:
new file: CHANGELOG.md Created change log for current and future version modified: README.md Updated with required instructions and user guide as listed in the changes modified: setup.py Added argparse libary to be installed modified: src/requirements.txt Added argparse libary to be installed modified: vuegraf.json.sample Moved history and reset from sample json as they are now command line options modified: src/vuegraf/vuegraf.py This text of changes is also in CHANGELOG.MD - Replaced Minute with Hour as normal interval since history is limited to 7 days from Emporia on minute data - argparse libary was added, must run pip install -r requirements again in the src directory (or pip3 based on install) - Hour / Day data pulled. Allows for history of 2 years to be pulled. Assists in clean numbers/graphs to see daily monthly usage to compare against utilities reports. - Hour data runs with the get details time, default is 1 hour (3600 seconds). Based on when the program is started, you may be almost 2 hours behind for get hour. - Changed several one time parameters from the json config file to command line entries (History load days, reset database). <b> Example Command Line usage usage: vuegraf.py [-h] [--version] [-v] [-q] [--historydays HISTORYDAYS] [--resetdatabase] configFilename positional arguments: configFilename json config file options: -h, --help show this help message and exit --version display version number -v, --verbose verbose output - summaries -q, --quiet do not print anything but errors --historydays HISTORYDAYS Starts executin by pulling history of Hours and Day data for specified number of days. example: --load-history-day 60 --resetdatabase Drop database and create a new one - Started Changelog for this and future releases - Added project metadata to main program - vuegraf.py, values can be updated through github automations - Added command line parameters with help syntaxt for all values - arge parse lib. - ran pylint and fixed Quote delimiter consitency to all ' Whitespaces Extra lines
1 parent d9ab8fc commit 38803af

10 files changed

+553
-312
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ int
33
docker-compose.yaml
44
dist/
55
vuegraf.egg-info/
6+
vugraftobe.py

.vscode/launch.json

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
// Use IntelliSense to learn about possible attributes.
3+
// Hover to view descriptions of existing attributes.
4+
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
5+
"version": "0.2.0",
6+
"configurations": [
7+
8+
{
9+
"name": "Python: Current File",
10+
"type": "python",
11+
"request": "launch",
12+
"program": "${file}",
13+
"args" : ["/mnt/c/Users/garre/OneDrive/Documents/GitHub/vuegraf/vuegraf.json", "--resetdatabase", "--historydays", "90", "--verbose"],
14+
//"args" : ["/mnt/c/Users/garre/OneDrive/Documents/GitHub/vuegraf/vuegraf.json", "--resetdatabase", "--verbose"],
15+
"console": "integratedTerminal",
16+
"justMyCode": true
17+
}
18+
]
19+
}

CHANGELOG.md

+53
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
# 2.TBD.TBD- Future
2+
3+
## Breaking changes
4+
- TBD
5+
6+
## New features
7+
- TBD
8+
9+
## Other changes
10+
11+
12+
# 1.6.0 - Released
13+
14+
## Breaking changes
15+
- Replaced Minute with Hour as normal interval since history is limited to 7 days from Emporia on minute data
16+
- argparse libary was added, must run pip install -r requirements again in the src directory (or pip3 based on install)
17+
18+
## New features
19+
- Hour / Day data pulled. Allows for history of 2 years to be pulled. Assists in clean numbers/graphs to see daily monthly usage to compare against utilities reports.
20+
- Hour data runs with the get details time, default is 1 hour (3600 seconds). Based on when the program is started,
21+
you may be almost 2 hours behind for get hour.
22+
- Changed several one time parameters from the json config file to command line entries (History load days, reset database).
23+
<b> Example Command Line usage
24+
usage: vuegraf.py [-h] [--version] [-v] [-q] [--historydays HISTORYDAYS] [--resetdatabase] configFilename
25+
26+
positional arguments:
27+
configFilename json config file
28+
29+
options:
30+
-h, --help show this help message and exit
31+
--version display version number
32+
-v, --verbose verbose output - summaries
33+
-q, --quiet do not print anything but errors
34+
--historydays HISTORYDAYS
35+
Starts executin by pulling history of Hours and Day data for specified number of days.
36+
example: --load-history-day 60
37+
--resetdatabase Drop database and create a new one
38+
39+
## Other changes
40+
- Started Changelog for this and future releases
41+
- Added project metadata to main program - vuegraf.py, values can be updated through github automations
42+
- Added command line paring with help syntaxt for all values - arge parse lib.
43+
- Updated requirements.txt and setup.py with argparse>= 1.4.0
44+
- Updated vuegraf.json.sample as history and reset database was moved to command line
45+
- Updated Readme.md with above changes
46+
- ran pylint and fixed
47+
Quote delimiter consitency to all '
48+
Whitespaces
49+
Extra lines
50+
51+
52+
53+
# 1.5.0

README.md

+289-23
Large diffs are not rendered by default.

setup.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
install_requires=[
2424
'influxdb>=5.3.1',
2525
'influxdb_client>=1.33.0',
26-
'pyemvue>=0.16.0'
26+
'pyemvue>=0.16.0',
27+
'argparse>= 1.4.0'
2728
]
2829
)

src/requirements.txt

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
influxdb >= 5.3.1
22
influxdb_client >= 1.33.0
33
pyemvue == 0.16.0
4+
argparse >= 1.4.0

src/vuegraf/.gitignore

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
vuegraf.json
2+
int
3+
docker-compose.yaml
4+
dist/
5+
vuegraf.egg-info/
6+
vugraftobe.py

src/vuegraf/getdate.py

-135
This file was deleted.

0 commit comments

Comments
 (0)