Switched pylint/black to ruff (#295)

benedikt-schesch · May 19, 2024 · a606032 · a606032
1 parent f927909
commit a606032
Show file tree

Hide file tree

Showing 2,258 changed files with 9,461 additions and 9,433 deletions.
diff --git a/.github/workflows/check-style.yml b/.github/workflows/check-style.yml
@@ -8,7 +8,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-    - uses: psf/black@stable
     - name: Set up Python 3.12
       uses: actions/setup-python@v5
       with:

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v4.6.0
     hooks:
     -   id: check-added-large-files
         args: ['--maxkb=20000']
@@ -44,12 +44,9 @@ repos:
     -   id: rst-directive-colons
     -   id: rst-inline-touching-normal
     -   id: text-unicode-replacement-char
--   repo: https://github.com/psf/black
-    rev: 23.11.0
+-   repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.4.4
     hooks:
-    -   id: black
--   repo: https://github.com/PyCQA/pylint
-    rev: v3.0.1
-    hooks:
-    -   id: pylint
-        args: ['--disable=R0801,E0401,W0718,W0719,W1510,C0103,W0621']
+    -   id: ruff
+        args: [ --fix ]
+    -   id: ruff-format
diff --git a/Makefile b/Makefile
@@ -23,12 +23,12 @@ showvars:
 	@echo "PYTHON_FILES=${PYTHON_FILES}"
 
 python-style:
-	black ${PYTHON_FILES}
-	pylint -f parseable --disable=W,invalid-name,c-extension-no-member,duplicate-code ${PYTHON_FILES}
+	ruff format ${PYTHON_FILES}
+	ruff check ${PYTHON_FILES} --fix
 
 check-python-style:
-	black ${PYTHON_FILES} --check
-	pylint -f parseable --disable=W,invalid-name --disable=W,duplicate-code ${PYTHON_FILES}
+	ruff format ${PYTHON_FILES} --check
+	ruff check ${PYTHON_FILES}
 
 # This target deletes files that are not committed to version control.
 clean:

diff --git a/README.md b/README.md
@@ -1,16 +1,15 @@
 # Evaluation of VCS merging algorithms
 
 ![small-test](https://github.com/benedikt-schesch/AST-Merging-Evaluation/actions/workflows/small-test.yml/badge.svg)
-
 ![check-style](https://github.com/benedikt-schesch/AST-Merging-Evaluation/actions/workflows/check-style.yml/badge.svg)
+![check-reproducibility](https://github.com/benedikt-schesch/AST-Merging-Evaluation/actions/workflows/check-reproducibility.yml/badge.svg)
 
 ## Requirements
 
 ### Python
 
 To install all the Python requirements, create a conda or mamba environment:
 
-
 With conda:
 
 ```bash

diff --git a/environment.yml b/environment.yml
@@ -25,12 +25,11 @@ dependencies:
       - matplotlib==3.8.4
       - numpy==1.26.4
       - pandas==2.2.2
-      - pylint==3.1.0
+      - ruff==0.4.4
       - GitPython==3.1.43
       - prettytable==3.10.0
       - seaborn==0.13.2
       - rich==13.7.1
-      - black==24.4.2
       - psutil==5.9.8
       - termplotlib==0.3.9
       - loguru==0.7.2
diff --git a/results/combined/merges_analyzer_histograms.pdf b/results/combined/merges_analyzer_histograms.pdf
diff --git a/results/combined/merges_tested/abel533/echarts.csv b/results/combined/merges_tested/abel533/echarts.csv
@@ -1,2 +1,2 @@
 idx,branch_name,merge,left,right,notes,test merge,diff contains java file,left_tree_fingerprint,left parent test result,right_tree_fingerprint,right parent test result,parents pass,sampled for testing,gitmerge_ort,gitmerge_ort_merge_fingerprint,gitmerge_ort_ignorespace,gitmerge_ort_ignorespace_merge_fingerprint,gitmerge_recursive_histogram,gitmerge_recursive_histogram_merge_fingerprint,gitmerge_recursive_ignorespace,gitmerge_recursive_ignorespace_merge_fingerprint,gitmerge_recursive_minimal,gitmerge_recursive_minimal_merge_fingerprint,gitmerge_recursive_myers,gitmerge_recursive_myers_merge_fingerprint,gitmerge_recursive_patience,gitmerge_recursive_patience_merge_fingerprint,gitmerge_resolve,gitmerge_resolve_merge_fingerprint,gitmerge_ort_adjacent,gitmerge_ort_adjacent_merge_fingerprint,gitmerge_ort_imports,gitmerge_ort_imports_merge_fingerprint,gitmerge_ort_imports_ignorespace,gitmerge_ort_imports_ignorespace_merge_fingerprint,git_hires_merge,git_hires_merge_merge_fingerprint,spork,spork_merge_fingerprint,intellimerge,intellimerge_merge_fingerprint
-9,refs/heads/master,c6ad45b63a9ee7e20b45c4176695a72efa31606a,69757fc487bf247b74339de637cb48ed296e5a67,721cb6fa847595de1b4b58fb80ec6079d15d9a95,,True,True,05376667afdba29e22c97c992edaa40bf1866e03660bb315bdf828004927fae8,Tests_passed,0dd38c0c7dc253f9adc1ed53fbf0e6b43aca5ad15576b740bffdc47c97a43a47,Tests_passed,True,True,Merge_failed,4702ab428931635d20d30f4091e3cce5d36aa4be418344382a53d6c16bb92692,Merge_failed,4702ab428931635d20d30f4091e3cce5d36aa4be418344382a53d6c16bb92692,Merge_failed,4702ab428931635d20d30f4091e3cce5d36aa4be418344382a53d6c16bb92692,Merge_failed,4702ab428931635d20d30f4091e3cce5d36aa4be418344382a53d6c16bb92692,Merge_failed,4702ab428931635d20d30f4091e3cce5d36aa4be418344382a53d6c16bb92692,Merge_failed,4702ab428931635d20d30f4091e3cce5d36aa4be418344382a53d6c16bb92692,Merge_failed,4702ab428931635d20d30f4091e3cce5d36aa4be418344382a53d6c16bb92692,Merge_failed,29326553a8028f23a6604f8ec4736c8e60bfedd7ee241f8f43a324a7a0cdd8e6,Merge_failed,d248842099ea25d2e20f49e617634a46ab4024dfb985523d95bccb6c5ec7b2bb,Merge_failed,4702ab428931635d20d30f4091e3cce5d36aa4be418344382a53d6c16bb92692,Merge_failed,4702ab428931635d20d30f4091e3cce5d36aa4be418344382a53d6c16bb92692,Merge_failed,9c57575dab347e2e37bbf92c19a55a137bd5648fe61399131d68744e0801e3b6,Merge_failed,6a56b2c32156b5a3b892638ab2e7654f00fdb4c08c5b25fab88caf1c1db3bc09,Merge_failed,d248842099ea25d2e20f49e617634a46ab4024dfb985523d95bccb6c5ec7b2bb
+9,refs/heads/master,c6ad45b63a9ee7e20b45c4176695a72efa31606a,69757fc487bf247b74339de637cb48ed296e5a67,721cb6fa847595de1b4b58fb80ec6079d15d9a95,,True,True,05376667afdba29e22c97c992edaa40bf1866e03660bb315bdf828004927fae8,Tests_passed,0dd38c0c7dc253f9adc1ed53fbf0e6b43aca5ad15576b740bffdc47c97a43a47,Tests_passed,True,True,Merge_failed,4702ab428931635d20d30f4091e3cce5d36aa4be418344382a53d6c16bb92692,Merge_failed,4702ab428931635d20d30f4091e3cce5d36aa4be418344382a53d6c16bb92692,Merge_failed,4702ab428931635d20d30f4091e3cce5d36aa4be418344382a53d6c16bb92692,Merge_failed,4702ab428931635d20d30f4091e3cce5d36aa4be418344382a53d6c16bb92692,Merge_failed,4702ab428931635d20d30f4091e3cce5d36aa4be418344382a53d6c16bb92692,Merge_failed,4702ab428931635d20d30f4091e3cce5d36aa4be418344382a53d6c16bb92692,Merge_failed,4702ab428931635d20d30f4091e3cce5d36aa4be418344382a53d6c16bb92692,Merge_failed,29326553a8028f23a6604f8ec4736c8e60bfedd7ee241f8f43a324a7a0cdd8e6,Merge_failed,d248842099ea25d2e20f49e617634a46ab4024dfb985523d95bccb6c5ec7b2bb,Merge_failed,f86893cf92b7b9f6bf70f2fd43463f0fb1119e4e2a2f0130001f6f2f823b4e75,Merge_failed,f86893cf92b7b9f6bf70f2fd43463f0fb1119e4e2a2f0130001f6f2f823b4e75,Merge_failed,9c57575dab347e2e37bbf92c19a55a137bd5648fe61399131d68744e0801e3b6,Merge_failed,6a56b2c32156b5a3b892638ab2e7654f00fdb4c08c5b25fab88caf1c1db3bc09,Merge_failed,d248842099ea25d2e20f49e617634a46ab4024dfb985523d95bccb6c5ec7b2bb
diff --git a/results/combined/merges_tested/adangel/pmd.csv b/results/combined/merges_tested/adangel/pmd.csv
@@ -2,5 +2,5 @@ idx,branch_name,merge,left,right,notes,left_tree_fingerprint,left parent test re
 95,refs/heads/master,f9c6b0b08dac300305daf222438c8b3dd54fc535,fede0e28fb7dfa69854d8a7d520146baa7f68b6d,1c08f946917a938669cfcf011e238dae028b3898,,330e203411bd99643160a55163acd32680857ea38cd1137a159605b8c51e0c61,Tests_passed,fd7ff9c7a6de200bf898e31b860b96e77ee68bd3a1395b7da382d93e1d1a4bcf,Tests_passed,True,True,True,True,Merge_failed,ad6ba226c6a4e564760653191ff0385c500facfbc46bfc665eb2f95ff32ca80d,Merge_failed,ad6ba226c6a4e564760653191ff0385c500facfbc46bfc665eb2f95ff32ca80d,Merge_failed,ad6ba226c6a4e564760653191ff0385c500facfbc46bfc665eb2f95ff32ca80d,Merge_failed,ad6ba226c6a4e564760653191ff0385c500facfbc46bfc665eb2f95ff32ca80d,Merge_failed,ad6ba226c6a4e564760653191ff0385c500facfbc46bfc665eb2f95ff32ca80d,Merge_failed,ad6ba226c6a4e564760653191ff0385c500facfbc46bfc665eb2f95ff32ca80d,Merge_failed,ad6ba226c6a4e564760653191ff0385c500facfbc46bfc665eb2f95ff32ca80d,Merge_failed,e5a3e28e16c1372daa7baae7bb974df04b14b3567381092c985a5ac7e95c9779,Merge_failed,44d9b08946761afccff8d04d31df519b4de4a4ca20fcd431e17ea8d941736895,Merge_failed,ad6ba226c6a4e564760653191ff0385c500facfbc46bfc665eb2f95ff32ca80d,Merge_failed,ad6ba226c6a4e564760653191ff0385c500facfbc46bfc665eb2f95ff32ca80d,Merge_failed,bc19a4758a0c3e998b99988cac43ee69d56f7af9bd42b04a77086cec1b034e6a,Merge_failed,dd8eabd01947cf7b4eac438b39b87343c11795e3b16ecab8491e569d29a8019a,Merge_failed,44d9b08946761afccff8d04d31df519b4de4a4ca20fcd431e17ea8d941736895
 372,refs/heads/master,a2c344fb54f78c17d684a9b8b2158d23e326a874,c5691ecf3524e69422f4e0b3dbcf31663fc4c8a9,494719d8ea74102313cbbca6c69bdc6e714f43d4,,5659132465f31609bb508c3b9f6727d89fe0273ec2b8a06f8e28b85a5d9f38f3,Tests_passed,671ea11802bc5efa664eac801aa45a164b4f478cb732a9cac20864aa7f6883d9,Tests_passed,True,True,True,True,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,Merge_failed,2d8dc153616bf032c605a03720972a493483f44fe889227f30ef1fdd92e10f43,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,Merge_failed,2d8dc153616bf032c605a03720972a493483f44fe889227f30ef1fdd92e10f43,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,Merge_failed,7b397d9858ce04ef6f080eef96ef54986de392de1a55dd54680660cc7c558110,Merge_failed,e801101318f5efe7ba9e1b6d7b763e4b31054b332d4ffd55829ad9cc69d8d75a,Merge_failed,983f99ebda5b0d2a684c49f3bbf45d9bbfe63a63720921c7a829961f8c643f63,Merge_failed,2d8dc153616bf032c605a03720972a493483f44fe889227f30ef1fdd92e10f43,Merge_failed,fe26549e8acf3142666ba9079c873a041a3783e0a0e7a235a42677a21612bd68,Tests_passed,d00aa4842736a37ee033bb17bde760c9976ba694ce0bf20424cbc0629691f0da,Merge_failed,91c259922779353b550c481109abacb5bc44d305aa3138a9a78b7bb779cecdb0
 467,refs/heads/master,e52be1498094e7947e341cbb49c2b537e761d395,2b700c02b62549a26dc444c2a5b699b16686414d,04527bc4cb9c004ff3daf145690a1268b04a2a70,,e74295a8924a99c16abb67ed1e11121a1267c3d60c73b109355dd9a9abe66281,Tests_passed,466dfff5a728ab07907abf8b9233234504d515e4dcd52e714bb5b607492c187b,Tests_passed,True,True,True,True,Merge_failed,d3ffeea610d0e1e9f6fb84df2dd1bc59b56c79692b57d9123d4b9ce7593311ff,Merge_failed,6cc910f297d018c2eb4c29b66aec31baf7238ba788ef4a0169f6571c6f37abd3,Merge_failed,d3ffeea610d0e1e9f6fb84df2dd1bc59b56c79692b57d9123d4b9ce7593311ff,Merge_failed,6cc910f297d018c2eb4c29b66aec31baf7238ba788ef4a0169f6571c6f37abd3,Merge_failed,d3ffeea610d0e1e9f6fb84df2dd1bc59b56c79692b57d9123d4b9ce7593311ff,Merge_failed,d3ffeea610d0e1e9f6fb84df2dd1bc59b56c79692b57d9123d4b9ce7593311ff,Merge_failed,d3ffeea610d0e1e9f6fb84df2dd1bc59b56c79692b57d9123d4b9ce7593311ff,Merge_failed,3ea355dda8d6d14c7d8ba9ece741b90c1dbcc5defa83694b0009568fb48a5397,Merge_failed,759089bde2082383e09e13cc0aa40efecb8d19152b9453a33cad050268503b89,Merge_failed,d3ffeea610d0e1e9f6fb84df2dd1bc59b56c79692b57d9123d4b9ce7593311ff,Merge_failed,6cc910f297d018c2eb4c29b66aec31baf7238ba788ef4a0169f6571c6f37abd3,Merge_failed,c3dde99c0b187614f331f7af2da7fc23b606dd31ea96d1c84befcb8968a5c284,Merge_failed,980021a9b7c15b32875a0f9ea207b840d141507cfc604c1703e00e644c45fedb,Merge_failed,759089bde2082383e09e13cc0aa40efecb8d19152b9453a33cad050268503b89
-696,refs/heads/master,312d4c60c0be296f149927296cb2d0fa984ac634,74751bd61378f4216d7a5f15290db961bd856331,9df4ff15b5ddd1bd4b990ed7194f08e248908c66,,4c5512c3352cdafb33dbe028a246f0ee757b519831c294e491d2ba0dfa48c4aa,Tests_passed,c70376b70069e3fce81e2ab8e3164e4eca48d8e2152c48bdcc08b6d960c4d53e,Tests_passed,True,True,True,True,Merge_failed,8adc19cd143b11599ff4a4ac7377a40f14d63b690d918643b154c00980137e60,Merge_failed,8adc19cd143b11599ff4a4ac7377a40f14d63b690d918643b154c00980137e60,Merge_failed,8adc19cd143b11599ff4a4ac7377a40f14d63b690d918643b154c00980137e60,Merge_failed,8adc19cd143b11599ff4a4ac7377a40f14d63b690d918643b154c00980137e60,Merge_failed,8adc19cd143b11599ff4a4ac7377a40f14d63b690d918643b154c00980137e60,Merge_failed,8adc19cd143b11599ff4a4ac7377a40f14d63b690d918643b154c00980137e60,Merge_failed,8adc19cd143b11599ff4a4ac7377a40f14d63b690d918643b154c00980137e60,Merge_failed,96b52e623028341ad757490d7f86bdf32f1c4ef4e69b1225d9f3af59c39bc695,Merge_failed,6887aa8dae5fccbeba22a707047b351fae7344d7b1542f398c9f4712aedff5b1,Merge_failed,8adc19cd143b11599ff4a4ac7377a40f14d63b690d918643b154c00980137e60,Merge_failed,8adc19cd143b11599ff4a4ac7377a40f14d63b690d918643b154c00980137e60,Merge_failed,e2784f87948ec2e16cbb862f4d6d67e93a34d8431b030a25914a832a6116d4f0,Merge_failed,6887aa8dae5fccbeba22a707047b351fae7344d7b1542f398c9f4712aedff5b1,Merge_failed,6887aa8dae5fccbeba22a707047b351fae7344d7b1542f398c9f4712aedff5b1
+696,refs/heads/master,312d4c60c0be296f149927296cb2d0fa984ac634,74751bd61378f4216d7a5f15290db961bd856331,9df4ff15b5ddd1bd4b990ed7194f08e248908c66,,4c5512c3352cdafb33dbe028a246f0ee757b519831c294e491d2ba0dfa48c4aa,Tests_passed,c70376b70069e3fce81e2ab8e3164e4eca48d8e2152c48bdcc08b6d960c4d53e,Tests_passed,True,True,True,True,Merge_failed,8adc19cd143b11599ff4a4ac7377a40f14d63b690d918643b154c00980137e60,Merge_failed,8adc19cd143b11599ff4a4ac7377a40f14d63b690d918643b154c00980137e60,Merge_failed,8adc19cd143b11599ff4a4ac7377a40f14d63b690d918643b154c00980137e60,Merge_failed,8adc19cd143b11599ff4a4ac7377a40f14d63b690d918643b154c00980137e60,Merge_failed,8adc19cd143b11599ff4a4ac7377a40f14d63b690d918643b154c00980137e60,Merge_failed,8adc19cd143b11599ff4a4ac7377a40f14d63b690d918643b154c00980137e60,Merge_failed,8adc19cd143b11599ff4a4ac7377a40f14d63b690d918643b154c00980137e60,Merge_failed,96b52e623028341ad757490d7f86bdf32f1c4ef4e69b1225d9f3af59c39bc695,Merge_failed,6887aa8dae5fccbeba22a707047b351fae7344d7b1542f398c9f4712aedff5b1,Merge_failed,e89728dabb68dd05b3d000472a3f979a926f83c6c50281a65096e1fd3734613a,Merge_failed,e89728dabb68dd05b3d000472a3f979a926f83c6c50281a65096e1fd3734613a,Merge_failed,e2784f87948ec2e16cbb862f4d6d67e93a34d8431b030a25914a832a6116d4f0,Merge_failed,6887aa8dae5fccbeba22a707047b351fae7344d7b1542f398c9f4712aedff5b1,Merge_failed,6887aa8dae5fccbeba22a707047b351fae7344d7b1542f398c9f4712aedff5b1
 721,refs/heads/master,3485acaa6fda3c2e77aa50c16e2c4e22c0b1419e,6435cece2bf1ab9caca152d5ca6b6282626382a0,342e0c47895cbd3718fab0e4495ad459a444205d,,498e08958e0f48e803d5bc5aa7a4813a7e2ba15594aeb0cb856e345c8e4b1f29,Tests_passed,996a33e494e12ee43cfdd9e00ae32d09a6bbafe8bbb04efc49d4d8b7bcedcf4d,Tests_passed,True,True,True,True,Merge_failed,db893ef31480f26c7d6c5a9c941a308b72b8fc9abd0c88dd620a2797e82fdcf1,Merge_failed,a543cd3f02396bf2b5ea7063f210384160bafb7ddc4902b1f60b96d1ef563482,Merge_failed,db893ef31480f26c7d6c5a9c941a308b72b8fc9abd0c88dd620a2797e82fdcf1,Merge_failed,a543cd3f02396bf2b5ea7063f210384160bafb7ddc4902b1f60b96d1ef563482,Merge_failed,db893ef31480f26c7d6c5a9c941a308b72b8fc9abd0c88dd620a2797e82fdcf1,Merge_failed,db893ef31480f26c7d6c5a9c941a308b72b8fc9abd0c88dd620a2797e82fdcf1,Merge_failed,db893ef31480f26c7d6c5a9c941a308b72b8fc9abd0c88dd620a2797e82fdcf1,Merge_failed,6adca6f94f976fa68e5cfdb647075568f77be6c4b0352c61391b83309cf5d0b7,Merge_failed,7cc2aa6f1cde84e5aca96662354369ba4ba03b423d2d76090094f6b1994c0347,Merge_failed,db893ef31480f26c7d6c5a9c941a308b72b8fc9abd0c88dd620a2797e82fdcf1,Merge_failed,a543cd3f02396bf2b5ea7063f210384160bafb7ddc4902b1f60b96d1ef563482,Merge_failed,ccbc84c197a5ec5e4bd706bf922f6056d86fcd84508eaf8bb454ffdf10e87d18,Merge_failed,698540dd02e2a9a8f889e0ac5fe333b120cfdfb7d050c7acd859bdbe7f6e7a5b,Merge_failed,7cc2aa6f1cde84e5aca96662354369ba4ba03b423d2d76090094f6b1994c0347