Skip to content

Commit 4640f3f

Browse files
committed
Clean up mkdocs build
Modify Makefile, Pipfile, .build.yml and mkdocs.yml to build only using pipenv. Remove unecessary files (dsfr/, pyproject.toml, package.json, MANIFEST.in) Signed-off-by: Louis Vigneras <louis.vigneras@code.gouv.fr>
1 parent 3b64217 commit 4640f3f

34 files changed

+20
-4903
lines changed

.build.yml

-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ packages:
55
- rsync
66
- python3
77
- pipx
8-
- npm
9-
- nodejs
108
- texinfo
119
- texlive-full
1210
sources:

MANIFEST.in

-4
This file was deleted.

Makefile

+3-6
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,21 @@
11
env:
22
~/.local/bin/pipenv install
3-
~/.local/bin/pipenv install --index gitlab mkdocs-dsfr
4-
npm install
53

64
pdf:
75
emacs --script scripts/export-texi.el
86
texi2pdf index.texi
97

108
md:
119
emacs --script scripts/export-md.el
12-
cp -r assets/ docs/
13-
mkdir docs/css
14-
cp assets/dsfr/css/extra.css docs/css/extra.css
10+
mkdir -p docs/assets
11+
cp -r assets docs
1512
mv index.md docs/index.md
1613
cp about.md docs/about.md
1714
touch mkdocs
1815
sed -i '1 i\# Documentation' docs/index.md # workaround for dsfr template
1916
sed -ri 's/^(#+)/\1#/' docs/about.md
2017
sed -i '1 i\# À propos' docs/about.md
21-
~/.local/bin/pipenv run npm run build:prod # which runs mkdocs build + copy dsfr
18+
~/.local/bin/pipenv run mkdocs build --verbose -d public/
2219

2320
clean:
2421
rm -rf *texi *log *aux *toc *pdf *info *ky *cp *fn *tp *pg *vr *cps

Pipfile

+7-30
Original file line numberDiff line numberDiff line change
@@ -4,44 +4,21 @@ verify_ssl = true
44
name = "pypi"
55

66
[[source]]
7-
name = "gitlab-plugin"
8-
url = "https://gitlab-forge.din.developpement-durable.gouv.fr/api/v4/projects/22396/packages/pypi/simple"
7+
name = "gitlab"
8+
url = "https://gitlab-forge.din.developpement-durable.gouv.fr/api/v4/projects/20363/packages/pypi/simple"
99
verify_ssl = false
1010

1111
[[source]]
12-
url = "gitlab"
13-
verify_ssl = true
14-
name = ""
15-
16-
[[source]]
17-
url = "gitlab"
18-
verify_ssl = true
19-
name = ""
20-
21-
[[source]]
22-
url = "gitlab"
23-
verify_ssl = true
24-
name = ""
12+
name = "gitlab-plugin"
13+
url = "https://gitlab-forge.din.developpement-durable.gouv.fr/api/v4/projects/22396/packages/pypi/simple"
14+
verify_ssl = false
2515

2616
[packages]
27-
dsfr_structure= "*"
28-
mkdocs-include-markdown-plugin = "*"
29-
mkdocs-git-revision-date-localized-plugin = "*"
30-
pymdown-extensions = "*"
31-
mkdocs-callouts = "*"
32-
mkdocs-redirects = "*"
33-
mkdocs-autorefs = "*"
17+
mkdocs-dsfr = {version="0.8.1", index="pypi"}
3418
mkdocstrings = "*"
35-
setuptools = "*"
36-
build = "*"
37-
twine = "*"
38-
wheel = "*"
39-
mkdocs = {extras = ["i18n"] }
40-
mkdocstrings-python = "*"
19+
mkdocs-git-revision-date-localized-plugin = "*"
4120
mkdocs-git-authors-plugin = "*"
4221
mkdocs-git-revision-date-plugin = "*"
43-
mkdocs-git-committers-plugin-2 = "*"
44-
mkdocs-dsfr = {version = "*", index = ""}
4522

4623
[dev-packages]
4724

Pipfile.lock

+10-572
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

assets/dsfr/MANIFEST.in

-4
This file was deleted.

assets/dsfr/__init__.py

Whitespace-only changes.

assets/dsfr/base.html

-177
This file was deleted.

assets/dsfr/css/extra.css

-98
This file was deleted.

0 commit comments

Comments
 (0)