Merge pull request #97 from Preocts/preocts

Refinement of the template

Author: Preocts

.flake8

@@ -0,0 +1,5 @@
+[flake8]
+extend-ignore =
+    W503
+    E203
+max-line-length = 88

.pre-commit-config.yaml

@@ -36,7 +36,7 @@ repos:
     rev: 1.13.0
     hooks:
       - id: blacken-docs
-        additional_dependencies: [black>=22.12.0]
+        additional_dependencies: [black>=23.3.0]
 
   # Flake8 for linting, line-length adjusted to match Black default
   - repo: https://github.com/PyCQA/flake8

Makefile

@@ -3,12 +3,20 @@ install-dev:
 	python -m pip install --upgrade --editable .[dev,test]
 	pre-commit install
 
+.PHONY: update-dev
+update-dev:
+	python -m pip install --upgrade pip-tools
+	pip-compile --resolver=backtracking --no-emit-index-url requirements.in
+	pip-compile --resolver=backtracking --no-emit-index-url requirements-dev.in
+	pip-compile --resolver=backtracking --no-emit-index-url requirements-test.in
+
 .PHONY: upgrade-dev
 upgrade-dev:
 	python -m pip install --upgrade pip-tools
-	pip-compile --resolver=backtracking requirements/requirements.in
-	pip-compile --resolver=backtracking requirements/requirements-dev.in
-	pip-compile --resolver=backtracking requirements/requirements-test.in
+	pip-compile --resolver=backtracking --upgrade --no-emit-index-url requirements.in
+	pip-compile --resolver=backtracking --upgrade --no-emit-index-url requirements-dev.in
+	pip-compile --resolver=backtracking --upgrade --no-emit-index-url requirements-test.in
+
 
 .PHONY: coverage
 coverage:

README.md

@@ -7,19 +7,13 @@
 
 # python-src-template
 
-A template I use for most projects and is setup to jive with my environment at the company I work with.
+A template I use for most projects and is setup to jive with my environment at
+the company I work with.
 
 This is not the one-shot solution to project structure or packaging. This is
 just what works well for one egg on the Internet. Feel free to use it as you see
 fit.
 
-The primary setup here uses dynamically loaded requirement files from the
-`./requirements` directory in the pyproject.toml file. This is ideal for
-micro-services, applications, or scripts that need all requirements pinned.
-Pinning is handled by `pip-compile`. The files in `./alt_files` offer an
-alternative where all requirements are kept within the pyproject.toml file and
-any pinning is manually managed.
-
 ---
 
 # Local developer installation
@@ -47,13 +41,31 @@ the desired version while creating the `venv`. (e.g. `python3` or `python3.8`)
 
 ## Installation steps
 
+### Makefile
+
+This repo has a Makefile with some quality of life scripts if the system
+supports `make`.  Please note there are no checks for an active `venv` in the
+Makefile.  If you are on Windows you can install make using scoop or chocolatey.
+
+| PHONY         | Description                                                           |
+| ------------- | --------------------------------------------------------------------- |
+| `install-dev` | install development/test requirements and project as editable install |
+| `update-dev`  | regenerate requirements-*.txt (will keep existing pins)               |
+| `upgrade-dev` | attempt to update all dependencies, regenerate requirements-*.txt     |
+| `coverage`    | Run tests with coverage, generate console report                      |
+| `docker-test` | Run coverage and tests in a docker container.                         |
+| `build-dist`  | Build source distribution and wheel distribution                      |
+| `clean`       | Deletes build, tox, coverage, pytest, mypy, cache, and pyc artifacts  |
+
+
 Clone this repo and enter root directory of repo:
 
 ```console
 $ git clone https://github.com/[ORG NAME]/[REPO NAME]
 $ cd [REPO NAME]
 ```
 
