Skip to content

Commit 83d7fcf

Browse files
committed
Merge branch 'main' into main-github
- setup git in CI - keep CI with symlinks in place - maybe workaround is only needed on out gitlab runners
2 parents 465d126 + 266de2f commit 83d7fcf

39 files changed

Lines changed: 457 additions & 93 deletions

.bumpversion.cfg

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
[bumpversion]
2+
current_version = 0.0.0
3+
message = bump v{current_version} -> v{new_version}
4+
commit = True
5+
tag = True
6+
7+
[bumpversion:file:pyproject.toml]
8+
9+
[bumpversion:file:.bumpversion.cfg]

.github/workflows/docs.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,10 @@ jobs:
2323
python-version: "3.11"
2424
- uses: actions/configure-pages@v3
2525
- run: sudo apt-get update && sudo apt-get install tree
26-
- run: python -m pip install -r requirements.txt
26+
- run: | # creating example projects using copier requires a git identity
27+
git config --global user.name "ci-runner"
28+
git config --global user.email "ci-runner@github.com"
29+
- run: python -m pip install .[doc]
2730
- run: make docs
2831
- uses: actions/upload-pages-artifact@v2
2932
with:

.vscode/cspell.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99
".pre-commit-config.yaml",
1010
"mkdocs.yaml",
1111
"template",
12-
"pyproject.toml",
13-
"requirements.txt"
12+
"pyproject.toml"
1413
],
1514
"dictionaryDefinitions": [
1615
{

.vscode/terms.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
automodule
2+
BUILDDIR
23
bumpversion
34
conftest
45
cyclomatic
56
docstrings
7+
Docutils
68
endfor
79
Furo
810
gitfile
911
gitlab
12+
gitmoji
13+
glab
1014
includex
1115
jannismain
1216
jimustafa
@@ -19,12 +23,15 @@ noreport
1923
octicons
2024
pipenv
2125
pipx
26+
posargs
2227
precommit
2328
pymdownx
2429
pypa
2530
pyproject
2631
pytest
2732
sampleproject
33+
sendline
2834
setuptools
2935
SPHINXBUILD
36+
typer
3037
venv

CHANGELOG.md

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8-
## [Unreleased]
8+
## [0.0.1]
99

1010
Started this template by forking [pypa/sampleproject] and converting it to a copier template.
1111

@@ -15,12 +15,11 @@ An example project (comparable to [pypa/sampleproject]) can be found at [jannism
1515

1616
- CHANGELOG proposal from [jimustafa](https://github.com/jimustafa) in [!185](https://github.com/pypa/sampleproject/pull/185)
1717
- added `__main__` and `cli` modules (based on discussion of [!67](https://github.com/pypa/sampleproject/pull/67))
18-
- the project script can now be executed additionally via `python -m sample`
19-
- Tooling
18+
- Refactored into copier template
2019
- add option to use `bumpversion`
2120
- add option to use `pre-commit`
22-
- add option to choose between MkDocs and Sphinx documentation
23-
- `remote` option ('github' (default), 'gitlab-fhg', 'gitlab-iis')
21+
- add option to choose between documentation tools: `MkDocs` or `Sphinx`
22+
- add `remote` option ('github' (default), 'gitlab-fhg', 'gitlab-iis')
2423
- if `gitlab-*` is selected, Gitlab CI configuration is added
2524
- if `github` is selected, GitHub actions are added
2625
- add Gitlab CI configuration to
@@ -31,7 +30,11 @@ An example project (comparable to [pypa/sampleproject]) can be found at [jannism
3130
- generate documentation and publish via [Gitlab Pages](https://docs.gitlab.com/ee/user/project/pages/)
3231
- add Github Actions configuration to
3332
- generate documentation and publish via [Github Pages](https://pages.github.com/)
34-
- default branch option (default: main)
33+
- add default branch option (default: `main`)
34+
- Documentation
35+
- add user, reference and developer guides
36+
- `init_python_project` Package
37+
- contains template + `init-python-project` command line interface
3538

3639
### Changed
3740

@@ -44,7 +47,7 @@ An example project (comparable to [pypa/sampleproject]) can be found at [jannism
4447

4548
<!-- [unreleased]: https://github.com/jannismain/python-project-template/compare/v0.0.2...HEAD -->
4649
<!-- [0.0.2]: https://github.com/jannismain/python-project-template/compare/v0.0.1...v0.0.2 -->
47-
<!-- [0.0.1]: https://github.com/jannismain/python-project-template/releases/tag/v0.0.1 -->
50+
[0.0.1]: https://github.com/jannismain/python-project-template/releases/tag/v0.0.1
4851

4952
[pypa/sampleproject]: https://github.com/pypa/sampleproject
5053
[jannismain/python-project-template-example]: https://github.com/jannismain/python-project-template-example

Makefile

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
.PHONY: install
2+
install: ## install all dependencies & development requirements
3+
@pip install -e .[dev,test,doc]
4+
15
PUBLISHED_EXAMPLES = build/examples/github build/examples/gitlab_fhg build/examples/gitlab_iis build/examples/gitlab_iis_sphinx
26
DOC_EXAMPLES = docs/examples/mkdocs docs/examples/sphinx docs/examples/default docs/examples/minimal docs/examples/full docs/examples/gitlab
37

@@ -102,6 +106,19 @@ test-all: ## run all tests
102106
pytest ${PYTEST_ARGS}
103107

104108

109+
.PHONY: build install-build
110+
PKGNAME=init_python_project
111+
PKGDIR=src/${PKGNAME}
112+
BUILDDIR?=build/dist
113+
PYTHON?=python
114+
build: ## build package
115+
@${PYTHON} -m pip install --upgrade build
116+
@${PYTHON} -m build --outdir ${BUILDDIR} .
117+
install-build: build
118+
@pip uninstall -y ${PKGNAME}
119+
pip install --force-reinstall ${BUILDDIR}/*.whl
120+
121+
105122
.PHONY: help
106123
# a nice way to document Makefiles, found here: https://marmelab.com/blog/2016/02/29/auto-documented-makefile.html
107124
help:

docs/_nav.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,5 @@
77
- user-guide/*
88
- Topics
99
- user-guide/topics/*
10-
- [FAQ](user-guide/faq.md)
11-
- [Best Practices](./best-practice/)
1210
- [Reference](./reference/)
1311
- [Template Developer Guide](./developer-guide/)

docs/best-practice/documentation.md

Lines changed: 0 additions & 17 deletions
This file was deleted.

docs/best-practice/testing.md

Lines changed: 0 additions & 7 deletions
This file was deleted.

docs/best-practice/versioning.md

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)