Skip to content

Fix: mypy errors. #515

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
oscarlevin merged 2 commits into from
Aug 5, 2023
Merged

Fix: mypy errors. #515

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
01a5a7c
Fix: mypy errors.
bjones1 Aug 1, 2023
d768a32
Merge branch 'refactor2' into mypy-fixes
oscarlevin Aug 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions pretext/cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
VERSION,
CORE_COMMIT,
)
from .project import Project
from .project import Project, Format

log = logging.getLogger("ptxlogger")
click_log.basic_config(log)
Expand Down Expand Up @@ -403,7 +403,6 @@ def build(
target.generate_assets(only_changed=False)
except Exception as e:
log.debug(f"Failed to generate assets: {e}", exc_info=True)
pass
# Call build
try:
target.build(clean=clean, no_generate=no_generate)
Expand Down Expand Up @@ -488,15 +487,16 @@ def generate(
messages = project.apply_overlay(overlay)
for message in messages:
log.info("project.ptx overlay " + message)

# Now create the target if the target_name is not missing.
try:
target = project.get_target(name=target_name)
except AssertionError as e:

utils.show_target_hints(target_name, project, task="generating assets for")
log.critical("Exiting without completing build.")
log.debug(e, exc_info=True)
return

try:
f'Generating assets in for the target "{target.name}".'
target.generate_assets(
Expand Down Expand Up @@ -617,15 +617,15 @@ def view(
if utils.no_project(task="view the output for"):
return
project = Project.parse()
target = project.target(name=target_name)
target = project.get_target(name=target_name)
if target is None:
utils.show_target_hints(target_name, project, task="view")
log.critical("Exiting.")
return
# Easter egg to spin up a local server at a specified directory:
if utils.cocalc_project_id() is not None:
try:
subdir = target.output_dir().relative_to(Path.home())
subdir = target.output_dir_abspath().relative_to(Path.home())
except ValueError:
subdir = Path()
log.info("Built project can be previewed at the following link at any time:")
Expand Down Expand Up @@ -669,8 +669,8 @@ def deploy(target_name: str, site: str, update_source: bool) -> None:
if utils.no_project(task="deploy"):
return
project = Project.parse()
target = project.target(name=target_name)
if target is None or target.format() != "html":
target = project.get_target(name=target_name)
if target.format != Format.HTML:
log.critical("Target could not be found in project.ptx manifest.")
# only list targets with html format.
log.critical(
Expand Down
2 changes: 1 addition & 1 deletion pretext/project/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,7 +481,7 @@ def build(
)
elif self.format == Format.CUSTOM:
# Need to add the publication file to string params since xsltproc function doesn't include pubfile.
self.stringparams["publisher"] = self.publication_abspath.as_posix()
self.stringparams["publisher"] = self.publication_abspath().as_posix()
core.xsltproc(
xsl=custom_xsl,
xml=self.source_abspath(),
Expand Down