github.com/pypiserver
1
0
Fork 1
mirror of https://github.com/pypiserver/pypiserver synced 2025-02-22 19:19:37 +01:00
Code Releases Wiki Activity

Incorrect package name detection with OSX version scheme #88

Browse Source 
Fixes package name and package version handling of bdist_dumb
packages

Detects OS name boundary as specified in
http://svn.python.org/projects/python/trunk/Lib/distutils/util.py

Also detects cpN and pyN boundary

fixes #88, connected to #88
This commit is contained in:
Arcadiy Ivanov 2015-08-04 20:55:34 -04:00
parent 3665270197
commit 2d0de09d30
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pypiserver/core.py
View File

@ -34,6 +34,7 @@ def init_logging(level=None, format=None, filename=None):
if filename: if filename:
rlog.addHandler(logging.FileHandler(filename)) rlog.addHandler(logging.FileHandler(filename))
def _parse_version_parts(s): def _parse_version_parts(s):
for part in component_re.split(s): for part in component_re.split(s):
part = replace(part, part) part = replace(part, part)
@ -60,7 +61,7 @@ def parse_version(s):
# -- end of distribute's code # -- end of distribute's code
_archive_suffix_rx = re.compile( _archive_suffix_rx = re.compile(
r"(\.zip|\.tar\.gz|\.tgz|\.tar\.bz2|-py[23]\.\d-.*|\.win-amd64-py[23]\.\d\..*|\.win32-py[23]\.\d\..*|\.egg)$", r"(\.zip|\.tar\.gz|\.tgz|\.tar\.bz2|-py[23]\.\d-.*|\.win-amd64-py[23]\.\d\..*|\.win32-py[23]\.\d\..*|\.egg)$",
re.IGNORECASE) re.IGNORECASE)
wheel_file_re = re.compile( wheel_file_re = re.compile(
@ -97,9 +98,11 @@ def guess_pkgname_and_version(path):
elif '.' not in path: elif '.' not in path:
pkgname, version = path.rsplit('-', 1) pkgname, version = path.rsplit('-', 1)
else: else:
parts = re.split(r'-(?=(?i)v?\d+[\.a-z])', path) pkgname = re.split(r'-(?i)v?\d+[\.a-z]', path)[0]
pkgname = '-'.join(parts[:-1]) ver_spec = path[len(pkgname) + 1:]
version = parts[-1] parts = re.split(r'[\.\-](?=(?i)cp\d|py\d|macosx|linux|sunos|'
'solaris|irix|aix|cygwin|win)', ver_spec)
version = parts[0]
return pkgname, version return pkgname, version
@ -182,7 +185,7 @@ def store(root, filename, data):
dest_fh = open(dest_fn, "wb") dest_fh = open(dest_fn, "wb")
dest_fh.write(data) dest_fh.write(data)
dest_fh.close() dest_fh.close()
log.info("Stored package: %s", filename) log.info("Stored package: %s", filename)
return True return True
@ -293,6 +296,7 @@ The following additional options can be specified with -U:
Visit https://pypi.python.org/pypi/pypiserver for more information. Visit https://pypi.python.org/pypi/pypiserver for more information.
""") """)
def main(argv=None): def main(argv=None):
if argv is None: if argv is None:
argv = sys.argv argv = sys.argv
@ -415,7 +419,7 @@ def main(argv=None):
verbose_levels = [logging.WARNING, logging.INFO, logging.DEBUG, logging.NOTSET] verbose_levels = [logging.WARNING, logging.INFO, logging.DEBUG, logging.NOTSET]
log_level = list(zip(verbose_levels, range(verbosity)))[-1][0] log_level = list(zip(verbose_levels, range(verbosity)))[-1][0]
init_logging(level=log_level, filename=log_file, format=log_frmt) init_logging(level=log_level, filename=log_file, format=log_frmt)
if command == "update": if command == "update":
packages = frozenset(itertools.chain(*[listdir(r) for r in roots])) packages = frozenset(itertools.chain(*[listdir(r) for r in roots]))
from pypiserver import manage from pypiserver import manage
@ -435,8 +439,8 @@ def main(argv=None):
cache_control=cache_control, cache_control=cache_control,
) )
server = server or "auto" server = server or "auto"
log.info("This is pypiserver %s serving %r on http://%s:%s\n\n", log.info("This is pypiserver %s serving %r on http://%s:%s\n\n",
__version__, ", ".join(roots), host, port) __version__, ", ".join(roots), host, port)
run(app=a, host=host, port=port, server=server) run(app=a, host=host, port=port, server=server)

3
tests/test_core.py
View File

@ -40,6 +40,9 @@ files = [
("pywin32-217-55-cp27-none-win32.whl", "pywin32", "217-55"), ("pywin32-217-55-cp27-none-win32.whl", "pywin32", "217-55"),
("pywin32-217.1-cp27-none-win32.whl", "pywin32", "217.1"), ("pywin32-217.1-cp27-none-win32.whl", "pywin32", "217.1"),
("package.zip", "package", ""), ("package.zip", "package", ""),
("package-name-0.0.1.dev0.linux-x86_64.tar.gz", "package-name", "0.0.1.dev0"),
("package-name-0.0.1.dev0.macosx-10.10-intel.tar.gz", "package-name", "0.0.1.dev0"),
("package-name-0.0.1.alpha.1.win-amd64-py3.2.exe", "package-name", "0.0.1.alpha.1"),
] ]