Skip to content

Commit 7fbaa76

Browse files
authored
More CI Cleanup (#742)
1 parent 6c58a0e commit 7fbaa76

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+111
-91
lines changed

.github/workflows/python-linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
- name: Run the tests
5555
if: ${{ matrix.python-version != 'pypy-3.7' }}
5656
run: |
57-
pytest -vv --cov jupyter_server --cov-branch --cov-report term-missing:skip-covered || pytest -vv --cov jupyter_server --cov-branch --cov-report term-missing:skip-covered --lf
57+
pytest -vv --cov jupyter_server --cov-branch --cov-report term-missing:skip-covered --cov-fail-under 70 || pytest -vv --cov jupyter_server --cov-branch --cov-report term-missing:skip-covered --cov-fail-under 70 --lf
5858
- name: Run the tests on pypy
5959
if: ${{ matrix.python-version == 'pypy-3.7' }}
6060
run: |

.mailmap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ David Hirschfeld <[email protected]> dhirschfeld <david.hirschfeld
2626
David P. Sanders <[email protected]> David P. Sanders <[email protected]>
2727
David Warde-Farley <[email protected]> David Warde-Farley <>
2828
Doug Blank <[email protected]> Doug Blank <[email protected]>
29-
Eugene Van den Bulke <[email protected]> Eugene Van den Bulke <[email protected]>
29+
Eugene Van den Bulke <[email protected]> Eugene Van den Bulke <[email protected]>
3030
3131
3232

.pre-commit-config.yaml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,16 @@ repos:
1515
hooks:
1616
- id: prettier
1717

18-
- repo: https://gitlab.com/pycqa/flake8
18+
- repo: https://github.com/pycqa/flake8
1919
rev: 4.0.1
2020
hooks:
2121
- id: flake8
22+
additional_dependencies:
23+
[
24+
"flake8-bugbear==20.1.4",
25+
"flake8-logging-format==0.6.0",
26+
"flake8-implicit-str-concat==0.2.0",
27+
]
2228

2329
- repo: https://github.com/pre-commit/pre-commit-hooks
2430
rev: v4.1.0
@@ -33,6 +39,8 @@ repos:
3339
- id: check-yaml
3440
- id: debug-statements
3541
- id: forbid-new-submodules
42+
- id: check-builtin-literals
43+
- id: trailing-whitespace
3644

3745
- repo: https://github.com/pre-commit/mirrors-eslint
3846
rev: v8.8.0

docs/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ linkcheck:
176176
@echo
177177
@echo "Link check complete; look for any errors in the above output " \
178178
"or in $(BUILDDIR)/linkcheck/output.txt."
179-
179+
180180
spelling:
181181
$(SPHINXBUILD) -b spelling $(ALLSPHINXOPTS) $(BUILDDIR)/spelling
182182
@echo "Spell check complete; look for any errors in the above output " \

docs/autogen_config.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"""
3838
try:
3939
destination = os.path.join(os.path.dirname(__file__), "source/other/full-config.rst")
40-
except:
40+
except BaseException:
4141
destination = os.path.join(os.getcwd(), "full-config.rst")
4242

4343
with open(destination, "w") as f:

docs/source/conf.py

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -279,17 +279,6 @@
279279

280280
# -- Options for LaTeX output ---------------------------------------------
281281

282-
latex_elements = {
283-
# The paper size ('letterpaper' or 'a4paper').
284-
#'papersize': 'letterpaper',
285-
# The font size ('10pt', '11pt' or '12pt').
286-
#'pointsize': '10pt',
287-
# Additional stuff for the LaTeX preamble.
288-
#'preamble': '',
289-
# Latex figure (float) alignment
290-
#'figure_align': 'htbp',
291-
}
292-
293282
# Grouping the document tree into LaTeX files. List of tuples
294283
# (source start file, target name, title,
295284
# author, documentclass [howto, manual, or own class]).

examples/simple/jupyter_server_config.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
# ------------------------------------------------------------------------------
33
# Application(SingletonConfigurable) configuration
44
# ------------------------------------------------------------------------------
5-
## The date format used by logging formatters for %(asctime)s
5+
# The date format used by logging formatters for %(asctime)s
66
c.Application.log_datefmt = "%Y-%m-%d %H:%M:%S Simple_Extensions_Example"

examples/simple/pytest.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[pytest]
22
# Disable any upper exclusion.
3-
norecursedirs =
3+
norecursedirs =

examples/simple/simple_ext11/application.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ def simple11_dir_formatted(self):
5757

5858
def initialize_settings(self):
5959
self.log.info("hello: {}".format(self.hello))
60-
if self.hello == True:
60+
if self.hello is True:
6161
self.log.info(
6262
"Hello Simple11: You have launched with --hello flag or defined 'c.SimpleApp1.hello == True' in your config file"
6363
)

jupyter_server/auth/login.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,10 +229,10 @@ def validate_security(cls, app, ssl_options=None):
229229
if not app.ip:
230230
warning = "WARNING: The Jupyter server is listening on all IP addresses"
231231
if ssl_options is None:
232-
app.log.warning(warning + " and not using encryption. This " "is not recommended.")
232+
app.log.warning(f"{warning} and not using encryption. This is not recommended.")
233233
if not app.password and not app.token:
234234
app.log.warning(
235-
warning + " and not using authentication. "
235+
f"{warning} and not using authentication. "
236236
"This is highly insecure and not recommended."
237237
)
238238
else:

0 commit comments

Comments
 (0)