Skip to content

Commit

Permalink
Merge pull request #38 from bsiggers/master
Browse files Browse the repository at this point in the history
Added support for wheel files with local version (pep-0440)
  • Loading branch information
asottile committed Jul 10, 2018
2 parents 3a2f5c1 + b204b20 commit 4a8edf8
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
2 changes: 1 addition & 1 deletion dumb_pypi/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ def create(
upload_timestamp: Optional[int] = None,
uploaded_by: Optional[str] = None,
) -> 'Package':
if not re.match('[a-zA-Z0-9_\-\.]+$', filename) or '..' in filename:
if not re.match(r'[a-zA-Z0-9_\-\.\+]+$', filename) or '..' in filename:
raise ValueError(f'Unsafe package name: {filename}')

name, version = guess_name_version_from_filename(filename)
Expand Down
5 changes: 5 additions & 0 deletions tests/main_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,11 @@ def test_package_info_all_info():
}


def test_package_info_wheel_with_local_version():
ret = main.Package.create(filename='f-1.0+local-py3-none-any.whl')
assert ret.version == '1.0+local'


def test_package_info_minimal_info():
ret = main.Package.create(filename='f-1.0.tar.gz').json_info('/prefix')
assert ret == {'filename': 'f-1.0.tar.gz', 'url': '/prefix/f-1.0.tar.gz'}
Expand Down

0 comments on commit 4a8edf8

Please sign in to comment.