Page MenuHomeSoftware Heritage

Use setup_requires to install tree-sitter
ClosedPublic

Authored by vlorentz on Aug 13 2021, 5:16 PM.

Details

Summary

No need to do it manually or hardcode it in Dockerfile, this way.

This replaces D6085 and undoes D6086 because we no longer need to document it.

Diff Detail

Repository
rDSEA Archive search
Branch
master
Lint
No Linters Available
Unit
No Unit Test Coverage
Build Status
Buildable 23002
Build 35865: Phabricator diff pipeline on jenkinsJenkins console · Jenkins
Build 35864: arc lint + arc unit

Event Timeline

Build is green

Patch application report for D6088 (id=22046)

Could not rebase; Attempt merge onto 84115fa418...

Updating 84115fa..868347f
Fast-forward
 README.md |  4 ----
 setup.py  | 64 +++++++++++++++++++++++++++++++++++++++------------------------
 2 files changed, 40 insertions(+), 28 deletions(-)
Changes applied before test
commit 868347fe54a280a9baf862111fe4dd327a4b21e8
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Fri Aug 13 17:14:44 2021 +0200

    Use setup_requires to install tree-sitter
    
    No need to do it manually or hardcode it in Dockerfile, this way.

commit b419f202530dba95616d8227be2e2d1e6d9cfc8f
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Fri Aug 13 16:46:48 2021 +0200

    Remove shell scripts from setup.py
    
    and rewrite them in Python, with error checking (instead of failing silently)

See https://jenkins.softwareheritage.org/job/DSEA/job/tests-on-diff/260/ for more details.

Build is green

Patch application report for D6088 (id=22048)

Could not rebase; Attempt merge onto 84115fa418...

Updating 84115fa..372a3d3
Fast-forward
 README.md |  4 ----
 setup.py  | 61 +++++++++++++++++++++++++++++++++++++------------------------
 2 files changed, 37 insertions(+), 28 deletions(-)
Changes applied before test
commit 372a3d3cdf0c96e6247fde468d43665a3498f46c
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Fri Aug 13 17:14:44 2021 +0200

    Use setup_requires to install tree-sitter
    
    No need to do it manually or hardcode it in Dockerfile, this way.

commit b419f202530dba95616d8227be2e2d1e6d9cfc8f
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Fri Aug 13 16:46:48 2021 +0200

    Remove shell scripts from setup.py
    
    and rewrite them in Python, with error checking (instead of failing silently)

See https://jenkins.softwareheritage.org/job/DSEA/job/tests-on-diff/261/ for more details.

Not sure if I'm missing something or if something is missing on this diff (I can't find it's parent on my repo) but I have applied it and the build is still failing when the yarn command is launched which sound logical as the yarn config is still launching directly the tree-sitter command

we have tested with @vlorentz , it's ok if the yarn's build target is updated to not call the build-so and build-wasm targets and if the tree-sitter module is kept in the docker image.

Build is green

Patch application report for D6088 (id=22056)

Could not rebase; Attempt merge onto 84115fa418...

Updating 84115fa..cad6ace
Fast-forward
 README.md    |  4 ----
 package.json |  2 +-
 setup.py     | 61 ++++++++++++++++++++++++++++++++++++------------------------
 3 files changed, 38 insertions(+), 29 deletions(-)
Changes applied before test
commit cad6ace509c8fa6121dee6071da4ddc9633697da
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Fri Aug 13 17:14:44 2021 +0200

    Use setup_requires to install tree-sitter
    
    No need to do it manually, this way.

commit b419f202530dba95616d8227be2e2d1e6d9cfc8f
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Fri Aug 13 16:46:48 2021 +0200

    Remove shell scripts from setup.py
    
    and rewrite them in Python, with error checking (instead of failing silently)

See https://jenkins.softwareheritage.org/job/DSEA/job/tests-on-diff/263/ for more details.

This revision is now accepted and ready to land.Aug 16 2021, 2:49 PM