Skip to content

Commit 636bb5a

Browse files
committed
Run make valid.
Signed-off-by: Bennati, Stefano <[email protected]>
1 parent 50fb768 commit 636bb5a

File tree

2 files changed

+25
-24
lines changed

2 files changed

+25
-24
lines changed

src/python_inspector/setup_py_live_eval.py

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,27 +9,27 @@
99
#
1010
"""Generate requirements from `setup.py` and `requirements-devel.txt`."""
1111

12+
import ast
1213
import os
1314
import sys
14-
import ast
1515

1616
try:
1717
import configparser
1818
except ImportError: # pragma: no cover
1919
import ConfigParser as configparser
2020

21+
import distutils.core
22+
2123
import mock
2224
import setuptools
23-
import distutils.core
2425
from commoncode.command import pushd
2526
from packvers.requirements import Requirement
2627

2728

2829
def minver_error(pkg_name):
2930
"""Report error about missing minimum version constraint and exit."""
3031
print(
31-
'ERROR: specify minimal version of "{0}" using '
32-
'">=" or "=="'.format(pkg_name),
32+
'ERROR: specify minimal version of "{0}" using ' '">=" or "=="'.format(pkg_name),
3333
file=sys.stderr,
3434
)
3535
sys.exit(1)
@@ -68,9 +68,7 @@ def iter_requirements(level, extras, setup_file):
6868
asnames[(n.asname if n.asname is not None else n.name)] = n.name
6969
for elem in ast.walk(node):
7070
# for function imports, e.g. from setuptools import setup; setup()
71-
if isinstance(elem, ast.ImportFrom) and "setup" in [
72-
e.name for e in elem.names
73-
]:
71+
if isinstance(elem, ast.ImportFrom) and "setup" in [e.name for e in elem.names]:
7472
imports.append(elem.module)
7573
# for module imports, e.g. import setuptools; setuptools.setup(...)
7674
elif (
@@ -93,16 +91,12 @@ def iter_requirements(level, extras, setup_file):
9391
and elem.value.func.attr == "setup"
9492
):
9593
name = (
96-
str(elem.value.func.value.value.id)
97-
+ "."
98-
+ str(elem.value.func.value.attr)
94+
str(elem.value.func.value.value.id) + "." + str(elem.value.func.value.attr)
9995
)
10096
if name in asnames.keys():
10197
name = asnames[name]
10298
imports.append(name)
103-
setup_providers = [
104-
i for i in imports if i in ["distutils.core", "setuptools"]
105-
]
99+
setup_providers = [i for i in imports if i in ["distutils.core", "setuptools"]]
106100
if len(setup_providers) == 0:
107101
print(
108102
f"Warning: unable to recognize setup provider in {setup_file}: "
@@ -195,9 +189,7 @@ def iter_requirements(level, extras, setup_file):
195189
result[pkg.name] = "{0}=={1}".format(build_pkg_name(pkg), specs["~="])
196190
else:
197191
ver, _ = os.path.splitext(specs["~="])
198-
result[pkg.name] = "{0}>={1},=={2}.*".format(
199-
build_pkg_name(pkg), specs["~="], ver
200-
)
192+
result[pkg.name] = "{0}>={1},=={2}.*".format(build_pkg_name(pkg), specs["~="], ver)
201193

202194
else:
203195
if level == "min":

tests/test_setup_py_live_eval.py

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,24 @@
88
# file for more details.
99
#
1010
"""Tests for `requirements-builder` module."""
11-
import pytest
12-
1311
from os.path import abspath
1412
from os.path import dirname
1513
from os.path import join
1614

15+
import pytest
16+
1717
from python_inspector.setup_py_live_eval import iter_requirements
1818

1919
REQ = abspath(join(dirname(__file__), "./data/requirements.devel.txt"))
2020

2121

22-
@pytest.mark.parametrize("setup_py", [abspath(join(dirname(__file__), "./data/setup.txt")),
23-
abspath(join(dirname(__file__), "./data/setup-qualifiedfct.txt"))])
22+
@pytest.mark.parametrize(
23+
"setup_py",
24+
[
25+
abspath(join(dirname(__file__), "./data/setup.txt")),
26+
abspath(join(dirname(__file__), "./data/setup-qualifiedfct.txt")),
27+
],
28+
)
2429
def test_iter_requirements_with_setup_py(setup_py):
2530
"""Test requirements-builder."""
2631
# Min
@@ -33,10 +38,14 @@ def test_iter_requirements_with_setup_py(setup_py):
3338
assert list(iter_requirements("dev", [], setup_py)) == ["click>=6.1.0", "mock>=1.3.0"]
3439

3540

36-
@pytest.mark.parametrize("setup_py", [abspath(join(dirname(__file__), "./data/setup-distutils.txt")),
37-
abspath(join(dirname(__file__),
38-
"./data/setup-distutils-qualifiedfct.txt")),
39-
abspath(join(dirname(__file__), "./data/setup-distutils-asnames.txt"))])
41+
@pytest.mark.parametrize(
42+
"setup_py",
43+
[
44+
abspath(join(dirname(__file__), "./data/setup-distutils.txt")),
45+
abspath(join(dirname(__file__), "./data/setup-distutils-qualifiedfct.txt")),
46+
abspath(join(dirname(__file__), "./data/setup-distutils-asnames.txt")),
47+
],
48+
)
4049
def test_iter_requirements_with_setup_py_noreqs(setup_py):
4150
"""Test against setup.py files which import setup in different ways"""
4251
# Min

0 commit comments

Comments
 (0)