Sourcery Starbot ⭐ refactored michaeljoseph/changes #282

SourceryAI · 2022-10-27T04:58:48Z

Thanks for starring sourcery-ai/sourcery ✨ 🌟 ✨

Here's your pull request refactoring your most popular Python repo.

If you want Sourcery to refactor all your Python repos and incoming pull requests install our bot.

Review changes via command line

To manually merge these changes, make sure you're on the main branch, then run:

git fetch https://github.com/sourcery-ai-bot/changes main
git merge --ff-only FETCH_HEAD
git reset HEAD^

SourceryAI · 2022-10-27T04:58:50Z

changes/__init__.py

-    labels = set(
-        [
-            label_name
-            for pull_request in pull_requests
-            for label_name in pull_request.label_names
-        ]
-    )
+    labels = {
+        label_name
+        for pull_request in pull_requests
+        for label_name in pull_request.label_names
+    }
+


Function release_from_pull_requests refactored with the following changes:

Use named expression to simplify assignment and conditional (use-named-expression)

Replace unneeded comprehension with generator (comprehension-to-generator)

Replace list(), dict() or set() with comprehension (collection-builtin-to-comprehension)

Replace identity comprehension with call to collection constructor (identity-comprehension)

SourceryAI · 2022-10-27T04:58:50Z

changes/attributes.py

-    with open('%s/__init__.py' % module_name) as input_file:
+    with open(f'{module_name}/__init__.py') as input_file:


Function extract_attribute refactored with the following changes:

Replace interpolated string formatting with f-string (replace-interpolation-with-fstring)

SourceryAI · 2022-10-27T04:58:50Z

changes/attributes.py

-    init_file = '%s/__init__.py' % module_name
+    init_file = f'{module_name}/__init__.py'


Function replace_attribute refactored with the following changes:

Replace interpolated string formatting with f-string (replace-interpolation-with-fstring)

SourceryAI · 2022-10-27T04:58:50Z

changes/attributes.py

-    init_file = '%s/__init__.py' % module_name
+    init_file = f'{module_name}/__init__.py'
    return any(
-        [attribute_name in init_line for init_line in open(init_file).readlines()]
+        attribute_name in init_line
+        for init_line in open(init_file).readlines()


Function has_attribute refactored with the following changes:

Replace interpolated string formatting with f-string (replace-interpolation-with-fstring)

Replace unneeded comprehension with generator (comprehension-to-generator)

SourceryAI · 2022-10-27T04:58:50Z

changes/changelog.py

-        # http://stackoverflow.com/a/468378/5549
-        sha1_re = re.match(r'^[0-9a-f]{5,40}\b', line)
-        if sha1_re:
+        if sha1_re := re.match(r'^[0-9a-f]{5,40}\b', line):
            sha1 = sha1_re.group()

-            new_line = line.replace(sha1, '[%s](%s/commit/%s)' % (sha1, repo_url, sha1))
+            new_line = line.replace(sha1, f'[{sha1}]({repo_url}/commit/{sha1})')


Function replace_sha_with_commit_link refactored with the following changes:

Use named expression to simplify assignment and conditional (use-named-expression)

Replace interpolated string formatting with f-string (replace-interpolation-with-fstring)

This removes the following comments ( why? ):

# http://stackoverflow.com/a/468378/5549

SourceryAI · 2022-10-27T04:58:54Z

changes/packaging.py

-    install_cmd = '%s/bin/pip install %s' % (tmp_dir, context.module_name)
+    install_cmd = f'{tmp_dir}/bin/pip install {context.module_name}'

    package_index = 'pypi'
    if context.pypi:
-        install_cmd += '-i %s' % context.pypi
+        install_cmd += f'-i {context.pypi}'


Function install_from_pypi refactored with the following changes:

Replace interpolated string formatting with f-string [×3] (replace-interpolation-with-fstring)

SourceryAI · 2022-10-27T04:58:54Z

changes/probe.py

-    log.info('%s? %s' % (probe_name, probe_result))
+    log.info(f'{probe_name}? {probe_result}')


Function report_and_raise refactored with the following changes:

Replace interpolated string formatting with f-string (replace-interpolation-with-fstring)

SourceryAI · 2022-10-27T04:58:55Z

changes/probe.py

-        log.info('%s does not exist' % command)
+        log.info(f'{command} does not exist')


Function has_binary refactored with the following changes:

Replace interpolated string formatting with f-string (replace-interpolation-with-fstring)

SourceryAI · 2022-10-27T04:58:55Z

changes/probe.py

-    return any([has_binary(tool) for tool in TOOLS])
+    return any(has_binary(tool) for tool in TOOLS)


Function has_tools refactored with the following changes:

Replace unneeded comprehension with generator (comprehension-to-generator)

SourceryAI · 2022-10-27T04:58:55Z

changes/probe.py

-    return any([has_binary(runner) for runner in TEST_RUNNERS])
+    return any(has_binary(runner) for runner in TEST_RUNNERS)


Function has_test_runner refactored with the following changes:

Replace unneeded comprehension with generator (comprehension-to-generator)

SourceryAI · 2022-10-27T04:58:59Z

changes/probe.py

-        any([exists('README{}'.format(ext)) for ext in README_EXTENSIONS]),
+        any(exists(f'README{ext}') for ext in README_EXTENSIONS),


Function has_readme refactored with the following changes:

Replace unneeded comprehension with generator (comprehension-to-generator)

Replace call to format with f-string (use-fstring-for-formatting)

SourceryAI · 2022-10-27T04:58:59Z

changes/probe.py

-    init_path = '{}/__init__.py'.format(python_module)
+    init_path = f'{python_module}/__init__.py'


Function has_metadata refactored with the following changes:

Replace call to format with f-string (use-fstring-for-formatting)

SourceryAI · 2022-10-27T04:59:00Z

changes/prompt.py

-        ('{}'.format(i), value) for i, value in enumerate(alternatives, 1)
+        (f'{i}', value) for i, value in enumerate(alternatives, 1)
    )
