Skip to content

Commit 3ac4baa

Browse files
committed
maint: better doc/package handling
1 parent 46eb1b8 commit 3ac4baa

File tree

8 files changed

+11
-26
lines changed

8 files changed

+11
-26
lines changed

.github/workflows/docs.yaml.bkp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
pip install .
2828
pip install -r package/requirements.mkdocs.txt
2929
- name: Build documentation
30-
run: python src/export docs
30+
run: python package/export docs
3131
# set up Pages
3232
- name: Set up Pages
3333
uses: actions/configure-pages@v3

.github/workflows/package.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
- name: Build package
3535
run: |
3636
. ./.venv/bin/activate
37-
python src/export package
37+
python package/export pkg
3838
deactivate
3939
# upload package as artifact
4040
- name: Upload artifact

MANIFEST.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ include .gitignore
77
# global-include
88

99
recursive-include tests *
10-
recursive-include src/export *
1110

1211
# graft
1312

@@ -16,6 +15,7 @@ recursive-include src/export *
1615
# global-exclude
1716

1817
recursive-exclude docs *.rst
18+
recursive-exclude docs/references *.md
1919

2020
prune docs/_build
2121
prune **/__pycache__

mkdocs.yaml

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -64,21 +64,3 @@ copyright: Copyright © 2013 - 2024 Konsta Vesterinen
6464

6565
nav:
6666
- Home: index.md
67-
- API:
68-
- references/between.md
69-
- references/btc_address.md
70-
- references/card.md
71-
- references/country_code.md
72-
- references/domain.md
73-
- references/email.md
74-
- references/hashes.md
75-
- references/hostname.md
76-
- references/i18n.md
77-
- references/iban.md
78-
- references/ip_address.md
79-
- references/length.md
80-
- references/mac_address.md
81-
- references/slug.md
82-
- references/url.md
83-
- references/utils.md
84-
- references/uuid.md
File renamed without changes.

src/export/__main__.py renamed to package/export/__main__.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@ def _parse_package(source: Path):
4040

4141
def _generate_reference(source: Path, destination: Path, ext: str):
4242
"""Generate reference."""
43-
nav_items: Dict[str, List[str]] = {"Code Reference": []}
43+
nav_items: Dict[str, List[str]] = {"API": []}
4444
# generate reference content
4545
for module_name, aliases in _parse_package(source):
4646
for alias in aliases:
4747
_write_ref_content(destination / f"{module_name}.{ext}", module_name, alias.name)
4848
if ext == "md":
49-
nav_items["Code Reference"].append(f"references/{module_name}.md")
49+
nav_items["API"].append(f"references/{module_name}.md")
5050
return nav_items
5151

5252

@@ -65,6 +65,9 @@ def _update_mkdocs_config(source: Path, destination: Path, nav_items: Dict[str,
6565

6666
def _gen_md_docs(source: Path, refs_path: Path):
6767
"""Generate Markdown docs."""
68+
# remove existing markdown files
69+
for md_files in (source / "docs/references").glob("*.md"):
70+
md_files.unlink()
6871
nav_items = _generate_reference(source / "src/validators/__init__.py", refs_path, "md")
6972
# backup mkdocs config
7073
_update_mkdocs_config(source / "mkdocs.yaml", source / "mkdocs.bak.yaml", nav_items)
@@ -166,7 +169,7 @@ def package(source: Path):
166169
if len(argv) != 2:
167170
quit(exit_code)
168171

169-
if argv[1] == "package":
172+
if argv[1] == "pkg":
170173
exit_code = package(project_root)
171174
if argv[1] == "docs":
172175
exit_code = generate_documentation(

package/roll.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ if ($IsLinux || $IsMacOS) {
4646
. $venv_dir\$bin_path\Activate.ps1
4747

4848
# Run export script
49-
python src/export package
49+
python package/export pkg
5050

5151
# Deactivate virtual environment
5252
deactivate

package/roll.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ $venv_dir/bin/pip install build
4040
. $venv_dir/bin/activate
4141

4242
# Run export script
43-
python src/export package
43+
python package/export pkg
4444

4545
# Deactivate virtual environment
4646
deactivate

0 commit comments

Comments
 (0)