Skip to content

Commit

Permalink
Merge pull request fabianonline#361 from FranciscodeMaussion/master
Browse files Browse the repository at this point in the history
Adds pre-commit-hooks
  • Loading branch information
giloser authored Jun 7, 2021
2 parents dddb992 + df8194e commit 7d4cbc8
Show file tree
Hide file tree
Showing 17 changed files with 12,172 additions and 8,599 deletions.
26 changes: 26 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
exclude: "translations|templates|static|.txt|.md|.github"
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v3.4.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
- id: check-yaml
- id: check-merge-conflict

- repo: https://github.com/pycqa/isort
rev: 5.7.0
hooks:
- id: isort
args: ["--profile", "black"]

- repo: https://github.com/psf/black
rev: 20.8b1
hooks:
- id: black

- repo: https://gitlab.com/pycqa/flake8
rev: 3.8.4
hooks:
- id: flake8
args: [--max-line-length=120]
Original file line number Diff line number Diff line change
@@ -1,42 +1,26 @@
(
'Operational',
'VIRTUAL',
0,
{
'name': 'FlowPrintr',
'color': 'black',
'axes': {
'y': {
'speed': 9000,
'inverted': False
},
'x': {
'speed': 9000,
'inverted': False
},
'z': {
'speed': 200,
'inverted': False
},
'e': {
'speed': 300,
'inverted': False
}
},
'heatedBed': True,
'volume': {
'origin': 'lowerleft',
'formFactor': 'rectangular',
'depth': 280.0,
'width': 280.0,
'height': 280.0
},
'model': 'Generic RepRap Printer',
'id': '_default',
'extruder': {
'count': 1,
'nozzleDiameter': 0.4,
'offsets': [(0.0, 0.0)]
}
}
)
"Operational",
"VIRTUAL",
0,
{
"name": "FlowPrintr",
"color": "black",
"axes": {
"y": {"speed": 9000, "inverted": False},
"x": {"speed": 9000, "inverted": False},
"z": {"speed": 200, "inverted": False},
"e": {"speed": 300, "inverted": False},
},
"heatedBed": True,
"volume": {
"origin": "lowerleft",
"formFactor": "rectangular",
"depth": 280.0,
"width": 280.0,
"height": 280.0,
},
"model": "Generic RepRap Printer",
"id": "_default",
"extruder": {"count": 1, "nozzleDiameter": 0.4, "offsets": [(0.0, 0.0)]},
},
)
Original file line number Diff line number Diff line change
@@ -1,12 +1,4 @@
{
'bed': {
'actual': 1.0,
'target': 1.0,
'offset': 0
},
'tool0': {
'actual': 0.0,
'target': 0.0,
'offset': 0
}
"bed": {"actual": 1.0, "target": 1.0, "offset": 0},
"tool0": {"actual": 0.0, "target": 0.0, "offset": 0},
}
128 changes: 108 additions & 20 deletions dev_utils/datastructures/octoprint/list_rendered_timelapses.py
Original file line number Diff line number Diff line change
@@ -1,22 +1,110 @@
[
{'date': '2016-06-01 11:11', 'bytes': 9920512L, 'name': 'sat_tranciver_20160531233649.mpg', 'size': '9.5MB'},
{'date': '2016-05-30 11:11', 'bytes': 17324032L, 'name': 'CloudFactory_cloud_20160530172641.mpg', 'size': '16.5MB'},
{'date': '2016-06-01 11:11', 'bytes': 729088L, 'name': 'sat_spec_20160601124054.mpg', 'size': '712.0KB'},
{'date': '2016-05-31 11:11', 'bytes': 10340352L, 'name': 'sat_payload_20160531102339.mpg', 'size': '9.9MB'},
{'date': '2016-05-31 11:11', 'bytes': 1896448L, 'name': 'sat_frame_1_20160530233044.mpg', 'size': '1.8MB'},
{'date': '2016-05-31 11:11', 'bytes': 9078784L, 'name': 'sat_solar_x2_20160531033216.mpg', 'size': '8.7MB'},
{'date': '2016-05-31 11:11', 'bytes': 1001472L, 'name': 'sd_tray_20160531023604.mpg', 'size': '978.0KB'},
{'date': '2016-05-31 11:11', 'bytes': 2009088L, 'name': 'sat_frame_2_20160531001751.mpg', 'size': '1.9MB'},
{'date': '2016-05-31 11:11', 'bytes': 1900544L, 'name': 'sat_frame_side_x2_20160531014148.mpg', 'size': '1.8MB'},
{'date': '2016-05-31 11:11', 'bytes': 10479616L, 'name': 'sat_power_20160531194916.mpg', 'size': '10.0MB'},
{'date': '2016-06-01 11:11', 'bytes': 10078208L, 'name': 'sat_flightC_20160601065128.mpg', 'size': '9.6MB'},
{'date': '2016-05-31 11:11', 'bytes': 1726464L, 'name': 'sat_rod_x4_20160531024145.mpg', 'size': '1.6MB'},
{'date': '2016-05-31 11:11', 'bytes': 1681408L, 'name': 'sat_rod_20160531021525.mpg', 'size': '1.6MB'},
{'date': '2016-05-31 11:11', 'bytes': 1898496L, 'name': 'sat_frame_side_x2_20160531010248.mpg', 'size': '1.8MB'},
{'date': '2016-05-30 11:11', 'bytes': 17170432L, 'name': 'CloudFactory_cloud_20160530092901.mpg', 'size': '16.4MB'},
{'date': '2016-05-30 11:11', 'bytes': 5382144L, 'name': 'CloudFactory_20160530013429.mpg', 'size': '5.1MB'},
{'date': '2016-06-01 11:11', 'bytes': 10106880L, 'name': 'sat_spec_20160601124228.mpg', 'size': '9.6MB'},
{'date': '2016-05-30 11:11', 'bytes': 13434880L, 'name': 'CloudFactory_base_20160529205430.mpg', 'size': '12.8MB'}
{
"date": "2016-06-01 11:11",
"bytes": 9920512L,
"name": "sat_tranciver_20160531233649.mpg",
"size": "9.5MB",
},
{
"date": "2016-05-30 11:11",
"bytes": 17324032L,
"name": "CloudFactory_cloud_20160530172641.mpg",
"size": "16.5MB",
},
{
"date": "2016-06-01 11:11",
"bytes": 729088L,
"name": "sat_spec_20160601124054.mpg",
"size": "712.0KB",
},
{
"date": "2016-05-31 11:11",
"bytes": 10340352L,
"name": "sat_payload_20160531102339.mpg",
"size": "9.9MB",
},
{
"date": "2016-05-31 11:11",
"bytes": 1896448L,
"name": "sat_frame_1_20160530233044.mpg",
"size": "1.8MB",
},
{
"date": "2016-05-31 11:11",
"bytes": 9078784L,
"name": "sat_solar_x2_20160531033216.mpg",
"size": "8.7MB",
},
{
"date": "2016-05-31 11:11",
"bytes": 1001472L,
"name": "sd_tray_20160531023604.mpg",
"size": "978.0KB",
},
{
"date": "2016-05-31 11:11",
"bytes": 2009088L,
"name": "sat_frame_2_20160531001751.mpg",
"size": "1.9MB",
},
{
"date": "2016-05-31 11:11",
"bytes": 1900544L,
"name": "sat_frame_side_x2_20160531014148.mpg",
"size": "1.8MB",
},
{
"date": "2016-05-31 11:11",
"bytes": 10479616L,
"name": "sat_power_20160531194916.mpg",
"size": "10.0MB",
},
{
"date": "2016-06-01 11:11",
"bytes": 10078208L,
"name": "sat_flightC_20160601065128.mpg",
"size": "9.6MB",
},
{
"date": "2016-05-31 11:11",
"bytes": 1726464L,
"name": "sat_rod_x4_20160531024145.mpg",
"size": "1.6MB",
},
{
"date": "2016-05-31 11:11",
"bytes": 1681408L,
"name": "sat_rod_20160531021525.mpg",
"size": "1.6MB",
},
{
"date": "2016-05-31 11:11",
"bytes": 1898496L,
"name": "sat_frame_side_x2_20160531010248.mpg",
"size": "1.8MB",
},
{
"date": "2016-05-30 11:11",
"bytes": 17170432L,
"name": "CloudFactory_cloud_20160530092901.mpg",
"size": "16.4MB",
},
{
"date": "2016-05-30 11:11",
"bytes": 5382144L,
"name": "CloudFactory_20160530013429.mpg",
"size": "5.1MB",
},
{
"date": "2016-06-01 11:11",
"bytes": 10106880L,
"name": "sat_spec_20160601124228.mpg",
"size": "9.6MB",
},
{
"date": "2016-05-30 11:11",
"bytes": 13434880L,
"name": "CloudFactory_base_20160529205430.mpg",
"size": "12.8MB",
},
]


Loading

0 comments on commit 7d4cbc8

Please sign in to comment.