+


Function choose_labels refactored with the following changes:

Replace call to format with f-string [×3] (use-fstring-for-formatting)

Simplify logical expression using De Morgan identities (de-morgan)

SourceryAI · 2022-10-27T04:59:00Z

changes/services.py

-        return {'Authorization': 'token {}'.format(self.auth_token)}
+        return {'Authorization': f'token {self.auth_token}'}


Function GitHub.headers refactored with the following changes:

Replace call to format with f-string (use-fstring-for-formatting)

SourceryAI · 2022-10-27T04:59:00Z

changes/shell.py

-        log.info('Dry run of %s, skipping' % command)
+        log.info(f'Dry run of {command}, skipping')


Function dry_run refactored with the following changes:

Replace interpolated string formatting with f-string (replace-interpolation-with-fstring)

SourceryAI · 2022-10-27T04:59:02Z

changes/commands/status.py

-    info('Status [{}/{}]'.format(repository.owner, repository.repo))
+    info(f'Status [{repository.owner}/{repository.repo}]')

-    info('Repository: ' + highlight('{}/{}'.format(repository.owner, repository.repo)))
+    info(f"Repository: {highlight(f'{repository.owner}/{repository.repo}')}")


Function status refactored with the following changes:

Replace call to format with f-string [×6] (use-fstring-for-formatting)

Use f-string instead of string concatenation (use-fstring-for-concatenation)

SourceryAI · 2022-10-27T04:59:02Z

changes/models/__init__.py

-        ) + ((' ' + self.name) if self.name else '')
+        ) + (f' {self.name}' if self.name else '')


Function Release.title refactored with the following changes:

Use f-string instead of string concatenation (use-fstring-for-concatenation)

SourceryAI · 2022-10-27T04:59:02Z

changes/models/__init__.py

-        ) + (('-' + self.name) if self.name else '')
+        ) + (f'-{self.name}' if self.name else '')


Function Release.release_note_filename refactored with the following changes:

Use f-string instead of string concatenation (use-fstring-for-concatenation)

SourceryAI · 2022-10-27T04:59:03Z

changes/models/__init__.py

-            while not version_file_path_answer == input_terminator:
+            while version_file_path_answer != input_terminator:


