Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issues/8786 #9074

Closed
wants to merge 42 commits into from
Closed
Show file tree
Hide file tree
Changes from 34 commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
5ff34d6
Revert "Revert "Upgrade to Pex 2.0.3. (#8704)" (#8787)"
jsirois Dec 29, 2019
f77c91d
Fix type hints.
jsirois Dec 29, 2019
70184e8
Upgrade to pex 2.1.0.
jsirois Dec 29, 2019
2263d54
Fix native tasks dependence on pex.pep425tags.
jsirois Jan 6, 2020
9fceecf
Align all setuptools versions.
jsirois Jan 7, 2020
7d28ca4
Fix imports.
jsirois Jan 7, 2020
c128c3a
Rebase, deprecation bumps, s/manylinu1/linux/ revert.
jsirois Jan 17, 2020
4736692
Merge branch 'master' into issues/8786
benjyw Feb 5, 2020
ded9c54
Fix import
benjyw Feb 6, 2020
d2e03e7
Merge branch 'master' into issues/8786
benjyw Feb 7, 2020
3a14c13
Merge branch 'master' into issues/8786
benjyw Feb 7, 2020
d893610
Merge branch 'master' into issues/8786
benjyw Feb 10, 2020
e4cfe24
Upgrade to Pex 2.1.1.
benjyw Feb 10, 2020
690cf34
Fix pex binary size.
benjyw Feb 10, 2020
15e5102
Fix MyPy complaint.
benjyw Feb 10, 2020
6521881
Lock down the remote interpreter selection paths.
benjyw Feb 10, 2020
ac08e4c
Trying something out.
benjyw Feb 10, 2020
0096ecd
Revert "Trying something out."
benjyw Feb 10, 2020
fa1048d
Trying something else.
benjyw Feb 10, 2020
d998a62
Tweak.
benjyw Feb 12, 2020
607abb0
Upgrade to Pex 2.1.2.
benjyw Feb 12, 2020
f59096d
Merge branch 'master' into issues/8786
benjyw Feb 12, 2020
78f9f4c
Fix tests.
benjyw Feb 12, 2020
4064806
Temporary test fix.
benjyw Feb 12, 2020
0e1fea1
Lint
benjyw Feb 12, 2020
e122352
Fix test.
benjyw Feb 12, 2020
62e01aa
Lint
benjyw Feb 13, 2020
0b04864
Fix test.
benjyw Feb 13, 2020
7f74bc3
Lint
benjyw Feb 13, 2020
cf86c4a
I hate life.
benjyw Feb 13, 2020
1699228
Merge branch 'master' into issues/8786
benjyw Feb 13, 2020
43c3718
Merge branch 'master' into issues/8786
benjyw Feb 17, 2020
0653f7c
Upgrade to pex 2.1.3.
benjyw Feb 17, 2020
8d462d1
Increase timeout on annoying tests.
benjyw Feb 18, 2020
b562c1a
Merge remote-tracking branch 'upstream/master' into benjyw-issues/8786
jsirois Feb 20, 2020
5472b85
Merge remote-tracking branch 'upstream/master' into benjyw-issues/8786
jsirois Feb 20, 2020
f4147d6
Upgrade to Pex 2.1.4
jsirois Feb 20, 2020
6f059a5
Fix test_pytest_run_integration.py.
jsirois Feb 20, 2020
118c4be
Add back needed constraint in test_python_repl_integration.py.
jsirois Feb 20, 2020
0a4a8ea
Simplify CheckstyleTest.install_wheel.
jsirois Feb 20, 2020
42e38a7
Merge remote-tracking branch 'upstream/master' into benjyw-issues/8786
jsirois Feb 21, 2020
6d4f506
Kill python binary path existince checking.
jsirois Feb 21, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions 3rdparty/python/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,14 @@ beautifulsoup4>=4.6.0,<4.7
cffi==1.13.2
contextlib2==0.5.5
coverage>=4.5,<4.6
# TODO remove this pin once we resolve https://github.com/pantsbuild/pants/issues/8502
cryptography==2.7
dataclasses==0.6
docutils==0.14
fasteners==0.15.0
Markdown==2.1.1
packaging==16.8
parameterized==0.6.1
pathspec==0.5.9
pex==1.6.12
pex==2.1.3
psutil==5.6.3
Pygments==2.3.1
pyopenssl==17.3.0
Expand All @@ -24,8 +22,8 @@ py_zipkin==0.18.4
requests[security]>=2.20.1
responses==0.10.4
setproctitle==1.1.10
setuptools==40.6.3
setuptools==44.0.0
toml==0.10.0
typing-extensions==3.7.4
wheel==0.31.1
wheel==0.33.6
www-authenticate==0.9.2
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ class Lambdex(PythonToolBase):
default_version = 'lambdex==0.1.3'
# TODO(John Sirois): Remove when we can upgrade to a version of lambdex with
# https://github.com/wickman/lambdex/issues/6 fixed.
default_extra_requirements = ['setuptools==40.8.0']
default_extra_requirements = ['setuptools==44.0.0']
default_entry_point = 'lambdex.bin.lambdex'
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ python_tests(
dependencies=[
'3rdparty/python:parameterized',
'3rdparty/python:pex',
'3rdparty/python:wheel',
'//:build_root',
'//:pants_pex',
'build-support/regexes',
Expand All @@ -20,4 +19,5 @@ python_tests(
'tests/python/pants_test/backend/python/tasks:python_task_test_base',
],
tags = {'partially_type_checked'},
timeout=480,
)
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,20 @@
from pants_test.backend.python.tasks.python_task_test_base import PythonTaskTestBase
from parameterized import parameterized
from pex.interpreter import PythonInterpreter
from wheel.install import WheelFile

from pants.contrib.python.checks.tasks.checkstyle.checkstyle import Checkstyle


CHECKER_RESOLVE_METHOD = [('sys.path', True), ('resolve', False)]


# IMPORTANT NOTE: This test fails if run in a chroot.
# To run it, use `./pants test.pytest --no-chroot`.
# One more reason to kill this plugin...
class CheckstyleTest(PythonTaskTestBase):

py2_constraint = 'CPython>=2.7,<3'
py3_constraint = 'CPython>=3.4,<3.6'
py3_constraint = 'CPython>=3.6,<3.8'

@staticmethod
def build_checker_wheel(root_dir: str) -> str:
Expand All @@ -50,10 +52,8 @@ def build_checker_wheel(root_dir: str) -> str:

@staticmethod
def install_wheel(wheel, root_dir):
subprocess.check_call(['pip', 'install', '--no-input', '--root', root_dir, wheel])
importable_path = os.path.join(root_dir, 'install', os.path.basename(wheel))
overrides = {path: importable_path
for path in ('purelib', 'platlib', 'headers', 'scripts', 'data')}
WheelFile(wheel).install(force=True, overrides=overrides)
return importable_path

_distdir = None
Expand Down
Loading