Merge branch 'pypy'

.gitignore

@@ -7,15 +7,15 @@ dist/
 build/
 pip-wheel-metadata/
 
-Pipfile.lock
-poetry.lock
-poetry.lock.toml
+/Pipfile.lock
+/poetry.lock
+/poetry.lock.toml
 
 .tox
 .mypy_cache
 
 .dephell_cache/
 .dephell_report/
 
-README.rst
-setup.py
+/README.rst
+/setup.py

.travis.yml

@@ -1,17 +1,20 @@
 language: python
 
 before_install:
+  # show a little bit more information about environment
   - sudo apt-get install -y tree
   - env
   - tree
-
+  # install DepHell
   # - curl https://raw.githubusercontent.com/dephell/dephell/master/install.py | /opt/python/3.6/bin/python
+  # https://github.com/travis-ci/travis-ci/issues/8589
   - /opt/python/3.6/bin/python install.py
+  - dephell inspect self
 install:
-  - dephell venv create --env=$ENV --python="/opt/python/$TRAVIS_PYTHON_VERSION/bin/python" --level=DEBUG
-  - dephell deps install --env=$ENV --level=DEBUG
+  - dephell venv create --env=$ENV --python="/opt/python/$TRAVIS_PYTHON_VERSION/bin/python" --level=DEBUG --traceback
+  - dephell deps install --env=$ENV --level=DEBUG --traceback
 script:
-  - dephell venv run --env=$ENV --level=DEBUG
+  - dephell venv run --env=$ENV --level=DEBUG --traceback
 
 matrix:
   include:
@@ -21,6 +24,8 @@ matrix:
       env: ENV=pytest
     - python: "3.7-dev"
       env: ENV=pytest
+    - python: "pypy3.5"
+      env: ENV=pytest
 
     - python: "3.6"
       env: ENV=flake8

README.md