Function BumpVersion.load refactored with the following changes:

Simplify logical expression using De Morgan identities (de-morgan)

SourceryAI · 2022-10-27T04:59:03Z

changes/models/__init__.py

-                '[bumpversion:file:{}]'.format(file_name)
+                f'[bumpversion:file:{file_name}]'
                for file_name in self.version_files_to_replace
            ]
        )

+


Function BumpVersion.write_to_file refactored with the following changes:

Replace call to format with f-string (use-fstring-for-formatting)

SourceryAI · 2022-10-27T04:59:06Z

changes/models/repository.py

-        return git('config --get remote.{}.url'.format(self.REMOTE_NAME))
+        return git(f'config --get remote.{self.REMOTE_NAME}.url')


Function GitRepository.remote_url refactored with the following changes:

Replace call to format with f-string (use-fstring-for-formatting)

SourceryAI · 2022-10-27T04:59:06Z

changes/models/repository.py

-        revision_range = ' {}..HEAD'.format(version) if version else ''
+        revision_range = f' {version}..HEAD' if version else ''

-        merge_commits = git(
-            'log --oneline --merges --no-color{}'.format(revision_range)
-        ).split('\n')
-        return merge_commits
+        return git(f'log --oneline --merges --no-color{revision_range}').split('\n')


Function GitRepository.merges_since refactored with the following changes:

Replace call to format with f-string [×2] (use-fstring-for-formatting)

Inline variable that is immediately returned (inline-immediately-returned-variable)

SourceryAI · 2022-10-27T04:59:07Z

changes/models/repository.py

-        return git('add {}'.format(' '.join(files_to_add)))
+        return git(f"add {' '.join(files_to_add)}")


Function GitRepository.add refactored with the following changes:

Replace call to format with f-string (use-fstring-for-formatting)

SourceryAI · 2022-10-27T04:59:07Z

changes/models/repository.py

-        return git_command['commit', '--message="{}"'.format(message)]()
+        return git_command['commit', f'--message="{message}"']()


Function GitRepository.commit refactored with the following changes:

Replace call to format with f-string (use-fstring-for-formatting)

SourceryAI · 2022-10-27T04:59:07Z

changes/models/repository.py

-        return git('checkout -- {}'.format(' '.join(file_paths)))
+        return git(f"checkout -- {' '.join(file_paths)}")


Function GitRepository.discard refactored with the following changes:

Replace call to format with f-string (use-fstring-for-formatting)

SourceryAI · 2022-10-27T04:59:08Z

tests/test_cli.py

-    assert result.output == 'changes {}\n'.format(changes.__version__)
+    assert result.output == f'changes {changes.__version__}\n'


Function test_version refactored with the following changes:

Replace call to format with f-string (use-fstring-for-formatting)

SourceryAI · 2022-10-27T04:59:08Z

tests/test_publish.py

-        'docs/releases/0.0.2-{}-Icarus.md'.format(date.today().isoformat())
+        f'docs/releases/0.0.2-{date.today().isoformat()}-Icarus.md'
    )
+


Function test_publish refactored with the following changes:

Replace call to format with f-string [×2] (use-fstring-for-formatting)

SourceryAI · 2022-10-27T04:59:09Z

tests/test_stage.py

-    release_notes_path = Path(
-        'docs/releases/0.0.2-{}.md'.format(date.today().isoformat())
-    )
+    release_notes_path = Path(f'docs/releases/0.0.2-{date.today().isoformat()}.md')


Function test_stage_draft refactored with the following changes:

Replace call to format with f-string [×2] (use-fstring-for-formatting)

SourceryAI · 2022-10-27T04:59:09Z

tests/test_stage.py

-        'docs/releases/0.0.2-{}-Icarus.md'.format(date.today().isoformat())
+        f'docs/releases/0.0.2-{date.today().isoformat()}-Icarus.md'
    )
+


Function test_stage refactored with the following changes:

Replace call to format with f-string [×2] (use-fstring-for-formatting)

SourceryAI · 2022-10-27T04:59:09Z

tests/test_stage.py

