Merge pull request #18 from wwt/timothyhull/refresh-repo-dependencies…

…-and-formatting Refresh repo dependencies and formatting
wwt · Jan 11, 2024 · c1caf8a · c1caf8a
2 parents 9ac2076 + 6b58f8d
commit c1caf8a
Show file tree

Hide file tree

Showing 5 changed files with 95 additions and 59 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -1,38 +1,50 @@
+// Visual Studio Code Development Container configuration file
+// https://code.visualstudio.com/docs/remote/devcontainerjson-reference
 {
+    // Docker build instructions
     "name": "WWT - cURL & Python Requests Foundations Hands-On",
     "build": {
         "dockerfile": "../Dockerfile.dev",
         "context": ".."
     },
-    "extensions": [
-		"davidanson.vscode-markdownlint",
-		"docsmsft.docs-markdown",
-		"docsmsft.docs-yaml",
-        "github.vscode-pull-request-github",
-		"ms-azuretools.vscode-docker",
-		"ms-python.python",
-		"ms-python.vscode-pylance",
-		"redhat.vscode-yaml"
-	],
-    "forwardPorts": [
-        8000
-    ],
-    "postAttachCommand": ["./requirements/server-launch.sh"],
-    "settings": {
-        "#terminal.integrated.defaultProfile.linux#": "/bin/bash",
-        "[yaml]": {
-            "editor.insertSpaces": true,
-            "editor.tabSize": 2,
-            "editor.autoIndent": "keep",
-            "editor.quickSuggestions": {
-                "other": true,
-                "comments": false,
-                "strings": true
+    "customizations": {
+        "vscode": {
+            // Visual Studio Code extensions
+            "extensions": [
+                "davidanson.vscode-markdownlint",
+                "docsmsft.docs-markdown",
+                "docsmsft.docs-yaml",
+                "github.vscode-github-actions",
+                "github.vscode-pull-request-github",
+                "ms-azuretools.vscode-docker",
+                "ms-python.flake8",
+                "ms-python.python",
+                "ms-python.vscode-pylance",
+                "redhat.vscode-yaml",
+                "streetsidesoftware.code-spell-checker"
+            ],
+            "forwardPorts": [
+                8000
+            ],
+            "postAttachCommand": ["./requirements/server-launch.sh"],
+            // Visual Studio Code environment configuration
+            "settings": {
+                // Set the default terminal application to bash
+                "#terminal.integrated.defaultProfile.linux#": "/bin/bash",
+                // Customize YAML formatting
+                "[yaml]": {
+                    "editor.insertSpaces": true,
+                    "editor.tabSize": 2,
+                    "editor.autoIndent": "keep",
+                    "editor.quickSuggestions": {
+                        "other": true,
+                        "comments": false,
+                        "strings": true
+                    }
+                },
+                "python.pythonPath": "/usr/local/bin/python3",
+                "python.formatting.provider": "autopep8"
             }
-        },
-        "python.pythonPath": "/usr/local/bin/python3",
-        "python.formatting.provider": "autopep8",
-        "python.linting.enabled": true,
-        "python.linting.flake8Enabled": true
+        }
     }
 }
diff --git a/.github/workflows/docker-hub-deploy.yml b/.github/workflows/docker-hub-deploy.yml
@@ -14,16 +14,16 @@ jobs:
       GITHUB_BRANCH: refs/heads/main
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v3
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v3
 
       - name: Login to Docker Hub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -35,7 +35,7 @@ jobs:
       - name: Build and push Docker Image
         if: ${{ github.ref == env.GITHUB_BRANCH }}
         id: docker_build
-        uses: docker/build-push-action@v2.1.0
+        uses: docker/build-push-action@v3
         with:
           push: true
           tags: ${{ env.IMAGE_TAG }}

diff --git a/.github/workflows/markdownlint.yml b/.github/workflows/markdownlint.yml
@@ -19,12 +19,12 @@ jobs:
       # checkout@v2 action documentation
       # https://github.com/marketplace/actions/checkout
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       # markdownlint-cli action documentation
       # https://github.com/marketplace/actions/markdownlint-cli
       - name: markdownlint-cli
-        uses: nosborn/github-action-markdown-cli@v1.1.1
+        uses: nosborn/github-action-markdown-cli@v3.3.0
         with:
           files: .
           config_file: .markdownlint.json
diff --git a/.github/workflows/mkdocs-build.yml b/.github/workflows/mkdocs-build.yml
@@ -19,17 +19,17 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           ref: ${{ github.event.pull_request.head.ref }}
           submodules: recursive
 
       - name: Set up Python3
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: '3.x'
 
-      - uses: actions/cache@v2
+      - uses: actions/cache@v3
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements*.txt') }}

diff --git a/requirements.txt b/requirements.txt
@@ -1,56 +1,80 @@
 #
-# This file is autogenerated by pip-compile with python 3.9
-# To update, run:
+# This file is autogenerated by pip-compile with Python 3.9
+# by the following command:
 #
 #    pip-compile requirements.in
 #
-click==8.0.3
-    # via mkdocs
-ghp-import==2.0.2
+babel==2.14.0
+    # via mkdocs-material
+certifi==2023.11.17
+    # via requests
+charset-normalizer==3.3.2
+    # via requests
+click==8.1.7
     # via mkdocs
-importlib-metadata==4.8.1
+colorama==0.4.6
+    # via mkdocs-material
+ghp-import==2.1.0
     # via mkdocs
+idna==3.6
+    # via requests
+importlib-metadata==7.0.1
+    # via
+    #   markdown
+    #   mkdocs
 jinja2==3.1.3
     # via
     #   mkdocs
     #   mkdocs-material
-markdown==3.3.4
+markdown==3.5.2
     # via
     #   mkdocs
     #   mkdocs-material
     #   pymdown-extensions
-markupsafe==2.0.1
-    # via jinja2
+markupsafe==2.1.3
+    # via
+    #   jinja2
+    #   mkdocs
 mergedeep==1.3.4
     # via mkdocs
-mkdocs==1.2.3
+mkdocs==1.5.3
     # via
     #   -r requirements.in
     #   mkdocs-material
-mkdocs-material==7.3.6
+mkdocs-material==9.5.3
     # via -r requirements.in
-mkdocs-material-extensions==1.0.3
+mkdocs-material-extensions==1.3.1
+    # via mkdocs-material
+packaging==23.2
+    # via mkdocs
+paginate==0.5.6
     # via mkdocs-material
-packaging==21.2
+pathspec==0.12.1
     # via mkdocs
-pygments==2.15.0
+platformdirs==4.1.0
+    # via mkdocs
+pygments==2.17.2
     # via mkdocs-material
-pymdown-extensions==10.0
+pymdown-extensions==10.7
     # via mkdocs-material
-pyparsing==2.4.7
-    # via packaging
 python-dateutil==2.8.2
     # via ghp-import
-pyyaml==6.0
+pyyaml==6.0.1
     # via
     #   mkdocs
     #   pymdown-extensions
     #   pyyaml-env-tag
 pyyaml-env-tag==0.1
     # via mkdocs
+regex==2023.12.25
+    # via mkdocs-material
+requests==2.31.0
+    # via mkdocs-material
 six==1.16.0
     # via python-dateutil
-watchdog==2.1.6
+urllib3==2.1.0
+    # via requests
+watchdog==3.0.0
     # via mkdocs
-zipp==3.6.0
+zipp==3.17.0
     # via importlib-metadata