Skip to content

Project server - #511

Merged
oscarlevin merged 1 commit into
PreTeXtBook:refactor2from
bjones1:project-server
Aug 1, 2023
Merged

oscarlevin merged 1 commit into
PreTeXtBook:refactor2from
bjones1:project-server

Conversation

@bjones1

@bjones1 bjones1 commented Aug 1, 2023

Copy link
Copy Markdown
Collaborator

Add: Support for server URLs.
Fix: Correct output-dir/output-filename tests, add more.

Fix: Correct output-dir/output-filename tests, add more.
@bjones1
bjones1 changed the base branch from main to refactor2 August 1, 2023 03:21
@bjones1
bjones1 marked this pull request as ready for review August 1, 2023 03:30
@bjones1

bjones1 commented Aug 1, 2023

Copy link
Copy Markdown
Collaborator Author

Note that tests aren't enabled yet, since we haven't merged those fixes from the main branch in yet (see #512). When that's done, we'll still see test failures from several points in the codebase; we need to fix these, but I suggest doing so after merging all the current PRs.

@oscarlevin oscarlevin left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great. Thanks.

Comment thread pretext/project/xml.py
pdfsvg: str = pxml.attr(default="pdf2svg")
asy: str = pxml.attr(default="asy")
sage: str = pxml.attr(default="sage")
# If not specified, use a local executable if it exists; if it doesn't exist, choose `None`, which allows the generation logic to use the server instead.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is good. It makes me wonder if we should really be doing checks ourselves for all executables rather than letting core handle that functionality.

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point. That's easy to add if we want it.

@oscarlevin
oscarlevin merged commit 9fcb97b into PreTeXtBook:refactor2 Aug 1, 2023
@bjones1
bjones1 deleted the project-server branch August 1, 2023 16:02
oscarlevin added a commit that referenced this pull request Aug 12, 2023
* start converting to refactored project; fix logging

* finish fixing logging

* make ptx_version optional, use legacy if not 2

* reimplement pretext support

* Fix: Make project.py the new __init__.py. (#500)

Add in new output_dir/output_file structure.

* Clean: Rename output_file to output_filename.

* Fix: Basic renames for new project class.

* Fix: More renames for new project class.

* get  working

* build working in default case

* integrate webwork-reps and output-dir checking

* Add: Support for server URLs. (#511)

Fix: Correct output-dir/output-filename tests, add more.

* Main merge (#512)

* fix zip_templates so it doesn't recreated duplicate devcont (#497)

* Fix: Run tests only on a PR; do this on any branch. (#495)

* Fix: Run tests only on a PR; do this on any branch.

* Fix: Per discussion, also run testing on any pushes to the main branch.

* Fix: Update major versions of older packages. (#499)

* Fix: Update major versions of older packages.

See #496.

* Update: poetry.lock based on project file changes.

* Fix: Make mapping file platform-independent. (#504)

* bubble up warning if a user isn't compatible with upcoming v2 (#505)

* bubble up warning if a user isn't compatible with upcoming v2

* add success messages, error report to support

---------

Co-authored-by: Oscar Levin <oscar.levin@unco.edu>

* bump version to next patch level for nightly releases

* revert to previous pdfCropMargins version (#509)

* revert to previous pdfCropMargins version

* update action to trigger docker

* bump version to next patch level for nightly releases

* Update deploy-stable.yml

Quick fix to get docker to update

---------

Co-authored-by: Oscar Levin <oscar.levin@unco.edu>
Co-authored-by: Steven Clontz <steven.clontz@gmail.com>
Co-authored-by: GitHub Actions Bot <>

* clean up pretext build (#506)

* clean up pretext build

* reenable codechat

* add zip option to html build

* incorporate suggestions

* add remaining build targets, except custom

* add custom build format

* fix ensure_webwork_reps

* remove pre-2.0 warning message (#514)

* Set up generate for refactor (#508)

* get generate working

* a few minor improvements

* Complete merge

* remove old build code

* add check for finding assets to be built

* refactor asset hash function

* generate almost working

* complete refactor of generate

* fix interactive/preview dir bug

* fix flake error

* Fix: mypy errors. (#515)

Co-authored-by: Oscar Levin <oscar.levin@unco.edu>
Just removed some conflicting changes that were no longer needed after generate refactor.

* Add: The Runestone target. (#516)

* Add: The Runestone target.

* Fix: The WeBWorK target also supports compression.

* Merge latest changes from main (#519)

* fix zip_templates so it doesn't recreated duplicate devcont (#497)

* Fix: Run tests only on a PR; do this on any branch. (#495)

* Fix: Run tests only on a PR; do this on any branch.

* Fix: Per discussion, also run testing on any pushes to the main branch.

* Fix: Update major versions of older packages. (#499)

* Fix: Update major versions of older packages.

See #496.

* Update: poetry.lock based on project file changes.

* Fix: Make mapping file platform-independent. (#504)

* bubble up warning if a user isn't compatible with upcoming v2 (#505)

* bubble up warning if a user isn't compatible with upcoming v2

* add success messages, error report to support

---------

Co-authored-by: Oscar Levin <oscar.levin@unco.edu>

* bump version to next patch level for nightly releases

* revert to previous pdfCropMargins version (#509)

* revert to previous pdfCropMargins version

* update action to trigger docker

* bump version to next patch level for nightly releases

* Update deploy-stable.yml

Quick fix to get docker to update

* reconfigure playwright install process (#518)

* bump version to next patch level for nightly releases

---------

Co-authored-by: Bryan A. Jones <bjones@ece.msstate.edu>
Co-authored-by: Steven Clontz <steven.clontz@gmail.com>
Co-authored-by: GitHub Actions Bot <>

* Refactor `view` command (#520)

* update view commands before actual view call

* port oldinit's view command

* fix typos

* start adding persistent server logic

* implement reusable server

* fix flake errors

* remove unneded module

* improve keyboard interrupt

* improve checking for running server; reporting of url

* Refactor deploy (#522)

* wire up deploy with refactor

* clean up

* Change: Instead of a Runestone format, provide a platform="runestone" attribute. (#527)

* Update: Template project files to v2 format. (#528)

* update default to server for asymptote

* Fix errors with view

* Improvements to view server checking (#529)

* Improvements to view server checking

* remove obsolete view functions

* Gen (#530)

* remove project overlay

* clean up generate code

* Fix issue with xmlid persisting through generate

* Docs for a Runestone target (#526)

* Add: Runestone elements for the demo template.

* Add: Runestone elements for the article template.

* Remove: Runestone elements from the article template.

See #526 (comment).

* Add: Runestone elements for the book template.

* Fix: Update language based on Rob's feedback.

* Fix: Update demo template as well.

* Fix: Correct indent, avoid hyphens.

* Misc fixes (#533)

* Fix: Black/Flake8/mypy errors (except for oldinit.py).

* Fix: Delete, following fac5e44.

* Fix: Move default values from Target.server to Project.server; fix syntax.

* Fix: Ignore project/oldinit.py in mypy.

* Fix: Update to newer mypy.

* Fix: Avoid syntax that requires Python 3.9.

* fix bug with non-existant assets being saved in hash

* fix qrcode typo

* remove debugging hack

* Add: Missing target from default template. (#535)

* Add: Missing target from default template.

* Fix: Correct tests for subset.

* Get test_view working (#537)

* clean up old code

* update dependencies

* clean up old code

* update dependencies

* remove depricated  test

* fix custom_webwork_server test

* Get serve test working (#538)

* Fix: Correct handling of output-filename to prepend the output-dir. (#540)

* Fix: Correct handling of output-filename to prepend the output-dir.

* Fix: Flake8.

* update core commit and version

* fix elaborate build test (#541)

* fix elaborate build test

* add playwright install for previews

* Fix view tests with connection errors

* flake8

* Add asymptote method (#542)

* add executables to gitignore

* remove bad merge

---------

Co-authored-by: Bryan A. Jones <bjones@ece.msstate.edu>
Co-authored-by: Steven Clontz <steven.clontz@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants