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 pydocstyle from 3.0.0 to 4.0.1 #944

Merged
merged 2 commits into from
Aug 19, 2019
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
2 changes: 1 addition & 1 deletion requirements/check.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ flake8-print==3.1.0
isort==4.3.21
m2r==0.2.1
pep8-naming==0.8.2
pydocstyle==3.0.0
pydocstyle==4.0.1
pygments==2.4.2
pylint==2.3.1
readme-renderer==24.0
2 changes: 2 additions & 0 deletions src/watchmaker/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@ class Arguments(dict):
# This list would be converted to the following dict and merged
# into the parameters passed to the worker configurations:
{'arg1': 'value1', 'arg2': 'value2'}

"""

def __init__(
Expand Down Expand Up @@ -203,6 +204,7 @@ class Client(object):
Keyword Arguments:
arguments: (:obj:`Arguments`)
A dictionary of arguments. See :class:`watchmaker.Arguments`.

"""

def __init__(self, arguments):
Expand Down
2 changes: 2 additions & 0 deletions src/watchmaker/logger/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ def make_log_dir(log_dir):
Args:
log_dir: (:obj:`str`)
Path to a directory.

"""
if not os.path.exists(log_dir):
os.makedirs(log_dir)
Expand Down Expand Up @@ -123,6 +124,7 @@ def prepare_logging(log_dir, log_level):
- ``warning``
- ``info``
- ``debug``

"""
logformat = (
'%(asctime)s [%(name)s][%(levelname)-5s][%(process)s]: %(message)s'
Expand Down
2 changes: 2 additions & 0 deletions src/watchmaker/managers/platform.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ def retrieve_file(self, url, filename):

filename: (:obj:`str`)
Path where the file will be saved.

"""
# Convert a local path to a URI
url = watchmaker.utils.uri_from_filepath(url)
Expand Down Expand Up @@ -268,6 +269,7 @@ def extract_contents(self, filepath, to_directory, create_dir=False):
Switch to control the creation of a subdirectory within
``to_directory`` named for the filename of the compressed file.
(*Default*: ``False``)

"""
if filepath.endswith('.zip'):
self.log.debug('File Type: zip')
Expand Down
1 change: 1 addition & 0 deletions src/watchmaker/utils/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ def copytree(src, dst, force=False, **kwargs):
force: (:obj:`bool`)
Whether to delete destination prior to copy.
(*Default*: ``False``)

"""
if force and os.path.exists(dst):
shutil.rmtree(dst)
Expand Down
4 changes: 4 additions & 0 deletions src/watchmaker/workers/salt.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ class SaltBase(WorkerBase, PlatformManagerBase):
computer account will be created when joining a domain.
E.g. ``"OU=SuperCoolApp,DC=example,DC=com"``
(*Default*: ``''``)

"""

def __init__(self, *args, **kwargs):
Expand Down Expand Up @@ -319,6 +320,7 @@ def run_salt(self, command, **kwargs):
Watchmaker will always begin the command with the options
``--local``, ``--retcode-passthrough``, and ``--no-color``, so
do not specify those options in the command.

"""
cmd = [
self.salt_call,
Expand Down Expand Up @@ -551,6 +553,7 @@ class SaltLinux(SaltBase, LinuxPlatformManager):
A git reference present in ``git_repo``, such as a commit or a tag.
If not specified, the HEAD of the default branch is used.
(*Default*: ``''``)

"""

def __init__(self, *args, **kwargs):
Expand Down Expand Up @@ -706,6 +709,7 @@ class SaltWindows(SaltBase, WindowsPlatformManager):
salt formula. E.g. ``"MemberServer"``, ``"DomainController"``, or
``"Workstation"``
(*Default*: ``''``)

"""

def __init__(self, *args, **kwargs):
Expand Down
1 change: 1 addition & 0 deletions src/watchmaker/workers/yum.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ class Yum(WorkerBase, LinuxPlatformManager):
repo_map: (:obj:`list`)
List of dictionaries containing a map of yum repo files to systems.
(*Default*: ``[]``)

"""

SUPPORTED_DISTS = ('amazon', 'centos', 'red hat')
Expand Down
3 changes: 3 additions & 0 deletions tests/test_saltworker.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ def test_default_valid_environments(saltworker_client):

Args:
saltworker_client: (:obj:`src.workers.SaltBase`)

"""
# test that the defaults work
assert saltworker_client.before_install() is None
Expand All @@ -43,6 +44,7 @@ def test_bogus_environment(saltworker_client):

Args:
saltworker_client: (:obj:`src.workers.SaltBase`)

"""
# ensure InvalidValue is raised when a bogus environment type is selected
with pytest.raises(InvalidValue):
Expand All @@ -57,6 +59,7 @@ def test_valid_environment(saltworker_client):

Args:
saltworker_client: (:obj:`src.workers.SaltBase`)

"""
saltworker_client.ent_env = 'dev'
saltworker_client.valid_envs = [None, 'dev', 'test', 'prod']
Expand Down