Store source code in repo #24

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

Jump to bottom

Merged

sverhoeven merged 33 commits into master from entangled-files-1

Jun 4, 2020

Member

sverhoeven commented May 22, 2020

Fixes #1

Also adds

git hook to auto generate and commit source code files
CI verifies all source code is in-sync with Markdown
Adds CONTRIBUTING and TESTING Markdown files so guide reader has less distractions.

sverhoeven added 14 commits

May 22, 2020 13:09


          Add make targets to entangle and to clean entangled files

9f21307


          Use git hook to always entangle before commit

6c228d3


          Add placeholder for .githooks dir

8c01662


          Add git hook script

6dee4f4


          Added entangle output files

d2670ed


          Added Perl as dep

1a843bd


          Only git add when files are written

9fb745b


          In GH action dont entangle but check entangle is up to date

feeef08


          Merge remote-tracking branch 'origin/master' into entangled-files-1

fbe821f


          Dont use -ti in Docker command as it is not needed

2217bb0


          Updated Makefile

527d398


          Added CONTRIBUTING.md + Move testing to TESTING.md + Moved code gener…

4a46874

…ation to CONTRIBUTING.md


          Added .zenodo.json

5c2f7b5


          Add anchor comment to new code blocks

4376eb5

sverhoeven requested review from fdiblen and jspaaks

May 22, 2020 14:36

sverhoeven added 2 commits

May 25, 2020 11:51


          Ignore compiled files


          Entangling is in CONTRIBITING.md and files are in repo

ac14ae7

fdiblen reviewed

View reviewed changes

.githooks/pre-commit Outdated Show resolved Hide resolved

fdiblen reviewed

View reviewed changes

.github/workflows/main.yml Outdated Show resolved Hide resolved

fdiblen reviewed

View reviewed changes

.github/workflows/main.yml Show resolved Hide resolved

fdiblen reviewed

View reviewed changes

.github/workflows/main.yml Outdated Show resolved Hide resolved

fdiblen reviewed

View reviewed changes

.zenodo.json Show resolved Hide resolved


          Split & comment entangle check command

a09c05a

fdiblen reviewed

View reviewed changes

INSTALL.md Show resolved Hide resolved

fdiblen reviewed

View reviewed changes

INSTALL.md Show resolved Hide resolved

sverhoeven added 2 commits

June 3, 2020 15:54


          In CI pin Python to 3.8

f6bea28


          Capture service logs and upload as artifacts

d6c760d

fdiblen reviewed

View reviewed changes

README.md Outdated Show resolved Hide resolved

fdiblen reviewed

View reviewed changes

TESTING.md Outdated Show resolved Hide resolved

fdiblen reviewed

View reviewed changes

src/cli-newtonraphson.cpp Show resolved Hide resolved

fdiblen reviewed

View reviewed changes

src/js/app.js Show resolved Hide resolved

fdiblen reviewed

View reviewed changes

src/js/example-app.html Show resolved Hide resolved

fdiblen reviewed

View reviewed changes

src/js/example-web-worker.html Show resolved Hide resolved

fdiblen reviewed

View reviewed changes

src/js/worker.js Show resolved Hide resolved

fdiblen reviewed

View reviewed changes

src/py/hello-templated.py Show resolved Hide resolved

fdiblen reviewed

View reviewed changes

src/py/tasks.py Show resolved Hide resolved

fdiblen reviewed

View reviewed changes

CONTRIBUTING.md Show resolved Hide resolved

fdiblen requested changes

View reviewed changes

Collaborator

fdiblen left a comment

I enjoyed while reviewing! 🎈

Looks like entangle has an issue with EOF.
I would remove hello examples.

See the files for my other comments and suggestions

sverhoeven and others added 4 commits

June 3, 2020 16:48


          Fix log filenames + always upload logs

9fab092


          Apply suggestions from code review

413dc21

Co-authored-by: Faruk D. <fdiblen@users.noreply.github.com>


          tee background jobs

d65244a


          Test against Python 3.6, 3.7 and 3.8

5ba4270

sverhoeven removed the request for review from jspaaks

June 3, 2020 15:55

sverhoeven and others added 10 commits

June 3, 2020 18:20


          Use f-string instead of jinja templates

0453ecc


          Describe f-string

b09b0b6


          Pin Celery to v4.4.3

05a7f70

As latest v4.4.4 Celery is broken.


          Add Entangled badge

4a2336b

Up for discussion, but I thought this is a nice touch.


          Create entangled.dhall

88e1c9f


          Make entangled aware of all Markdown files

e9659f8


          Use entangled v1 subcommand to run daemon

0033d87


          Ignore entangled db

8aab1bf


          Describe Flask request

b29546b


          Update Flask links

0fcbfed

Member Author

sverhoeven commented Jun 4, 2020

@fdiblen I resolved most conversations, could you review the Flask chapter where I removed the Hello template section?

fdiblen approved these changes

View reviewed changes

Collaborator

fdiblen commented Jun 4, 2020

If you can update the other PRs after merging this, I can also review them.

sverhoeven merged commit 94011bc into master

sverhoeven deleted the entangled-files-1 branch

June 4, 2020 07:36

Member Author

sverhoeven commented Jun 4, 2020

PR #25 and #26 have been updated and are ready for review.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet