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

Bump the development-dependencies group with 11 updates #608

Merged
merged 5 commits into from
Jun 5, 2024
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
22 changes: 11 additions & 11 deletions requirements-dev.in
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
awscli~=1.31.13
certifi~=2023.7.22
check-manifest~=0.48
mypy~=0.961
mypy~=1.10
myst-parser~=0.18.0
pip-tools~=6.14.0
pydot~=1.4.2
pip-tools~=7.4.1
pydot~=2.0.0
pyroma~=4.0
pytest~=7.2.0
pytest-cov~=4.0.0
pytest-mock~=3.10.0
pytest~=8.2.2
pytest-cov~=5.0.0
pytest-mock~=3.14.0
pytest-ordering~=0.6
ruff~=0.4.4
twine~=4.0.1
types-PyYAML~=6.0.8
types-setuptools~=57.4.17
ruff~=0.4.8
twine~=5.1.0
types-PyYAML~=6.0.12
types-setuptools~=70.0.0
wheel~=0.38.1
sphinx-autoapi~=1.8.0
sphinx-rtd-theme~=1.0.0
sphinx~=4.3.0
moto[s3,sts,iam,codebuild,secretsmanager,ssm]~=4.0.9
moto[s3,sts,iam,codebuild,secretsmanager,ssm]~=5.0.9
requests~=2.32.0
werkzeug~=3.0.3
urllib3~=1.26.18
69 changes: 40 additions & 29 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile with Python 3.12
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# pip-compile --output-file=requirements-dev.txt requirements-dev.in
Expand All @@ -8,8 +8,6 @@ alabaster==0.7.13
# via sphinx
astroid==2.15.8
# via sphinx-autoapi
attrs==23.2.0
# via pytest
awscli==1.31.13
# via -r requirements-dev.in
babel==2.14.0
Expand All @@ -24,7 +22,7 @@ botocore==1.33.13
# boto3
# moto
# s3transfer
build==0.10.0
build==1.2.1
# via
# check-manifest
# pip-tools
Expand All @@ -46,9 +44,7 @@ colorama==0.4.4
coverage[toml]==7.2.7
# via pytest-cov
cryptography==42.0.4
# via
# moto
# secretstorage
# via moto
docutils==0.16
# via
# awscli
Expand All @@ -57,20 +53,21 @@ docutils==0.16
# readme-renderer
# sphinx
# sphinx-rtd-theme
exceptiongroup==1.2.1
# via pytest
idna==3.7
# via requests
imagesize==1.4.1
# via sphinx
importlib-metadata==4.2.0
# via twine
importlib-metadata==7.1.0
# via
# build
# keyring
# twine
iniconfig==2.0.0
# via pytest
jaraco-classes==3.2.3
# via keyring
jeepney==0.8.0
# via
# keyring
# secretstorage
jinja2==3.1.3
# via
# moto
Expand All @@ -93,17 +90,16 @@ markdown-it-py==2.2.0
markupsafe==2.1.5
# via
# jinja2
# moto
# werkzeug
mdit-py-plugins==0.3.5
# via myst-parser
mdurl==0.1.2
# via markdown-it-py
more-itertools==9.1.0
# via jaraco-classes
moto[codebuild,iam,s3,secretsmanager,ssm,sts]==4.0.13
moto[codebuild,iam,s3,secretsmanager,ssm,sts]==5.0.9
# via -r requirements-dev.in
mypy==0.991
mypy==1.10.0
# via -r requirements-dev.in
mypy-extensions==1.0.0
# via mypy
Expand All @@ -115,17 +111,19 @@ packaging==23.2
# pyroma
# pytest
# sphinx
pip-tools==6.14.0
pip-tools==7.4.1
# via -r requirements-dev.in
pkginfo==1.9.6
# via twine
pluggy==1.2.0
pluggy==1.5.0
# via pytest
py-partiql-parser==0.5.5
# via moto
pyasn1==0.5.1
# via rsa
pycparser==2.21
# via cffi
pydot==1.4.2
pydot==2.0.0
# via -r requirements-dev.in
pygments==2.17.2
# via
Expand All @@ -136,25 +134,29 @@ pygments==2.17.2
pyparsing==3.1.1
# via pydot
pyproject-hooks==1.0.0
# via build
# via
# build
# pip-tools
pyroma==4.2
# via -r requirements-dev.in
pytest==7.2.2
pytest==8.2.2
# via
# -r requirements-dev.in
# pytest-cov
# pytest-mock
# pytest-ordering
pytest-cov==4.0.0
pytest-cov==5.0.0
# via -r requirements-dev.in
pytest-mock==3.10.0
pytest-mock==3.14.0
# via -r requirements-dev.in
pytest-ordering==0.6
# via -r requirements-dev.in
python-dateutil==2.8.2
# via
# botocore
# moto
pytz==2024.1
# via babel
pyyaml==6.0.1
# via
# awscli
Expand Down Expand Up @@ -183,14 +185,12 @@ rich==13.7.0
# via twine
rsa==4.7.2
# via awscli
ruff==0.4.4
ruff==0.4.8
# via -r requirements-dev.in
s3transfer==0.8.2
# via
# awscli
# boto3
secretstorage==3.3.3
# via keyring
six==1.16.0
# via
# bleach
Expand Down Expand Up @@ -219,20 +219,31 @@ sphinxcontrib-qthelp==1.0.3
# via sphinx
sphinxcontrib-serializinghtml==1.1.5
# via sphinx
tomli==2.0.1
# via
# build
# check-manifest
# coverage
# mypy
# pip-tools
# pyproject-hooks
# pytest
trove-classifiers==2024.2.22
# via pyroma
twine==4.0.2
twine==5.1.0
# via -r requirements-dev.in
types-pyyaml==6.0.12.12
types-pyyaml==6.0.12.20240311
# via
# -r requirements-dev.in
# responses
types-setuptools==57.4.18
types-setuptools==70.0.0.20240524
# via -r requirements-dev.in
typing-extensions==4.7.1
# via
# astroid
# mypy
# myst-parser
# rich
unidecode==1.3.8
# via sphinx-autoapi
urllib3==1.26.18
Expand Down
6 changes: 2 additions & 4 deletions seedfarmer/checksum.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import hashlib
import os
from pathlib import Path
from typing import Any, Dict, List, Optional, cast
from typing import Any, Dict, List, Optional

