Merge pull request #362 from dephell/fixes

Support new pip and dephell_archive

dephell/converters/pip.py

@@ -8,7 +8,6 @@
 from dephell_discover import Root as PackageRoot
 from dephell_links import DirLink, FileLink
 from pip._internal.download import PipSession
-from pip._internal.index import PackageFinder
 from pip._internal.req import parse_requirements
 
 # app
@@ -19,6 +18,14 @@
 from .base import BaseConverter
 
 
+try:
+    # pip<20.0.1
+    from pip._internal.index import PackageFinder
+except ImportError:
+    # pip>=20.0.1
+    from pip._internal.index.package_finder import PackageFinder
+
+
 class PIPConverter(BaseConverter):
     sep = ' \\\n  '
 

dephell/converters/sdist.py

@@ -50,7 +50,7 @@ def load(self, path) -> RootDependency:
                 archive.glob('src/*.egg-info'),
                 archive.glob('src/*/*.egg-info'),
             )
-            paths = [path for path in paths if 'tests' not in path.parts]
+            paths = [path for path in paths if 'tests' not in path.member_path.parts]
             if paths:
                 root = converter.load_dir(*paths)
                 root.readme = Readme.discover(path=archive)

setup.py

@@ -9,8 +9,10 @@
 except ImportError:
     from distutils.core import setup
 
+# built-in
 import os.path
 
+
 readme = ''
 here = os.path.abspath(os.path.dirname(__file__))
 readme_path = os.path.join(here, 'README.rst')
@@ -60,8 +62,8 @@
         'dephell-markers>=1.0.0', 'dephell-pythons>=0.1.11',
         'dephell-setuptools>=0.2.1', 'dephell-shells>=0.1.3',
         'dephell-specifier>=0.1.7', 'dephell-venvs>=0.1.16',
-        'dephell-versioning', 'html5lib', 'jinja2', 'm2r', 'packaging',
-        'pip>=18.0', 'pygments', 'requests', 'ruamel.yaml', 'tomlkit', 'yaspin'
+        'dephell-versioning', 'jinja2', 'm2r', 'packaging', 'pip>=18.0',
+        'requests', 'tomlkit', 'yaspin'
     ],
     extras_require={
         "dev": [
@@ -74,7 +76,8 @@
         ],
         "full": [
             "aiofiles", "appdirs", "autopep8", "bowler", "colorama", "docker",
-            "dockerpty", "fissix", "flatdict", "graphviz", "tabulate", "yapf"
+            "dockerpty", "fissix", "flatdict", "graphviz", "html5lib",
+            "pygments", "ruamel.yaml", "tabulate", "yapf"
         ],
         "tests": ["aioresponses", "pytest", "requests-mock"]
     },