Skip to content
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

Try out Pipenv #327

Closed
wants to merge 5 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 5 additions & 7 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,11 @@ jobs:
with:
node-version: "lts/*"

- name: Install Lektor
run: |
python -m pip install --upgrade pip setuptools
python -m pip install lektor
- run: pip install pipenv
- run: pipenv sync

- name: Build lektor website
run: lektor build -f webpack -O '${{ env.OUTPUT }}'
run: pipenv run lektor build -f webpack -O '${{ env.OUTPUT }}'

- name: Check for broken internal links
uses: wjdp/htmltest-action@master
Expand All @@ -50,9 +48,9 @@ jobs:
skip_external: true
log_level: 1

- name: Deploy lektor website
- name: Build site and deploy
if: env.DEPLOY == 'true'
run: lektor deploy -O '${{ env.OUTPUT }}' ghpages-https
run: pipenv run lektor deploy -O '${{ env.OUTPUT }}' ghpages-https
env:
LEKTOR_DEPLOY_USERNAME: lektor
LEKTOR_DEPLOY_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ assets/static/*
!assets/static/favicon.png
packages/*/build
packages/*/dist
plugins/*/build
plugins/*/dist
webpack/node_modules
*~
*#
23 changes: 23 additions & 0 deletions Pipfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
[[source]]
url = "https://pypi.org/simple"
verify_ssl = true
name = "pypi"

[packages]
lektor = "*"
lektor-atom = "*"
lektor-tags = "*"
lektor-slugify = "*"
lektor-webpack-support = "*"
lektor-disqus-comments = "*"
lektor-markdown-header-anchors = "*"
lektor-markdown-highlighter = "*"
lektor-markdown-admonition = "*"
lektor-project-data = {editable = true, path = "./plugins/project-data"}
lektor-markdown-link-classes = {editable = true, path = "./plugins/markdown-link-classes"}
lektor-blog-archive = {editable = true, path = "./plugins/blog-archive"}

[dev-packages]

[requires]
python_version = "3.10"
626 changes: 626 additions & 0 deletions Pipfile.lock

Large diffs are not rendered by default.

20 changes: 10 additions & 10 deletions Website.lektorproject
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ name = Github pages on repo
target = ghpages+https://lektor/lektor-website?cname=www.getlektor.com
default = not


[packages]
lektor-webpack-support = 0.3
lektor-disqus-comments = 0.1
lektor-markdown-header-anchors = 0.1
lektor-markdown-highlighter = 0.3.2
lektor-markdown-admonition = 0.1
lektor-atom = 0.4.0
lektor-tags = 0.3
lektor-slugify = 0.4
# These are managed with pipenv (see Pipfile)
# [packages]
# lektor-webpack-support = 0.3
# lektor-disqus-comments = 0.1
# lektor-markdown-header-anchors = 0.1
# lektor-markdown-highlighter = 0.3.2
# lektor-markdown-admonition = 0.1
# lektor-atom = 0.4.0
# lektor-tags = 0.3
# lektor-slugify = 0.4
File renamed without changes.
3 changes: 3 additions & 0 deletions plugins/blog-archive/pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[build-system]
requires = ["setuptools", "wheel"]
build-backend = "setuptools.build_meta:__legacy__"
File renamed without changes.
3 changes: 3 additions & 0 deletions plugins/markdown-link-classes/pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[build-system]
requires = ["setuptools", "wheel"]
build-backend = "setuptools.build_meta:__legacy__"
File renamed without changes.
3 changes: 3 additions & 0 deletions plugins/project-data/pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[build-system]
requires = ["setuptools", "wheel"]
build-backend = "setuptools.build_meta:__legacy__"
File renamed without changes.
3 changes: 2 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,15 @@ skipsdist = true

[testenv]
deps =
lektor
pipenv
setenv =
# Keep Lektor's private package cache in tox env rather than ~/.cache
XDG_CACHE_HOME = {envdir}/cache
LOCALAPPDATA = {envdir}/cache

[testenv:build]
commands =
pipenv sync
lektor build -f webpack -O {envdir}/output

[testenv:htmltest]
Expand Down