Skip to content

Commit

Permalink
Replace os with pathlib where paths are used (#1984)
Browse files Browse the repository at this point in the history
  • Loading branch information
mathbunnyru committed Aug 26, 2023
1 parent 6aded4b commit 0d8b4e4
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 15 deletions.
18 changes: 9 additions & 9 deletions images/base-notebook/jupyter_server_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import os
import stat
import subprocess
from pathlib import Path

from jupyter_core.paths import jupyter_data_dir

Expand All @@ -24,15 +25,14 @@
[req_distinguished_name]
"""
if "GEN_CERT" in os.environ:
dir_name = jupyter_data_dir()
pem_file = os.path.join(dir_name, "notebook.pem")
os.makedirs(dir_name, exist_ok=True)
dir_name = Path(jupyter_data_dir())
dir_name.mkdir(parents=True, exist_ok=True)
pem_file = dir_name / "notebook.pem"

# Generate an openssl.cnf file to set the distinguished name
cnf_file = os.path.join(os.getenv("CONDA_DIR", "/usr/lib"), "ssl", "openssl.cnf")
if not os.path.isfile(cnf_file):
with open(cnf_file, "w") as fh:
fh.write(OPENSSL_CONFIG)
cnf_file = Path(os.getenv("CONDA_DIR", "/usr/lib")) / "ssl/openssl.cnf"
if not cnf_file.exists():
cnf_file.write_text(OPENSSL_CONFIG)

# Generate a certificate if one doesn't exist on disk
subprocess.check_call(
Expand All @@ -50,8 +50,8 @@
]
)
# Restrict access to the file
os.chmod(pem_file, stat.S_IRUSR | stat.S_IWUSR)
c.ServerApp.certfile = pem_file
pem_file.chmod(stat.S_IRUSR | stat.S_IWUSR)
c.ServerApp.certfile = str(pem_file)

# Change default umask for all subprocesses of the Server if set in the environment
if "NB_UMASK" in os.environ:
Expand Down
5 changes: 2 additions & 3 deletions tests/scipy-notebook/data/matplotlib/matplotlib_1.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
# Matplotlib: Create a simple plot example.
# Refs: https://matplotlib.org/stable/gallery/lines_bars_and_markers/simple_plot.html

import os

# Optional test with [Matplotlib Jupyter Integration](https://github.com/matplotlib/ipympl)
# %matplotlib widget
import matplotlib.pyplot as plt
Expand All @@ -21,7 +19,8 @@
title="About as simple as it gets, folks",
)
ax.grid()

# Note that the test can be run headless by checking if an image is produced
file_path = os.path.join("/tmp", "test.png")
file_path = "/tmp/test.png"
fig.savefig(file_path)
print(f"File {file_path} saved")
4 changes: 1 addition & 3 deletions tests/scipy-notebook/data/matplotlib/matplotlib_fonts_1.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
# Matplotlib: Test tex fonts
import os

import matplotlib
import matplotlib.pyplot as plt

Expand All @@ -22,6 +20,6 @@
ax.plot(x, y, label="a label")
ax.legend(fontsize=15)

file_path = os.path.join("/tmp", "test_fonts.png")
file_path = "/tmp/test_fonts.png"
fig.savefig(file_path)
print(f"File {file_path} saved")

0 comments on commit 0d8b4e4

Please sign in to comment.