@@ -1,6 +1,7 @@
 # ![DepHell](./assets/logo.png)
 
 [![MIT License](https://img.shields.io/pypi/l/dephell.svg)](https://github.com/dephell/dephell/blob/master/LICENSE)
+[![Travis CI](https://travis-ci.org/dephell/dephell.svg?branch=master)](https://travis-ci.org/dephell/dephell)
 [![Powered by DepHell](./assets/badge.svg)](./docs/badge.md)
 
 **DepHell** -- dependency management for Python.

dephell/commands/__init__.py

@@ -21,6 +21,7 @@
 from .package_downloads import PackageDownloadsCommand
 from .package_install import PackageInstallCommand
 from .package_list import PackageListCommand
+from .package_releases import PackageReleasesCommand
 from .package_search import PackageSearchCommand
 from .package_show import PackageShowCommand
 from .project_build import ProjectBuildCommand
@@ -56,6 +57,7 @@
     'PackageDownloadsCommand',
     'PackageInstallCommand',
     'PackageListCommand',
+    'PackageReleasesCommand',
     'PackageSearchCommand',
     'PackageShowCommand',
     'ProjectBuildCommand',
@@ -94,6 +96,7 @@
     'package downloads': PackageDownloadsCommand,
     'package install': PackageInstallCommand,
     'package list': PackageListCommand,
+    'package releases': PackageReleasesCommand,
     'package search': PackageSearchCommand,
     'package show': PackageShowCommand,
     'project build': ProjectBuildCommand,

dephell/commands/inspect_self.py

@@ -7,6 +7,8 @@
 from ..__version__ import __version__
 from ..actions import make_json, get_path_size, format_size
 from ..config import builders
+from ..constants import DEPHELL_ECOSYSTEM
+from ..converters import InstalledConverter
 from .base import BaseCommand
 
 
@@ -27,10 +29,16 @@ def get_parser(cls) -> ArgumentParser:
         return parser
 
     def __call__(self) -> bool:
+        installed = InstalledConverter().load(names=DEPHELL_ECOSYSTEM)
+        versions = dict()
+        for dep in installed.dependencies:
+            versions[dep.name] = str(dep.constraint).replace('=', '')
+
         data = dict(
             path=str(Path(__file__).parent.parent),
             python=sys.executable,
             version=__version__,
+            versions=versions,
             cache=format_size(get_path_size(Path(self.config['cache']['path']))),
         )
         print(make_json(data=data, key=self.config.get('filter')))

dephell/commands/package_releases.py

@@ -0,0 +1,43 @@
+# built-in
+from argparse import ArgumentParser
+
+# app
+from ..actions import get_package, make_json
+from ..config import builders
+from ..repositories import WareHouseRepo
+from .base import BaseCommand
+
+
+class PackageReleasesCommand(BaseCommand):
+    """Show package releases.
+
+    https://dephell.readthedocs.io/en/latest/cmd-package-releases.html
+    """
+    @classmethod
+    def get_parser(cls) -> ArgumentParser:
+        parser = ArgumentParser(
+            prog='dephell package releases',
+            description=cls.__doc__,
+        )
+        builders.build_config(parser)
+        builders.build_output(parser)
+        builders.build_api(parser)
+        builders.build_other(parser)
+        parser.add_argument('name', help='package name')
+        return parser
+
+    def __call__(self) -> bool:
+        dep = get_package(self.args.name)
+        repo = WareHouseRepo()
+        releases = repo.get_releases(dep)
+
+        data = []
+        for release in releases:
+            data.append(dict(
+                date=str(release.time.date()),
+                version=str(release.version),
+                python=str(release.python) if release.python else '*',
+            ))
+
+        print(make_json(data=data, key=self.config.get('filter')))
+        return True

dephell/commands/venv_create.py

@@ -38,7 +38,10 @@ def __call__(self) -> bool:
 
         self.logger.info('creating venv for project...', extra=dict(path=venv.path))
         python = get_python(self.config)
-        self.logger.debug('choosen python', extra=dict(version=python.version))
+        self.logger.info('chosen python', extra=dict(
+            version=python.version,
+            path=str(python.path),
+        ))
         venv.create(python_path=python.path)
         self.logger.info('venv created', extra=dict(path=venv.path))
         return True

dephell/constants.py

@@ -109,3 +109,16 @@ class JoinTypes(Enum):
     calver='{}.{}'.format(date.today().year, date.today().month),
     roman='I',
 ))
+
+
+DEPHELL_ECOSYSTEM = (
+    'dephell_archive',
+    'dephell_discover',
+    'dephell_licenses',
+    'dephell_links',
+    'dephell_markers',
+    'dephell_pythons',
+    'dephell_shells',
+    'dephell_specifier',
+    'dephell_venvs',
+)

dephell/context_tools.py

@@ -1,5 +1,6 @@
 # built-in
 import os
+import sys
 from contextlib import contextmanager
 
 
@@ -29,8 +30,20 @@ def nullcontext(value=None):
 def env_var(key, value):
     old_value = os.environ.get(key)
     os.environ[key] = value
-    yield
-    if old_value is None:
-        del os.environ[key]
-    else:
-        os.environ[key] = old_value
+    try:
+        yield
+    finally:
+        if old_value is None:
+            del os.environ[key]
+        else:
+            os.environ[key] = old_value
+
+
+@contextmanager
+def override_argv(value):
+    old_value = sys.argv
+    sys.argv = value
+    try:
+        yield
+    finally:
+        sys.argv = old_value

dephell/controllers/readme.py

@@ -18,7 +18,7 @@
 
 readme = ''
 here = os.path.abspath(os.path.dirname(__file__))
-with open(os.path.join(here, '${fname}'), encoding='utf-8') as stream:
+with open(os.path.join(here, '${fname}'), 'r', 'utf-8') as stream:
     readme = stream.read()
 """
 

dephell/converters/egginfo.py

@@ -48,16 +48,24 @@ def load(self, path) -> RootDependency:
             return self.loads(stream.read())
 
     def load_dir(self, *paths) -> RootDependency:
+        # drop duplicates
+        paths = list({str(path): path for path in paths}.values())
         if not paths:
             raise FileNotFoundError('cannot find egg-info')
         # maybe it's possible, so we will have to process it
         if len(paths) > 1:
             min_parts = min(len(path.parts) for path in paths)
             paths = [path for path in paths if len(path.parts) == min_parts]
             if len(paths) > 1:
-                raise FileExistsError('too many egg-info', *paths)
+                raise FileExistsError('too many egg-info', paths)
         path = paths[0]
 
+        # sometimes pypy stores only pkg-info as *.egg-info file
+        if not (path / 'PKG-INFO').exists():
+            with path.open('r') as stream:
+                content = stream.read()
+            return self.parse_info(content)
+
         # pkg-info
         with (path / 'PKG-INFO').open('r') as stream:
             content = stream.read()

dephell/converters/setuppy.py

@@ -1,13 +1,16 @@
 # built-in
 from collections import defaultdict
 from distutils.core import run_setup
+from io import StringIO
 from itertools import chain
+from logging import getLogger
 from pathlib import Path
 from typing import Optional
 
 # external
 from dephell_specifier import RangeSpecifier
 from packaging.requirements import Requirement
+from setuptools.dist import Distribution
 
 # app
 from ..context_tools import chdir
@@ -27,6 +30,9 @@
     fix_code = None
 
 
+logger = getLogger('dephell.converters.setuppy')
+
+
 TEMPLATE = """
 # -*- coding: utf-8 -*-
 
@@ -65,8 +71,11 @@ def can_parse(self, path: Path, content: Optional[str] = None) -> bool:
     @classmethod
     def load(cls, path) -> RootDependency:
         path = Path(str(path))
-        with chdir(path.parent):
-            info = run_setup(path.name)
+
+        info = cls._execute(path=path)
+        if info is None:
+            with chdir(path.parent):
+                info = run_setup(path.name)
 
         root = RootDependency(
             raw_name=cls._get(info, 'name'),
@@ -99,7 +108,7 @@ def load(cls, path) -> RootDependency:
 
         # entrypoints
         entrypoints = []
-        for group, content in getattr(info, 'entry_points', {}).items():
+        for group, content in (getattr(info, 'entry_points', {}) or {}).items():
             for entrypoint in content:
                 entrypoints.append(EntryPoint.parse(text=entrypoint, group=group))
         root.entrypoints = tuple(entrypoints)
@@ -215,6 +224,31 @@ def dumps(self, reqs, project: RootDependency, content=None) -> str:
 
     # private methods
 
+    @staticmethod
+    def _execute(path: Path):
+        source = path.read_text('utf-8')
+        new_source = source.replace('setup(', '_dist = dict(')
+        if new_source == source:
+            logger.error('cannot modify source')
+            return None
+
+        globe = {
+            '__file__': str(path),
+            '__name__': '__main__',
+            'open': lambda fname, *args, **kwargs: StringIO(fname),
+        }
+        with chdir(path.parent):
+            try:
+                exec(compile(new_source, path.name, 'exec'), globe)
+            except Exception as e:
+                logger.error('{}: {}'.format(type(e).__name__, str(e)))
+
+        dist = globe.get('_dist')
+        if dist is None:
+            logger.error('distribution was not called')
+            return None
+        return Distribution(dist)
+
     @staticmethod
     def _get(msg, name: str) -> str:
         value = getattr(msg.metadata, name, None)

pyproject.toml

@@ -43,6 +43,12 @@ tests = ["tests", "README.md"]
 # run command `pytest`
 command = "pytest tests/"
 
+[tool.dephell.pypy]
+from = {format = "poetry", path = "pyproject.toml"}
+# force python interpreter for env
+python = "pypy3"
+command = "pytest -x tests/"
+
 # Install `docs` extra dependencies  in the separated venv and run sphinx:
 # $ dephell venv create --env=docs
 # $ dephell deps install --env=docs

tests/requirements/egg-info/setup.py

@@ -0,0 +1,35 @@
+# built-in
+from io import open
+from os import path
+
+# external
+from setuptools import setup
+
+
+here = path.abspath(path.dirname(__file__))
+with open(path.join(here, 'README.md'), encoding='utf-8') as f:
+    long_description = f.read()
+
+
+# TODO: more info
+
+setup(
+    name='dephell',
+    version='0.2.0',
+    description='Dependency resolution for Python',
+    long_description=long_description,
+    long_description_content_type='text/markdown',
+    url='https://github.com/orsinium/dephell',
+    author='orsinium',
+
+    packages=['dephell'],
+    install_requires=[
+        'attrs',
+        'cached_property',
+        'packaging',
+        'requests',
+    ],
+    entry_points={
+        'console_scripts': ['dephell = dephell.cli:main'],
+    },
+)