Skip to content
Closed
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
10 changes: 5 additions & 5 deletions .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ jobs:
matrix:
os: [11, 12, 13]
platform: [x86_64]
python-version: [3.9.16]
python-version: [3.10.14]

steps:
- name: Apply Test -- Branch Filter
Expand Down Expand Up @@ -135,7 +135,7 @@ jobs:
matrix:
os: [11, 12, 13]
platform: [x86_64]
python-version: [3.9.16]
python-version: [3.10.14]

steps:
- name: Attach Release Binaries -- Branch Filter
Expand Down Expand Up @@ -198,7 +198,7 @@ jobs:
max-parallel: 4
matrix:
include:
- python-version: 3.9
- python-version: 3.10.14

steps:
- name: Container Build -- Checkout
Expand Down Expand Up @@ -438,7 +438,7 @@ jobs:
strategy:
max-parallel: 4
matrix:
python-version: [3.9]
python-version: [3.10.14]

steps:
- name: Workflow Lint -- Set up Python ${{ matrix.python-version }}
Expand Down Expand Up @@ -480,7 +480,7 @@ jobs:
matrix:
os: [11, 12, 13]
platform: [x86_64]
python-version: [3.9.16]
python-version: [3.10.14]

steps:
- name: OSX Build -- Branch Filter
Expand Down
2 changes: 1 addition & 1 deletion .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version: 2
build:
os: ubuntu-22.04
tools:
python: "3.9"
python: "3.10"

sphinx:
builder: html
Expand Down
5 changes: 4 additions & 1 deletion assets/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG BUILD_ARG_PYTHON_VERSION=3.9
ARG BUILD_ARG_PYTHON_VERSION=3.10

FROM python:$BUILD_ARG_PYTHON_VERSION-slim AS base

Expand Down Expand Up @@ -117,6 +117,9 @@ RUN ln -sf /app/assets/.bash_customize /home/user/.bash_customize
# Setup The Dev CLI
RUN poetry run dev setup-bash

# Patch MyPy for yaml-stubs
RUN poetry run pip install mypy=="0.981"

CMD ["./mac_maker/container_init.sh"]

# ======================================================
Expand Down
2 changes: 1 addition & 1 deletion assets/cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
commands:
- 'bandit -r "${PROJECT_NAME}" -c .bandit.rc --ini .bandit -x tests'
- 'echo "\nPoetry is exporting the lockfile standby..."'
- 'poetry export --without-hashes -f requirements.txt | safety check -i 42923 -i 52510 -i 54229 -i 54230 --stdin'
- 'poetry export --without-hashes -f requirements.txt | safety check -i 42923 -i 54229 -i 54230 -i 54564 -i 66667 --stdin'
success: "Security Test Passed!"
failure: "Security Test Failed!"
- name: "test"
Expand Down
4 changes: 2 additions & 2 deletions bitrise.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ workflows:
envs:
- BITRISE_DEPLOY_DIR: "/Users/vagrant/artifacts"
- OS_VERSION: "12"
- PYTHON_VERSION: "3.9.16"
- PYTHON_VERSION: "3.10.14"
steps:
- git-clone@8: {}
- script@1:
Expand Down Expand Up @@ -59,7 +59,7 @@ workflows:
envs:
- BITRISE_DEPLOY_DIR: "/Users/vagrant/artifacts"
- OS_VERSION: "13"
- PYTHON_VERSION: "3.9.16"
- PYTHON_VERSION: "3.10.14"
steps:
- git-clone@8: {}
- script@1:
Expand Down
2 changes: 1 addition & 1 deletion mac_maker/cli.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# type: ignore[misc]
"""The Mac Maker CLI."""
# mypy: disable-error-code="misc"

from typing import Optional

Expand Down
2 changes: 1 addition & 1 deletion mac_maker/tests/test_cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from click.testing import CliRunner
from parameterized import parameterized_class
from .. import cli as cli_module
from ..cli import cli # type: ignore[attr-defined]
from ..cli import cli
from .fixtures import fixtures_git

CLI_MODULE = cli_module.__name__
Expand Down
2 changes: 1 addition & 1 deletion mac_maker/tests/test_cli_shell_interrupt.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ def setUp(self) -> None:
@mock.patch(ROOT_MODULE + ".utilities.shell.cmd_loop.patch_interrupt")
def test_make_command_interrupt(self, m_interrupt: mock.Mock) -> None:
importlib.reload(cli)
cli_root = cli.cli # type: ignore[attr-defined]
cli_root = cli.cli
original_postcmd = cli_root.shell.postcmd

with self.assertRaises(SystemExit):
Expand Down
2 changes: 1 addition & 1 deletion mac_maker/utilities/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ def was_started_without_shell() -> bool:
"""

for command in mac_maker.cli.\
cli.commands.keys(): # type: ignore[attr-defined]
cli.commands.keys():
if command in sys.argv:
return True
return False
137 changes: 48 additions & 89 deletions poetry.lock

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,13 @@

[tool.poetry.dependencies]
PyYAML = "^6.0.0"
ansible = "^8.0.0"
ansible = "^9.0.0"
click = ">=8.0.0,<9.0.0"
click_shell = "^2.1.0"
cryptography = ">=41.0.3"
jsonschema = "^4.3.3"
pyinstaller = "^5.1"
python = ">=3.9.0,<3.10.0"
pyinstaller = "^6.5"
python = ">=3.10.0,<3.11.0"
requests = "^2.31.0"

[tool.poetry.dependencies.myst_parser]
Expand All @@ -68,7 +68,7 @@

[tool.poetry.dependencies.sphinx]
optional = true
version = "^6.0.0"
version = "^7.2.6"

[tool.poetry.dependencies.sphinx-autodoc-typehints]
optional = true
Expand Down