fnexe.com/pypiserver
1
0
Fork 0
forked from github.com/pypiserver
Code Pull Requests Activity

Merge pull request #1 from pypiserver/elboerto-tests

Browse Source 
Tests and Refactoring
This commit is contained in:
Robert Rode 2018-08-06 18:14:24 +02:00 committed by GitHub
commit c79cb37893
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 183 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.rst
View File

@ -1,7 +1,7 @@
Changelog
=========
Next Release
1.2.3 (2018-08-04)
------------------
- MAINT: Remove broken downloads badge (thanks @hugovk, #209)

4
README.rst
View File

@ -9,8 +9,8 @@ pypiserver - minimal PyPI server for use with pip/easy_install
==============================================================================
|pypi-ver| |travis-status| |dependencies| |python-ver| |proj-license|
:Version: 1.2.2
:Date: 2018-06-12 11:49:30
:Version: 1.2.3
:Date: 2018-08-04 11:49:30
:Source: https://github.com/pypiserver/pypiserver
:PyPI: https://pypi.org/project/pypiserver/
:Travis: https://travis-ci.org/pypiserver/pypiserver

4
pypiserver/__init__.py
View File

@ -2,9 +2,9 @@ import os
import re as _re
import sys
version = __version__ = "1.2.2"
version = __version__ = "1.2.3"
__version_info__ = tuple(_re.split('[.-]', __version__))
__updated__ = "2018-06-12 20:15:10"
__updated__ = "2018-08-04 12:31:43"
__title__ = "pypiserver"
__summary__ = "A minimal PyPI server for use with pip/easy_install."

81
pypiserver/manage.py
View File

@ -1,11 +1,16 @@
import sys
"""Management operations for pypiserver."""
from __future__ import absolute_import, print_function, unicode_literals
import itertools
import os
import sys
from distutils.version import LooseVersion
from subprocess import call
from . import core
import itertools
import pip
from distutils.version import StrictVersion
from . import core
if sys.version_info >= (3, 0):
from xmlrpc.client import Server
@ -136,24 +141,64 @@ def find_updates(pkgset, stable_only=True):
return need_update
class PipCmd(object):
"""Methods for generating pip commands."""
@staticmethod
def update_root(pip_version):
"""Yield an appropriate root command depending on pip version."""
# legacy_pip = StrictVersion(pip_version) < StrictVersion('10.0')
legacy_pip = LooseVersion(pip_version) < LooseVersion('10.0')
for part in ('pip', '-q'):
yield part
yield 'install' if legacy_pip else 'download'
@staticmethod
def update(cmd_root, destdir, pkg_name, pkg_version,
index='https://pypi.org/simple'):
"""Yield an update command for pip."""
for part in cmd_root:
yield part
for part in ('--no-deps', '-i', index, '-d', destdir):
yield part
yield '{}=={}'.format(pkg_name, pkg_version)
def update_package(pkg, destdir, dry_run=False):
"""Print and optionally execute a package update."""
print(
"# update {0.pkgname} from {0.replaces.version} to "
"{0.version}".format(pkg)
)
cmd = tuple(
PipCmd.update(
PipCmd.update_root(pip.__version__),
destdir or os.path.dirname(pkg.replaces.fn),
pkg.pkgname,
pkg.version
)
)
print("{}\n".format(" ".join(cmd)))
if not dry_run:
call(cmd)
def update(pkgset, destdir=None, dry_run=False, stable_only=True):
"""Print and optionally execute pip update commands.
:param pkgset: the set of currently available packages
:param str destdir: the destination directory for downloads
:param dry_run: whether commands should be executed (rather than
just being printed)
:param stable_only: whether only stable (non prerelease) updates
should be considered.
"""
need_update = find_updates(pkgset, stable_only=stable_only)
for pkg in sorted(need_update, key=lambda x: x.pkgname):
sys.stdout.write("# update %s from %s to %s\n" %
(pkg.pkgname, pkg.replaces.version, pkg.version))
update_package(pkg, destdir, dry_run=dry_run)
if StrictVersion(pip.__version__) < StrictVersion('10.0.0'):
cmd = ["pip", "-q", "install", "--no-deps", "-i", "https://pypi.org/simple",
"-d", destdir or os.path.dirname(pkg.replaces.fn),
"%s==%s" % (pkg.pkgname, pkg.version)]
else:
cmd = ["pip", "-q", "download", "--no-deps", "-i", "https://pypi.org/simple",
"-d", destdir or os.path.dirname(pkg.replaces.fn),
"%s==%s" % (pkg.pkgname, pkg.version)]
sys.stdout.write("%s\n\n" % (" ".join(cmd),))
if not dry_run:
call(cmd)
def update_all_packages(roots, destdir=None, dry_run=False, stable_only=True):
packages = frozenset(itertools.chain(*[core.listdir(r) for r in roots]))

121
tests/test_manage.py
View File

@ -1,12 +1,34 @@
#! /usr/bin/env py.test
#!/usr/bin/env py.test
"""Tests for manage.py."""
import pytest, py
from pypiserver.core import parse_version, PkgFile, guess_pkgname_and_version
from pypiserver.manage import is_stable_version, build_releases, filter_stable_releases, filter_latest_pkgs
from __future__ import absolute_import, print_function, unicode_literals
try:
from unittest.mock import Mock
except ImportError:
from mock import Mock
import py
import pytest
from pypiserver import manage
from pypiserver.core import (
PkgFile,
guess_pkgname_and_version,
parse_version,
)
from pypiserver.manage import (
PipCmd,
build_releases,
filter_stable_releases,
filter_latest_pkgs,
is_stable_version,
update_package,
)
def touch_files(root, files):
root = py.path.local(root)
root = py.path.local(root) # pylint: disable=no-member
for f in files:
root.join(f).ensure()
@ -14,7 +36,7 @@ def touch_files(root, files):
def pkgfile_from_path(fn):
pkgname, version = guess_pkgname_and_version(fn)
return PkgFile(pkgname=pkgname, version=version,
root=py.path.local(fn).parts()[1].strpath,
root=py.path.local(fn).parts()[1].strpath, # noqa pylint: disable=no-member
fn=fn)
@ -69,3 +91,90 @@ def test_filter_latest_pkgs_case_insensitive():
pkgs = [pkgfile_from_path(x) for x in paths]
assert frozenset(filter_latest_pkgs(pkgs)) == frozenset(pkgs[1:])
@pytest.mark.parametrize('pip_ver, cmd_type', (
('10.0.0', 'd'),
('10.0.0rc10', 'd'),
('10.0.0b10', 'd'),
('10.0.0a3', 'd'),
('10.0.0.dev8', 'd'),
('10.0.0.dev8', 'd'),
('18.0', 'd'),
('9.9.8', 'i'),
('9.9.8rc10', 'i'),
('9.9.8b10', 'i'),
('9.9.8a10', 'i'),
('9.9.8.dev10', 'i'),
('9.9', 'i'),
))
def test_pip_cmd_root(pip_ver, cmd_type):
"""Verify correct determination of the command root by pip version."""
exp_cmd = (
'pip',
'-q',
'install' if cmd_type == 'i' else 'download',
)
assert tuple(PipCmd.update_root(pip_ver)) == exp_cmd
def test_pip_cmd_update():
"""Verify the correct determination of a pip command."""
index = 'https://pypi.org/simple'
destdir = 'foo/bar'
pkg_name = 'mypkg'
pkg_version = '12.0'
cmd_root = ('pip', '-q', 'download')
exp_cmd = cmd_root + (
'--no-deps',
'-i',
index,
'-d',
destdir,
'{}=={}'.format(pkg_name, pkg_version)
)
assert exp_cmd == tuple(
PipCmd.update(cmd_root, destdir, pkg_name, pkg_version)
)
def test_pip_cmd_update_index_overridden():
"""Verify the correct determination of a pip command."""
index = 'https://pypi.org/complex'
destdir = 'foo/bar'
pkg_name = 'mypkg'
pkg_version = '12.0'
cmd_root = ('pip', '-q', 'download')
exp_cmd = cmd_root + (
'--no-deps',
'-i', index,
'-d', destdir,
'{}=={}'.format(pkg_name, pkg_version)
)
assert exp_cmd == tuple(
PipCmd.update(cmd_root, destdir, pkg_name, pkg_version, index=index)
)
def test_update_package(monkeypatch):
"""Test generating an update command for a package."""
monkeypatch.setattr(manage, 'call', Mock())
pkg = PkgFile('mypkg', '1.0', replaces=PkgFile('mypkg', '0.9'))
update_package(pkg, '.')
manage.call.assert_called_once_with(( # pylint: disable=no-member
'pip',
'-q',
'download',
'--no-deps',
'-i', 'https://pypi.org/simple',
'-d', '.',
'mypkg==1.0',
))
def test_update_package_dry_run(monkeypatch):
"""Test generating an update command for a package."""
monkeypatch.setattr(manage, 'call', Mock())
pkg = PkgFile('mypkg', '1.0', replaces=PkgFile('mypkg', '0.9'))
update_package(pkg, '.', dry_run=True)
assert not manage.call.mock_calls # pylint: disable=no-member