Skip to content

Commit

Permalink
Python 3.5 support
Browse files Browse the repository at this point in the history
  • Loading branch information
maxzheng committed Oct 15, 2023
1 parent bdfdf7f commit c3917e2
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 7 deletions.
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ def find_files(path):
packages=setuptools.find_packages(),
include_package_data=True,

python_requires='>=3.6',
python_requires='>=3.5',
setup_requires=['setuptools-git', 'wheel'],

classifiers=[
Expand Down
2 changes: 1 addition & 1 deletion tests/test_publish.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ def test_publish(wst, monkeypatch):

assert silent_run_mock.call_args_list == [
call('rm -rf dist/*', cwd=str(cwd), shell=True),
call(f'{python} setup.py sdist bdist_wheel', cwd=str(cwd)),
call('{} setup.py sdist bdist_wheel'.format(python), cwd=str(cwd)),
call('twine upload -r "pypi" -u "user" -p "pass" dist/*', cwd=str(cwd), shell=True, silent=2)]

# No changes
Expand Down
1 change: 0 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ deps =
mock
pytest
pytest-cov
pytest-fixtures
pytest-xdist
sphinx
install_command =
Expand Down
4 changes: 2 additions & 2 deletions workspace/commands/publish.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ def run(self):
if self.major or self.minor:
new_version, setup_file = self.bump_version(major=self.major, minor=self.minor)
major_minor = 'major' if self.major else 'minor'
self.commander.run('commit', msg=f'Bump {major_minor} version', files=[setup_file], push=2,
self.commander.run('commit', msg='Bump {} version'.format(major_minor), files=[setup_file], push=2,
skip_style_check=True)

else:
Expand Down Expand Up @@ -112,7 +112,7 @@ def run(self):

click.echo('Building source/built distribution')

silent_run(f'{python} setup.py sdist bdist_wheel', cwd=repo_path())
silent_run('{} setup.py sdist bdist_wheel'.format(python), cwd=repo_path())

click.echo('Uploading to ' + repo_title)

Expand Down
2 changes: 1 addition & 1 deletion workspace/commands/test.py
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@ def requirements_updated():
sys.exit(1)

if not self.silent and (len(envs) > 1 or env == 'style'):
click.secho(f'{env}: OK', fg='green')
click.secho('{}: OK'.format(env), fg='green')

if self.return_output:
return output
Expand Down
2 changes: 1 addition & 1 deletion workspace/scm.py
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ def merge_branch(branch, squash=False, strategy=None):
cmd.append('--strategy=' + strategy)

current = current_branch()
message = f"Merge branch {branch} into {current} (using strategy {strategy})"
message = "Merge branch {} into {} (using strategy {})".format(branch, current, strategy)
cmd.append('-m ' + message)

silent_run(cmd)
Expand Down

0 comments on commit c3917e2

Please sign in to comment.