Skip to content

match python versions that have major/minor with no dot #67

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.

Sign up for GitHub

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

Merged
peterbe merged 2 commits into from
Jun 4, 2018
Merged

match python versions that have major/minor with no dot #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
33b4148
match pythonversion that have major/minor with no dot
danfoster Jun 4, 2018
8dcb82d
fix tests
danfoster Jun 4, 2018
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
1 change: 1 addition & 0 deletions hashin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,7 @@ def expand_python_version(version):
'cp{major}{minor}',
'py{major}',
'py{major}.{minor}',
'py{major}{minor}',
'source',
'py2.py3',
]
Expand Down
4 changes: 2 additions & 2 deletions tests/test_cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -923,9 +923,9 @@ def test_release_url_metadata_python(self):

def test_expand_python_version(self):
self.assertEqual(sorted(hashin.expand_python_version('2.7')),
['2.7', 'cp27', 'py2', 'py2.7', 'py2.py3', 'source'])
['2.7', 'cp27', 'py2', 'py2.7', 'py2.py3', 'py27', 'source'])
self.assertEqual(sorted(hashin.expand_python_version('3.5')),
['3.5', 'cp35', 'py2.py3', 'py3', 'py3.5', 'source'])
['3.5', 'cp35', 'py2.py3', 'py3', 'py3.5', 'py35', 'source'])

@cleanup_tmpdir('hashin*')
@mock.patch('hashin.urlopen')
Expand Down