update python version and deps (#4)

* update python version and deps * update CI versions * remove requirements file * <bot> update setup.cfg * <bot> add py.typed file(s) --------- Co-authored-by: github-actions <[email protected]>
WIPACrepo · May 3, 2024 · 5de7c5f · 5de7c5f
1 parent 0bc2388
commit 5de7c5f
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 108 deletions.
diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
@@ -14,10 +14,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout Project
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: Docker meta
       id: docker_meta
-      uses: docker/metadata-action@v3
+      uses: docker/metadata-action@v5
       with:
         images: |
           ghcr.io/WIPACRepo/people-directory
@@ -27,14 +27,14 @@ jobs:
             type=semver,pattern={{major}}.{{minor}}
             type=semver,pattern={{major}}.{{minor}}.{{patch}}
     - name: Login to GitHub Container Registry
-      uses: docker/login-action@v1
+      uses: docker/login-action@v3
       if: ${{ github.event_name != 'pull_request' }}
       with:
         registry: ghcr.io
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}
     - name: Push Docker Image
-      uses: docker/build-push-action@v2
+      uses: docker/build-push-action@v5
       with:
         context: .
         push: ${{ github.event_name != 'pull_request' }}

diff --git a/.github/workflows/wipac_cicd.yaml b/.github/workflows/wipac_cicd.yaml
@@ -7,34 +7,39 @@ on:
     tags-ignore:
       - '**'
 
+env:
+  py_version: '3.10'
+
 jobs:
 
   flake8:
     needs: []
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v4
+        with:
+          python-version: ${{ env.py_version }}
       - uses: WIPACrepo/[email protected]
 
   py-setup:
     runs-on: ubuntu-latest
     steps:
       - name: checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
-      - uses: WIPACrepo/wipac-dev-py-setup-action@pip-fix
+      - uses: WIPACrepo/wipac-dev-py-setup-action@v3.1
 
   py-versions:
     needs: [py-setup]
     runs-on: ubuntu-latest
     outputs:
       matrix: ${{ steps.versions.outputs.matrix }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - id: versions
-        uses: WIPACrepo/wipac-dev-py-versions-action@v2.1
+        uses: WIPACrepo/wipac-dev-py-versions-action@v2.2
 
   pip-install:
     needs: [py-versions]
@@ -44,8 +49,8 @@ jobs:
       fail-fast: false
       matrix: ${{ fromJSON(needs.py-versions.outputs.matrix) }}
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.py3_versions }}
       - run: |
@@ -107,7 +112,7 @@ jobs:
     runs-on: ubuntu-latest
     concurrency: release
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         fetch-depth: 0
         token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
@@ -125,10 +130,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout Project
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
     - name: Docker meta
       id: docker_meta
-      uses: docker/metadata-action@v3
+      uses: docker/metadata-action@v5
       with:
         images: |
           ghcr.io/WIPACRepo/people-directory
@@ -138,14 +143,14 @@ jobs:
             type=semver,pattern={{major}}.{{minor}}
             type=semver,pattern={{major}}.{{minor}}.{{patch}}
     - name: Login to GitHub Container Registry
-      uses: docker/login-action@v1
+      uses: docker/login-action@v3
       if: ${{ github.event_name != 'pull_request' }}
       with:
         registry: ghcr.io
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}
     - name: Push Docker Image
-      uses: docker/build-push-action@v2
+      uses: docker/build-push-action@v5
       with:
         context: .
         push: ${{ github.event_name != 'pull_request' }}

diff --git a/Dockerfile b/Dockerfile
@@ -1,15 +1,17 @@
-FROM python:3.9
+FROM python:3.10
 
 RUN useradd -m -U app
 
-COPY requirements.txt ./
-RUN pip install --no-cache-dir -r requirements.txt
-
 WORKDIR /home/app
 USER app
 
 COPY . .
 
+USER root
+RUN pip install --no-cache-dir -e .
+
+USER app
+
 ENV PYTHONPATH=/home/app
 
 CMD ["python", "-m", "people_directory"]
diff --git a/people_directory/py.typed b/people_directory/py.typed
diff --git a/requirements.txt b/requirements.txt
diff --git a/setup.cfg b/setup.cfg
@@ -1,17 +1,19 @@
 [wipac:cicd_setup_builder]
-python_min = 3.8
+python_min = 3.10
 package_dirs = people_directory
 
-[metadata]  # generated by wipac:cicd_setup_builder: version
+[metadata]  # generated by wipac:cicd_setup_builder: name, version
 version = attr: people_directory.__version__
+name = people-directory
 
-[semantic_release]  # generated by wipac:cicd_setup_builder
+[semantic_release]  # fully-generated by wipac:cicd_setup_builder
 version_variable = people_directory/__init__.py:__version__
 upload_to_pypi = False
 patch_without_tag = True
-commit_parser = semantic_release.history.tag_parser
-minor_tag = [minor]
-fix_tag = [fix]
+commit_parser = semantic_release.history.emoji_parser
+major_emoji = [major]
+minor_emoji = [minor]
+patch_emoji = [fix], [patch]
 branch = main
 
 [options]  # generated by wipac:cicd_setup_builder: python_requires, packages
@@ -20,7 +22,7 @@ install_requires =
 	wipac-dev-tools
 	wipac-keycloak-rest-services
 	wipac-rest-tools
-python_requires = >=3.8, <3.12
+python_requires = >=3.10, <3.13
 packages = find:
 
 [options.extras_require]
@@ -35,10 +37,19 @@ tests =
 [options.package_data]  # generated by wipac:cicd_setup_builder: '*'
 * = py.typed
 
-[options.packages.find]
+[options.packages.find]  # generated by wipac:cicd_setup_builder: include/exclude
 include =
 	people_directory
 	people_directory.*
+exclude =
+	test
+	tests
+	doc
+	docs
+	resource
+	resources
+	example
+	examples
 
 [coverage:run]
 branch = True