-        'docs/releases/0.0.2-{}-Icarus.md'.format(date.today().isoformat())
+        f'docs/releases/0.0.2-{date.today().isoformat()}-Icarus.md'
    )
+


Function test_stage_discard refactored with the following changes:

Replace call to format with f-string (use-fstring-for-formatting)

'Refactored by Sourcery'

d1a1fa9

SourceryAI commented Oct 27, 2022

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Sourcery Starbot ⭐ refactored michaeljoseph/changes #282

Sourcery Starbot ⭐ refactored michaeljoseph/changes #282

SourceryAI commented Oct 27, 2022

SourceryAI Oct 27, 2022

SourceryAI Oct 27, 2022

SourceryAI Oct 27, 2022

SourceryAI Oct 27, 2022

SourceryAI Oct 27, 2022

SourceryAI Oct 27, 2022

SourceryAI Oct 27, 2022

SourceryAI Oct 27, 2022

SourceryAI Oct 27, 2022

SourceryAI Oct 27, 2022

SourceryAI Oct 27, 2022

SourceryAI Oct 27, 2022

SourceryAI Oct 27, 2022

SourceryAI Oct 27, 2022

SourceryAI Oct 27, 2022

SourceryAI Oct 27, 2022

SourceryAI Oct 27, 2022

SourceryAI Oct 27, 2022

SourceryAI Oct 27, 2022

SourceryAI Oct 27, 2022

SourceryAI Oct 27, 2022

SourceryAI Oct 27, 2022

SourceryAI Oct 27, 2022

SourceryAI Oct 27, 2022

SourceryAI Oct 27, 2022

SourceryAI Oct 27, 2022

SourceryAI Oct 27, 2022

SourceryAI Oct 27, 2022

SourceryAI Oct 27, 2022

SourceryAI Oct 27, 2022

		with open('%s/__init__.py' % module_name) as input_file:
		with open(f'{module_name}/__init__.py') as input_file:

		init_file = '%s/__init__.py' % module_name
		init_file = f'{module_name}/__init__.py'

		log.info('%s? %s' % (probe_name, probe_result))
		log.info(f'{probe_name}? {probe_result}')

		log.info('%s does not exist' % command)
		log.info(f'{command} does not exist')

		return any([has_binary(tool) for tool in TOOLS])
		return any(has_binary(tool) for tool in TOOLS)

		return any([has_binary(runner) for runner in TEST_RUNNERS])
		return any(has_binary(runner) for runner in TEST_RUNNERS)

		any([exists('README{}'.format(ext)) for ext in README_EXTENSIONS]),
		any(exists(f'README{ext}') for ext in README_EXTENSIONS),

		init_path = '{}/__init__.py'.format(python_module)
		init_path = f'{python_module}/__init__.py'

		return {'Authorization': 'token {}'.format(self.auth_token)}
		return {'Authorization': f'token {self.auth_token}'}

		log.info('Dry run of %s, skipping' % command)
		log.info(f'Dry run of {command}, skipping')

		) + ((' ' + self.name) if self.name else '')
		) + (f' {self.name}' if self.name else '')

		) + (('-' + self.name) if self.name else '')
		) + (f'-{self.name}' if self.name else '')

		while not version_file_path_answer == input_terminator:
		while version_file_path_answer != input_terminator:

		return git('config --get remote.{}.url'.format(self.REMOTE_NAME))
		return git(f'config --get remote.{self.REMOTE_NAME}.url')

		return git('add {}'.format(' '.join(files_to_add)))
		return git(f"add {' '.join(files_to_add)}")

		return git_command['commit', '--message="{}"'.format(message)]()
		return git_command['commit', f'--message="{message}"']()

		return git('checkout -- {}'.format(' '.join(file_paths)))
		return git(f"checkout -- {' '.join(file_paths)}")

		assert result.output == 'changes {}\n'.format(changes.__version__)
		assert result.output == f'changes {changes.__version__}\n'

Sourcery Starbot ⭐ refactored michaeljoseph/changes #282

Are you sure you want to change the base?

Sourcery Starbot ⭐ refactored michaeljoseph/changes #282

Conversation

SourceryAI commented Oct 27, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment