diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 278879d..42294cf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,7 +2,6 @@ name: CI on: pull_request: - branches: [main] push: branches: [main] diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a013462..1a3c5a9 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -93,8 +93,8 @@ Values that appear on more than one page live in `[project.extra]` in `zensical. Join us at {{ discord_invite }}. ``` -Available: `discord_invite`, `eos_repo`, `site_repo`. Add more there rather than pasting a URL into -six pages. +Available: `discord_invite`, `eos_repo`, `site_repo`, `member_count`. Add more there rather than +pasting a URL into six pages. ### What not to add diff --git a/Makefile b/Makefile index 27ea20c..9c90c59 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -.PHONY: run, strict, pre-commit +.PHONY: run strict pre-commit all: run diff --git a/README.md b/README.md index 057595a..fb16a35 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# practical-python.org +# practicalpython.org The website and documentation space for the Practical Python Discord community. @@ -44,12 +44,15 @@ docs/ ├── index.md landing page ├── CNAME custom domain, copied to the site root on build ├── stylesheets/ colour, font and hero overrides +├── static/ logo and images ├── getting-started/ the entry point for new members +├── python-tutorial/ the beginner tutorial ├── rules/ server rules, code of conduct, moderation ├── resources/ learning material and setup guides -└── projects/ - ├── our-projects/ software the community maintains - └── build-something/ project challenges for members +├── projects/ +│ ├── our-projects/ software the community maintains +│ └── build-something/ project challenges for members +└── code-adventure/ landing page for the Code Adventure puzzles! scripts/ └── refresh_member_count.py updates the Discord member count before a deploy build zensical.toml all site configuration, including the nav @@ -75,11 +78,4 @@ Pull requests run `.github/workflows/ci.yml` — the same pre-commit checks you ## Dependencies -One direct dependency, `zensical`, pinned through `uv.lock`. `requirements.txt` is generated from -the lockfile for anyone who wants to read the tree without uv: - -```bash -uv export --no-dev --no-hashes --no-emit-project -o requirements.txt -``` - -CI installs from the lockfile, not from `requirements.txt`. +One direct dependency, `zensical`, pinned through `uv.lock`. diff --git a/docs/CNAME b/docs/CNAME index 45fffbc..610a669 100644 --- a/docs/CNAME +++ b/docs/CNAME @@ -1 +1 @@ -practical-python.org +practicalpython.org diff --git a/docs/code-adventure/index.md b/docs/code-adventure/index.md index 11c6b0a..f3563f1 100644 --- a/docs/code-adventure/index.md +++ b/docs/code-adventure/index.md @@ -79,7 +79,7 @@ Do you love solving puzzles and learning something new? __Join us on a Code Adve : __Corporate sponsorship opportunities are also available__. - [:simple-github:{ .lg .middle } __Github__](https://github.com/JefeThePug/Practical-Python-Code-Adventure) + [:simple-github:{ .lg .middle } __GitHub__](https://github.com/JefeThePug/Practical-Python-Code-Adventure) : Curious about how the adventure was made? __Check out the project on GitHub__. If you like what you see, feel free to give it a :material-star:{ .lg .bottom }. diff --git a/docs/rules/channels.md b/docs/rules/channels.md index 284a146..87b26a5 100644 --- a/docs/rules/channels.md +++ b/docs/rules/channels.md @@ -47,10 +47,10 @@ Commands work in most channels, but check before filling a help channel with bot /ticket ``` -!!! tip "It's a long list..." + !!! tip "It's a long list..." - The full list, with permissions and arguments, is in the - [Eos documentation](../projects/our-projects/eos.md). + The full list, with permissions and arguments, is in the + [Eos documentation](../projects/our-projects/eos.md). === "Run code in the chat!" diff --git a/docs/rules/index.md b/docs/rules/index.md index 61a37f5..73c7abf 100644 --- a/docs/rules/index.md +++ b/docs/rules/index.md @@ -30,7 +30,7 @@ Harassment, slurs and bigotry get you removed without a warning ladder. See ## 2. Stay on topic Stick to the subject of the channel you're posting in. If your question doesn't fit anywhere -obvious, ask anyway — we'd rather help you find your way then you not ask because you didn't know +obvious, ask anyway — we'd rather help you find your way than you not ask because you didn't know where to ask. [Channels](channels.md) says what goes where. diff --git a/docs/rules/moderation.md b/docs/rules/moderation.md index 8d7647d..0ca38d7 100644 --- a/docs/rules/moderation.md +++ b/docs/rules/moderation.md @@ -12,7 +12,7 @@ What happens when a rule gets broken |------|---------------------------|------------------------------------------------------------| | 1 | Informal nudge in channel | First minor slip, you'll get notified | | 2 | Formal warning, logged | Repeat of the same slip, or ignoring a moderator | -| 3 | Timeout, minutes to hours | Heated argument or overexcitment that won't cool down | +| 3 | Timeout, minutes to hours | Heated argument or overexcitement that won't cool down | | 4 | Quarantine | Spam, suspected compromised account. Step into our office. | | 5 | Kick | Pattern of warnings with no change | | 6 | Ban | Code of conduct breach, scams, ban evasion | diff --git a/scripts/refresh_member_count.py b/scripts/refresh_member_count.py index dddcfeb..89f2266 100644 --- a/scripts/refresh_member_count.py +++ b/scripts/refresh_member_count.py @@ -22,7 +22,7 @@ TIMEOUT = 10 USER_AGENT = ( - "practical-python-dot-org/1.0 (+https://practical-python.org; deploy script)" + "practical-python-dot-org/1.0 (+https://practicalpython.org; deploy script)" ) MEMBER_COUNT_LINE = re.compile(r'^(member_count\s*=\s*)"[^"]*"', re.MULTILINE) diff --git a/zensical.toml b/zensical.toml index 21a25e3..de8ac34 100644 --- a/zensical.toml +++ b/zensical.toml @@ -82,7 +82,6 @@ features = [ ] [project.theme.icon] -# TODO: replace with a real logo, since this is just a placeholder. Where did I put that...? logo = "material/language-python" repo = "fontawesome/brands/github"