Skip to content

Commit 42b9355

Browse files
authored
Merge branch 'master' into pylint-update
2 parents 80911e6 + 1fd92e9 commit 42b9355

6 files changed

+5
-11
lines changed

.github/workflows/build.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@ jobs:
4343
pip install --force-reinstall pylint black==19.10b0 Sphinx sphinx-rtd-theme
4444
- name: Library version
4545
run: git describe --dirty --always --tags
46+
- name: Check formatting
47+
run: |
48+
black --check --target-version=py35 .
4649
- name: PyLint
4750
run: |
4851
pylint $( find . -path './adafruit*.py' )

adafruit_lsm6ds.py

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,6 @@ def is_valid(cls, value):
121121
class AccelRange(CV):
122122
"""Options for ``accelerometer_range``"""
123123

124-
pass # pylint: disable=unnecessary-pass
125-
126124

127125
AccelRange.add_values(
128126
(
@@ -137,9 +135,6 @@ class AccelRange(CV):
137135
class GyroRange(CV):
138136
"""Options for ``gyro_data_range``"""
139137

140-
pass # pylint: disable=unnecessary-pass
141-
142-
143138
GyroRange.add_values(
144139
(
145140
("RANGE_125_DPS", 125, 125, 4.375),
@@ -155,8 +150,6 @@ class GyroRange(CV):
155150
class Rate(CV):
156151
"""Options for ``accelerometer_data_rate`` and ``gyro_data_rate``"""
157152

158-
pass # pylint: disable=unnecessary-pass
159-
160153

161154
Rate.add_values(
162155
(
@@ -179,8 +172,6 @@ class Rate(CV):
179172
class AccelHPF(CV):
180173
"""Options for the accelerometer high pass filter"""
181174

182-
pass # pylint: disable=unnecessary-pass
183-
184175

185176
AccelHPF.add_values(
186177
(

docs/examples.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ Simple test
33

44
Ensure your device works with this simple test.
55

6-
.. literalinclude:: ../examples/lsm6dsox_simpletest.py
7-
:caption: examples/lsm6dsox_simpletest.py
6+
.. literalinclude:: ../examples/lsm6ds_lsm6dsox_simpletest.py
7+
:caption: examples/lsm6ds_lsm6dsox_simpletest.py
88
:linenos:

0 commit comments

Comments
 (0)