Port from cffi to the cpython crate.

[ci skip-jvm-tests]
pantsbuild · May 17, 2020 · 95ab23b · 95ab23b
1 parent f48b32a
commit 95ab23b
Show file tree

Hide file tree

Showing 27 changed files with 1,686 additions and 3,088 deletions.
diff --git a/3rdparty/python/requirements.txt b/3rdparty/python/requirements.txt
@@ -1,6 +1,5 @@
 ansicolors==1.1.8
 beautifulsoup4>=4.6.0,<4.7
-cffi==1.14.0
 coverage>=4.5,<4.6
 dataclasses==0.6
 docutils>=0.15,<0.17

diff --git a/build-support/bin/native/bootstrap_cffi.sh b/build-support/bin/native/bootstrap_cffi.sh
diff --git a/src/python/pants/backend/python/rules/pex.py b/src/python/pants/backend/python/rules/pex.py
@@ -300,7 +300,7 @@ async def create_pex(
     argv.extend(pex_debug.iter_pex_args())
 
     if python_setup.resolver_jobs:
-        argv.extend(["--jobs", python_setup.resolver_jobs])
+        argv.extend(["--jobs", str(python_setup.resolver_jobs)])
 
     if python_setup.manylinux:
         argv.extend(["--manylinux", python_setup.manylinux])

diff --git a/src/python/pants/cache/artifact.py b/src/python/pants/cache/artifact.py
@@ -115,8 +115,6 @@ def extract(self):
         # Note(yic): unlike the python implementation before, now we do not update self._relpath
         # after the extraction.
         try:
-            self.NATIVE_BINARY.decompress_tarball(
-                self._tarfile.encode(), self.artifact_extraction_root.encode()
-            )
+            self.NATIVE_BINARY.decompress_tarball(self._tarfile, self.artifact_extraction_root)
         except Exception as e:
             raise ArtifactError("Extracting artifact failed:\n{}".format(e))
diff --git a/src/python/pants/engine/internals/BUILD b/src/python/pants/engine/internals/BUILD
@@ -115,7 +115,6 @@ python_library(
   sources=['native.py'],
   dependencies=[
     ':native_engine_so',
-    '3rdparty/python:cffi',
     '3rdparty/python:setuptools',
     'src/python/pants/engine:addresses',
     'src/python/pants/engine:fs',

diff --git a/src/python/pants/engine/internals/engine_test.py b/src/python/pants/engine/internals/engine_test.py
@@ -202,8 +202,6 @@ def test_include_trace_error_raises_error_with_trace(self):
                   Computing Task({fmt_rust_function(nested_raise)}(), <{__name__}.B object at 0xEEEEEEEEE>, A, true)
                     Throw(An exception for B)
                       Traceback (most recent call last):
-                        File LOCATION-INFO, in call
-                          val = func(*args)
                         File LOCATION-INFO, in nested_raise
                           fn_raises(x)
                         File LOCATION-INFO, in fn_raises