+
 Create the `venv`:
 
 ```console
@@ -75,6 +87,14 @@ call the version of the interpreter used to create the `venv`
 
 Install editable library and development requirements:
 
+### With Makefile:
+
+```console
+make install-dev
+```
+
+### Without Makefile:
+
 ```console
 $ python -m pip install --editable .[dev,test]
 ```
@@ -120,19 +140,48 @@ To deactivate (exit) the `venv`:
 ```console
 $ deactivate
 ```
+
 ---
 
-## Note on flake8:
+## Updating dependencies
+
+New dependencys can be added to the `requirements-*.in` file. It is recommended
+to only use pins when specific versions or upgrades beyond a certain version are
+to be avoided. Otherwise, allow `pip-compile` to manage the pins in the
+generated `requirements-*.txt` files.
+
+Once updated following the steps below, the package can be installed if needed.
+
+### With Makefile
+
+To update the generated files with a dependency:
 
-`flake8` is included in the `requirements-dev.txt` of the project. However it
-disagrees with `black`, the formatter of choice, on max-line-length and two
-general linting errors. `.pre-commit-config.yaml` is already configured to
-ignore these. `flake8` doesn't support `pyproject.toml` so be sure to add the
-following to the editor of choice as needed.
+```console
+make update-dev
+```
+
+To attempt to upgrade all generated dependencies:
+
+```console
+make upgrade-dev
+```
+
+### Without Makefile
 
-```ini
---ignore=W503,E203
---max-line-length=88
+To update the generated files with a dependency:
+
+```console
+pip-compile --resolver=backtracking --no-emit-index-url requirements.in
+pip-compile --resolver=backtracking --no-emit-index-url requirements-dev.in
+pip-compile --resolver=backtracking --no-emit-index-url requirements-test.in
+```
+
+To attempt to upgrade all generated dependencies:
+
+```console
+pip-compile --resolver=backtracking --upgrade --no-emit-index-url requirements.in
+pip-compile --resolver=backtracking --upgrade --no-emit-index-url requirements-dev.in
+pip-compile --resolver=backtracking --upgrade --no-emit-index-url requirements-test.in
 ```
 
 ---
@@ -147,18 +196,3 @@ any code submitted for review already passes all selected pre-commit checks.
 with `git` hooks.
 
 ---
-
-## Makefile
-
-This repo has a Makefile with some quality of life scripts if the system
-supports `make`.  Please note there are no checks for an active `venv` in the
-Makefile.
-
-| PHONY         | Description                                                           |
-| ------------- | --------------------------------------------------------------------- |
-| `install-dev` | install development/test requirements and project as editable install |
-| `upgrade-dev` | update all dependencies, regenerate requirements.txt                  |
-| `coverage`    | Run tests with coverage, generate console report                      |
-| `docker-test` | Run coverage and tests in a docker container.                         |
-| `build-dist`  | Build source distribution and wheel distribution                      |
-| `clean`       | Deletes build, tox, coverage, pytest, mypy, cache, and pyc artifacts  |

alt_files/Makefile

@@ -71,24 +71,6 @@ def get_input(prompt: str) -> str:
     return input(prompt)
 
 
-def select_project_type() -> None:
-    """Select whether alt_files should be used."""
-    user_input = get_input("Switch to dependencies in pyproject.toml? (y/N) : ")
-    if user_input.lower() == "y":
-        for file in ALT_FILE_DIR.iterdir():
-            file.replace(file.name)
-
-        # Remove requirements directory and all contents
-        for file in REQUIREMENTS_DIR.iterdir():
-            os.remove(file)
-        os.rmdir(REQUIREMENTS_DIR)
-
-    # Remove alt_files directory and all contents
-    for file in ALT_FILE_DIR.iterdir():
-        os.remove(file)
-    os.rmdir(ALT_FILE_DIR)
-
-
 def get_project_data() -> ProjectData:
     """Query user for details on the project. This is the quiz."""
     data = ProjectData()
@@ -138,14 +120,12 @@ def rename_module_folder(name: str) -> None:
 if __name__ == "__main__":
     print("Eggcellent template setup:\n")
 
-    select_project_type()
-
     project_data = get_project_data()
 
     replace_pyproject_values(project_data)
     replace_readme_values(project_data)
 
-    rename_module_folder(project_data.name)
-
     delete_placeholder_files()
     delete_placeholder_directories()
+
+    rename_module_folder(project_data.name)