Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refresh repo dependencies and formatting #48

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 45 additions & 33 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,42 +1,54 @@
// Visual Studio Code Development Container configuration file
// https://code.visualstudio.com/docs/remote/devcontainerjson-reference
{
// Docker build instructions{
"name": "WWT - Cisco DevNet DCAUTO Study Resources Dev Container",
"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",
"ms-vscode.powershell",
"redhat.ansible",
"redhat.vscode-yaml",
"streetsidesoftware.code-spell-checker"
],
"forwardPorts": [
8000,
8888
],
"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.python",
"ms-python.flake8",
"ms-python.vscode-pylance",
"ms-vscode.powershell",
"redhat.ansible",
"redhat.vscode-yaml",
"streetsidesoftware.code-spell-checker"
],
"forwardPorts": [
8000,
8888
],
"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
}
},
// Set Python configuration for runtime, syntax analysis, and linting
"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
}
}
}
10 changes: 5 additions & 5 deletions .github/workflows/docker-hub-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@ jobs:
GITHUB_BRANCH: refs/heads/main
steps:
- name: Checkout code
uses: actions/checkout@v3
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 }}
Expand All @@ -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 }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/markdownlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ jobs:
# checkout action documentation
# https://github.com/marketplace/actions/checkout
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

# markdownlint-cli action documentation
# https://github.com/marketplace/actions/markdownlint-cli
- name: markdownlint-cli
uses: nosborn/github-action-markdown-cli@v3.1.0
uses: nosborn/github-action-markdown-cli@v3.3.0
with:
files: .
config_file: .markdownlint.json
6 changes: 3 additions & 3 deletions .github/workflows/mkdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,17 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.ref }}
submodules: recursive

- name: Set up Python3
uses: actions/setup-python@v4
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') }}
Expand Down
3 changes: 2 additions & 1 deletion .markdownlint.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@
"MD007": false,
"MD013": false,
"MD029": false,
"MD046": false
"MD046": false,
"MD051": false
}
2 changes: 1 addition & 1 deletion docs/sections/section_4.md
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ This section of the exam topics primarily focuses on the programmability feature
## :material-file-document-outline: Documentation

??? abstract "UCS Developer Tools"
- [UCS Python SDK Reference Guide](hhttps://ciscoucs.github.io/ucsmsdk_docs/ucsmsdk_ug.html "UCS Python SDK Reference Guide"){target=_blank}
- [UCS Python SDK Reference Guide](https://ciscoucs.github.io/ucsmsdk_docs/ucsmsdk_ug.html "UCS Python SDK Reference Guide"){target=_blank}
- [UCS PowerTool Resource Landing Page](https://community.cisco.com/t5/cisco-developed-ucs-integrations/cisco-ucs-powertool-suite-powershell-modules-for-cisco-ucs/ta-p/3639523 "UCS PowerTool Resource Landing Page"){target=_blank}
- [DevNet UCS PowerTool Docker Container on Docker Hub](https://hub.docker.com/r/ciscodevnet/ucs-powertool-core-ms "DevNet UCS PowerTool Docker Container on Docker Hub"){target=_blank}
- The resources in this Docker Container are already built-in to the Visual Studio Development Container in this repository.
Expand Down
58 changes: 40 additions & 18 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,58 +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.1.3
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
colorama==0.4.6
# via mkdocs-material
ghp-import==2.1.0
# via mkdocs
importlib-metadata==4.12.0
idna==3.6
# via requests
importlib-metadata==7.0.1
# via
# markdown
# mkdocs
jinja2==3.1.3
# via
# mkdocs
# mkdocs-material
markdown==3.4.1
markdown==3.5.2
# via
# mkdocs
# mkdocs-material
# pymdown-extensions
markupsafe==2.1.1
# via jinja2
markupsafe==2.1.3
# via
# jinja2
# mkdocs
mergedeep==1.3.4
# via mkdocs
mkdocs==1.3.0
mkdocs==1.5.3
# via
# -r requirements.in
# mkdocs-material
mkdocs-material==8.3.9
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==21.3
packaging==23.2
# via mkdocs
pygments==2.15.0
paginate==0.5.6
# via mkdocs-material
pymdown-extensions==10.0
pathspec==0.12.1
# via mkdocs
platformdirs==4.1.0
# via mkdocs
pygments==2.17.2
# via mkdocs-material
pymdown-extensions==10.7
# via mkdocs-material
pyparsing==3.0.9
# 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.9
urllib3==2.1.0
# via requests
watchdog==3.0.0
# via mkdocs
zipp==3.8.1
zipp==3.17.0
# via importlib-metadata