from gitignore_parser import parse_gitignore

Expand Down Expand Up @@ -120,9 +120,7 @@ def scandir(dirname: str) -> List[str]:
files = [
f.path
for f in os.scandir(dirname)
if f.is_file()
and os.path.split(f)[1] not in cast(List[str], excluded_files)
and not _evaluate_file(f.path, ignore_maps)
if f.is_file() and os.path.split(f)[1] not in excluded_files and not _evaluate_file(f.path, ignore_maps)
]
all_files.extend(files)
subfolders = [f.path for f in os.scandir(dirname) if f.is_dir()]
Expand Down
2 changes: 1 addition & 1 deletion seedfarmer/commands/_project_policy_commands.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@

def get_default_project_policy() -> None:
with open(os.path.join(CLI_ROOT, DEFAULT_PROJECT_POLICY_PATH), "rb") as f:
shutil.copyfileobj(f, sys.stdout.buffer)
shutil.copyfileobj(f, sys.stdout.buffer) # type: ignore[misc]
2 changes: 1 addition & 1 deletion seedfarmer/mgmt/deploy_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -655,7 +655,7 @@ def _populate_groups_to_remove(
skip_deploy_spec=False,
),
}
destroy_group_list.append(ModulesManifest(**group_manifest))
destroy_group_list.append(ModulesManifest(**group_manifest)) # type: ignore[arg-type]
return destroy_group_list


Expand Down
2 changes: 1 addition & 1 deletion seedfarmer/mgmt/git_support.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ def clone_module_repo(git_path: str) -> Tuple[str, str, Optional[str]]:
if "?" in git_path:
git_path, query = git_path.split("?")
query_params = parse_qs(query)
ref = query_params.get("ref", [None])[0] # type: ignore
ref = query_params.get("ref", [None])[0]
if "depth" in query_params and query_params["depth"][0].isnumeric():
depth = int(query_params["depth"][0])

