Skip to content

Commit 758dbc0

Browse files
authored
Merge pull request #14 from makermelissa/main
Fix language setting in docs
2 parents 3c02311 + 11c3f2c commit 758dbc0

File tree

4 files changed

+8
-17
lines changed

4 files changed

+8
-17
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ jobs:
2222
awk -F '\/' '{ print tolower($2) }' |
2323
tr '_' '-'
2424
)
25-
- name: Set up Python 3.6
25+
- name: Set up Python 3.7
2626
uses: actions/setup-python@v1
2727
with:
28-
python-version: 3.6
28+
python-version: 3.7
2929
- name: Versions
3030
run: |
3131
python3 --version

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
repos:
66
- repo: https://github.com/python/black
7-
rev: 21.6b0
7+
rev: 22.3.0
88
hooks:
99
- id: black
1010
- repo: https://github.com/fsfe/reuse-tool

adafruit_shell.py

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ def bail(self, message=None):
125125
if message is None:
126126
self.error("Exiting due to error")
127127
else:
128-
self.error("Exiting due to error: {}".format(message))
128+
self.error(f"Exiting due to error: {message}")
129129
sys.exit(1)
130130

131131
def error(self, message):
@@ -257,9 +257,7 @@ def grep(self, search_term, location):
257257
Run the grep command and return the result
258258
"""
259259
location = self.path(location)
260-
return self.run_command(
261-
"grep {} {}".format(search_term, location), suppress_message=True
262-
)
260+
return self.run_command(f"grep {search_term} {location}", suppress_message=True)
263261

264262
@staticmethod
265263
def date():
@@ -385,7 +383,7 @@ def require_root(self):
385383
"""
386384
if not self.is_root():
387385
print("Installer must be run as root.")
388-
print("Try 'sudo python3 {}'".format(self.script()))
386+
print(f"Try 'sudo python3 {self.script()}'")
389387
sys.exit(1)
390388

391389
def write_text_file(self, path, content, append=True):
@@ -516,7 +514,7 @@ def prompt_reboot(self):
516514

517515
def check_kernel_update_reboot_required(self):
518516
"""Checks if the pi needs to be rebooted since the last kernel update"""
519-
if not self.exists("/lib/modules/{}".format(self.release())):
517+
if not self.exists(f"/lib/modules/{self.release()}"):
520518
self.error(
521519
"OS has not been rebooted since last kernel update. "
522520
"Please reboot and re-run the script."

docs/conf.py

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,6 @@
2121
"sphinx.ext.todo",
2222
]
2323

24-
# TODO: Please Read!
25-
# Uncomment the below if you use native CircuitPython modules such as
26-
# digitalio, micropython and busio. List the modules you use. Without it, the
27-
# autodoc module docs will fail to generate with a warning.
28-
# autodoc_mock_imports = ["digitalio", "busio"]
29-
30-
3124
intersphinx_mapping = {
3225
"python": ("https://docs.python.org/3.4", None),
3326
"CircuitPython": ("https://circuitpython.readthedocs.io/en/latest/", None),
@@ -60,7 +53,7 @@
6053
#
6154
# This is also used if you do content translation via gettext catalogs.
6255
# Usually you set "language" from the command line for these cases.
63-
language = None
56+
language = "en"
6457

6558
# List of patterns, relative to source directory, that match files and
6659
# directories to ignore when looking for source files.

0 commit comments

Comments
 (0)