Better consistency check. (#87)

huxuan · Aug 11, 2023 · db5d1b7 · db5d1b7
1 parent 30d43a4
commit db5d1b7
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -45,14 +45,22 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
+      - name: Set up Git
+        run: |
+          git config --global user.name github-actions
+          git config --global user.email github-actions@github.com
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v4
         with:
           cache: pip
           python-version: ${{ matrix.python-version }}
       - run: env | sort
-      - run: pip install copier
-      - run: copier copy -r HEAD -f . .
+      - name: Install copier for template rendering
+        run: python -m pip install --user copier
+      - name: Generate the project with the default value
+        run: |
+          rm -rf src/serious_scaffold
+          copier copy -x '!src/serious_scaffold' -r HEAD -f . .
       - run: git diff
       - run: git status --porcelain
       - run: |

diff --git a/.github/workflows/ci.yml.jinja b/.github/workflows/ci.yml.jinja
@@ -63,14 +63,22 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
+      - name: Set up Git
+        run: |
+          git config --global user.name github-actions
+          git config --global user.email github-actions@github.com
       - name: Set up Python {{ '${{ matrix.python-version }}' }}
         uses: actions/setup-python@v4
         with:
           cache: pip
           python-version: {{ '${{ matrix.python-version }}' }}
       - run: env | sort
-      - run: pip install copier
-      - run: copier copy -r HEAD -f . .
+      - name: Install copier for template rendering
+        run: python -m pip install --user copier
+      - name: Generate the project with the default value
+        run: |
+          rm -rf src/serious_scaffold
+          copier copy -x '!src/serious_scaffold' -r HEAD -f . .
       - run: git diff
       - run: git status --porcelain
       - run: |

diff --git a/src/{{ module_name }}/settings.py.jinja b/src/{{ module_name }}/settings.py.jinja
@@ -18,14 +18,15 @@ class GlobalSettings(BaseSettings):
 
 class Settings(BaseSettings):
     """Project specific settings."""
-
 {%- if version_lt(minimal_python_version, "3.10") | bool %}
+
     # NOTE(huxuan): Pydantic cannot leverage future annotations at runtime prior to
     # Python 3.10, so `from __future__ import annotations` cannot be used here, and the
     # lint error need to be ignored unless the minimal Python version >= 3.10.
     # Reference: https://github.com/pydantic/pydantic/issues/3300#issuecomment-1034007897
     logging_level: Optional[str] = getLevelName(logging.INFO)  # noqa: FA100
 {%- else %}
+
     logging_level: str | None = getLevelName(logging.INFO)
 {%- endif %}
     """Default logging level for the project."""