Expand Down
2 changes: 1 addition & 1 deletion seedfarmer/mgmt/module_info.py
Original file line number Diff line number Diff line change
Expand Up @@ -792,7 +792,7 @@ def _fetch_helper(
name: str, params_cache: Optional[Dict[str, Any]] = None, session: Optional[Session] = None
) -> Optional[Dict[str, Any]]:
if params_cache:
return params_cache.get(name, None)
return params_cache.get(name, None) # type: ignore[no-any-return]
else:
return ssm.get_parameter_if_exists(name=name, session=session)

Expand Down
2 changes: 1 addition & 1 deletion seedfarmer/models/manifests/_deployment_manifest.py
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ class NameGenerator(CamelModel):
prefix: Union[str, ValueFromRef]
suffix: Union[str, ValueFromRef]

def _get_value(self, value: Union[str, ValueFromRef]) -> str:
def _get_value(self, value: Union[str, ValueFromRef]) -> str: # type: ignore[override]
if isinstance(value, str):
return value
elif isinstance(value, ValueFromRef):
Expand Down
4 changes: 2 additions & 2 deletions test/unit-test/test_cli_arg.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import mock_data.mock_manifests as mock_manifests
import pytest
from _test_cli_helper_functions import _test_command
from moto import mock_sts
from moto import mock_aws

from seedfarmer import config
from seedfarmer.__main__ import apply, bootstrap, destroy, init, metadata, projectpolicy, remove, store, version
Expand Down Expand Up @@ -75,7 +75,7 @@ def env_file2():

@pytest.fixture(scope="function")
def sts_client(aws_credentials):
with mock_sts():
with mock_aws():
yield boto3_client(service_name="sts", session=None)


Expand Down
4 changes: 2 additions & 2 deletions test/unit-test/test_commands_bootstrap.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import boto3
import pytest
from moto import mock_sts
from moto import mock_aws

import seedfarmer
import seedfarmer.commands._bootstrap_commands as bc
Expand All @@ -24,7 +24,7 @@ def aws_credentials():

@pytest.fixture(scope="function")
def sts_client(aws_credentials):
with mock_sts():
with mock_aws():
yield boto3_client(service_name="sts", session=None)


Expand Down
4 changes: 2 additions & 2 deletions test/unit-test/test_commands_deployment.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import mock_data.mock_manifests as mock_manifests
import mock_data.mock_module_info_huge as mock_module_info_huge
import pytest
from moto import mock_sts
from moto import mock_aws

import seedfarmer.commands._deployment_commands as dc
import seedfarmer.errors
Expand All @@ -34,7 +34,7 @@ def aws_credentials():

@pytest.fixture(scope="function")
def sts_client(aws_credentials):
with mock_sts():
with mock_aws():
yield boto3_client(service_name="sts", session=None)


Expand Down
4 changes: 2 additions & 2 deletions test/unit-test/test_commands_module.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

import pytest
import yaml
from moto import mock_sts
from moto import mock_aws

import seedfarmer.commands._module_commands as mc
import seedfarmer.errors
Expand All @@ -27,7 +27,7 @@ def aws_credentials():

@pytest.fixture(scope="function")
def sts_client(aws_credentials):
with mock_sts():
with mock_aws():
yield boto3_client(service_name="sts", session=None)


Expand Down
4 changes: 2 additions & 2 deletions test/unit-test/test_commands_network_parameters.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from typing import Any, Dict, cast

import pytest
from moto import mock_sts
from moto import mock_aws

import seedfarmer.commands._network_parameter_commands as npc
import seedfarmer.errors
Expand All @@ -24,7 +24,7 @@ def aws_credentials():

@pytest.fixture(scope="function")
def sts_client(aws_credentials):
with mock_sts():
with mock_aws():
yield boto3_client(service_name="sts", session=None)


Expand Down
4 changes: 2 additions & 2 deletions test/unit-test/test_commands_parameters.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import pydantic_core
import pytest
from moto import mock_sts
from moto import mock_aws

import seedfarmer.commands._parameter_commands as pc
import seedfarmer.errors
Expand All @@ -24,7 +24,7 @@ def aws_credentials():

@pytest.fixture(scope="function")
def sts_client(aws_credentials):
with mock_sts():
with mock_aws():
yield boto3_client(service_name="sts", session=None)


Expand Down
Loading