Skip to content

Bring over all the Trainings configuration and tools #1141

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.

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
merged 54 commits into from
Jan 22, 2022

Conversation

stevepiercy
Copy link
Contributor

@stevepiercy stevepiercy commented Jan 16, 2022

  • Begin replacing "Trainings" with "Documentation"

See checklist in #1134

- Begin replacing "Trainings" with "Documentation"
@netlify
Copy link

netlify bot commented Jan 16, 2022

✔️ Deploy Preview for 6-dev-docs-plone-org ready!

🔨 Explore the source changes: c322350

🔍 Inspect the deploy log: https://app.netlify.com/sites/6-dev-docs-plone-org/deploys/61ebd2d7f28d4f00083f700f

😎 Browse the preview: https://deploy-preview-1141--6-dev-docs-plone-org.netlify.app

@stevepiercy stevepiercy marked this pull request as draft January 16, 2022 11:05
@stevepiercy
Copy link
Contributor Author

This is a WIP. I still have a bit more work to do before it is ready for others to start using.

But if you just can't wait, check out this branch and read docs/contributing/setup-build.md for a quick start.

@stevepiercy stevepiercy marked this pull request as ready for review January 19, 2022 12:38
@stevepiercy stevepiercy requested a review from polyester January 19, 2022 12:52
@ksuess
Copy link
Member

ksuess commented Jan 20, 2022

make build works quite fine now. It's not even necessary to activate the venv. There's some magic that sphinx-build is found. Try
$ sphinx-build
and
$ which sphinx-build

So you can skip the line
source bin/activate
in setup-build.md

@ksuess
Copy link
Member

ksuess commented Jan 20, 2022

make build works quite fine now. It's not even necessary to activate the venv. There's some magic that sphinx-build is found. Try $ sphinx-build and $ which sphinx-build

So you can skip the line source bin/activate in setup-build.md

It's wrong what I wrote, I did a test from scratch. But I think it's fine now. We can come back to it later.

@stevepiercy
Copy link
Contributor Author

@ksuess, I added one more commit for you to test out. You'll need to run pip install -r requirements then make livehtml.

If it is OK to merge this PR as is, please let me know. I am eager to get something deployed for people to start playing with.

@ksuess
Copy link
Member

ksuess commented Jan 20, 2022

This can be deleted:

.PHONY: test
testlight: clean spellcheck ## Run spellcheck

Move `all` target to the end
@stevepiercy
Copy link
Contributor Author

This can be deleted:

.PHONY: test testlight: clean spellcheck ## Run spellcheck

Good catch! Fixed in 6941292.

@ksuess
Copy link
Member

ksuess commented Jan 20, 2022

make livehtml 😻

@ksuess
Copy link
Member

ksuess commented Jan 20, 2022

Maybe just add a text hint with @echo:

.PHONY: build
build: ## Set up training: Install requirements
python3 -m venv . || virtualenv --clear --python=python3 .
bin/python -m pip install --upgrade pip
bin/pip install -r requirements.txt
@echo
@echo "Please activate your Python virtual environment with"
@echo "source bin/activate"

@ksuess
Copy link
Member

ksuess commented Jan 20, 2022

Let's see what other reviewers find. From me a GO!

@ksuess
Copy link
Member

ksuess commented Jan 20, 2022

make livehtml 😻

I you add

.PHONY: livehtml
livehtml: ## Run live updating build

then make livehtml is shown in the output of make

Add description comment for livehtml when calling `make`
@stevepiercy
Copy link
Contributor Author

I added updates per your comments, but grabbed the description from https://pypi.org/project/sphinx-autobuild/ for make. See 4d035ad

@ksuess
Copy link
Member

ksuess commented Jan 20, 2022

As long as this PR is open: here another little one:
_source folder with txt files could be excluded via robots.txt. Maybe more than this folder…
image
For example https://61e8de5e50d8f50008c486f8--6-dev-docs-plone-org.netlify.app/_sources/glossary.md.txt

@stevepiercy
Copy link
Contributor Author

I updated the robots.txt, based on what shows up in _build/html/.

@stevepiercy
Copy link
Contributor Author

I'm going to merge this branch after Europeans have had one more day to review it.

I want to announce that 6-dev is ready for everyone to work on before the weekend.

# id: deploy
# uses: Pendect/action-rsyncer@v1.1.0
# env:
# DEPLOY_KEY: ${{secrets.DEPLOY_KEY_TRAINING}}
Copy link
Member

Choose a reason for hiding this comment

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

This probably needs a new key

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yup, that's why I commented it out. Who can provide one?

Copy link
Member

Choose a reason for hiding this comment

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

@ericof should be able to do so.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Let's continue the conversion in #1146

# options: ''
# ssh_options: '-p ${{secrets.DEPLOY_PORT}}'
# src: '_build/html/'
# dest: '${{secrets.DEPLOY_USER_TRAINING}}@${{secrets.DEPLOY_SERVER_TRAINING}}:${{secrets.DEPLOY_PATH_TRAINING}}/5'
Copy link
Member

Choose a reason for hiding this comment

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

here also

@stevepiercy stevepiercy merged commit 127b6ce into plone:6-dev Jan 22, 2022
@stevepiercy stevepiercy deleted the port-training-config branch January 22, 2022 10:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

3 participants