From 7e5dc4c5c8bb6352ae6c285023d935cf8a4645c6 Mon Sep 17 00:00:00 2001 From: Ilya Vlasov <55441714+GirZ0n@users.noreply.github.com> Date: Tue, 20 Jun 2023 11:25:54 +0400 Subject: [PATCH 1/8] Fix links --- README.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 618f736a..f4781e6d 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,8 @@ # Lupa 🔍 -[![Kotlin build](https://github.com/nbirillo/Lupa/actions/workflows/kotlin-build.yml/badge.svg)](https://github.com/nbirillo/Lupa/actions/workflows/kotlin-build.yml) -[![Python build](https://github.com/nbirillo/Lupa/actions/workflows/python-build.yml/badge.svg)](https://github.com/nbirillo/Lupa/actions/workflows/python-build.yml) +[![JetBrains Research](https://jb.gg/badges/research.svg)](https://confluence.jetbrains.com/display/ALL/JetBrains+on+GitHub) +[![Kotlin build](https://github.com/JetBrains-Research/Lupa/actions/workflows/kotlin-build.yml/badge.svg)](https://github.com/JetBrains-Research/Lupa/actions/workflows/kotlin-build.yml) +[![Python build](https://github.com/JetBrains-Research/Lupa/actions/workflows/python-build.yml/badge.svg)](https://github.com/JetBrains-Research/Lupa/actions/workflows/python-build.yml) Lupa 🔍 is an extendable framework for analyzing fine-grained language usage on the base of the [IntelliJ Platform](https://www.jetbrains.com/opensource/idea/). Lupa 🔍 is a command line tool that uses the power of the IntelliJ Platform under @@ -49,9 +50,9 @@ To get more information see these modules (each of them has a README file). ## Installation -Clone the repo by `git clone https://github.com/nbirillo/Lupa.git`. +Clone the repo by `git clone https://github.com/JetBrains-Research/Lupa.git`. -For analyzers modules and core architecture you should have Kotlin at least `1.5.21` version. +For analyzers modules and core architecture you should `have Kotlin at least `1.5.21` version. For functionality for data gathering, processing and visualization ([`scripts`](./scripts/README.md) module) you should have Python 3+ and also run: - `pip install -r scripts/requirements.txt` @@ -59,7 +60,7 @@ you should have Python 3+ and also run: - `pip install -r scripts/requirements-code-style.txt` - for code style checkers (optional) ## Usage - +F 1. For analyzers: - For Kotlin analyzers go to the [`kotlin-analysers`](./kotlin-analysers) module and follow its [README file](./kotlin-analysers/README.md). - For Python analyzers go to the [`python-analysers`](./python-analysers) module and follow its [README file](./python-analysers/README.md). From a977c59f74612ade08420a9b355d92a6c4190346 Mon Sep 17 00:00:00 2001 From: Ilya Vlasov <55441714+GirZ0n@users.noreply.github.com> Date: Tue, 20 Jun 2023 11:27:21 +0400 Subject: [PATCH 2/8] Undo unnecessary changes --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index f4781e6d..1017763a 100644 --- a/README.md +++ b/README.md @@ -52,7 +52,7 @@ To get more information see these modules (each of them has a README file). Clone the repo by `git clone https://github.com/JetBrains-Research/Lupa.git`. -For analyzers modules and core architecture you should `have Kotlin at least `1.5.21` version. +For analyzers modules and core architecture you should have Kotlin at least `1.5.21` version. For functionality for data gathering, processing and visualization ([`scripts`](./scripts/README.md) module) you should have Python 3+ and also run: - `pip install -r scripts/requirements.txt` @@ -60,7 +60,6 @@ you should have Python 3+ and also run: - `pip install -r scripts/requirements-code-style.txt` - for code style checkers (optional) ## Usage -F 1. For analyzers: - For Kotlin analyzers go to the [`kotlin-analysers`](./kotlin-analysers) module and follow its [README file](./kotlin-analysers/README.md). - For Python analyzers go to the [`python-analysers`](./python-analysers) module and follow its [README file](./python-analysers/README.md). From 03a88defec28925e3b1c1df0e61d1e4ec21c8cf7 Mon Sep 17 00:00:00 2001 From: Ilya Vlasov <55441714+GirZ0n@users.noreply.github.com> Date: Tue, 20 Jun 2023 11:28:26 +0400 Subject: [PATCH 3/8] Add an empty line --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 1017763a..6645f162 100644 --- a/README.md +++ b/README.md @@ -60,6 +60,7 @@ you should have Python 3+ and also run: - `pip install -r scripts/requirements-code-style.txt` - for code style checkers (optional) ## Usage + 1. For analyzers: - For Kotlin analyzers go to the [`kotlin-analysers`](./kotlin-analysers) module and follow its [README file](./kotlin-analysers/README.md). - For Python analyzers go to the [`python-analysers`](./python-analysers) module and follow its [README file](./python-analysers/README.md). From 0afd62c1b921645a7c2a94a7aab06cf25bd9c2e6 Mon Sep 17 00:00:00 2001 From: Ilya Vlasov <55441714+GirZ0n@users.noreply.github.com> Date: Tue, 20 Jun 2023 11:30:24 +0400 Subject: [PATCH 4/8] Fix links --- docs/contributing.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/contributing.md b/docs/contributing.md index 4d6a409c..ef67a2aa 100644 --- a/docs/contributing.md +++ b/docs/contributing.md @@ -9,10 +9,10 @@ This repository contains sources of: We love contributions! We are happy to see new analyzers and improvements of our core functionality, and even supporting of new languages. -The current tasks can be found in the [open issues](https://github.com/nbirillo/Lupa/issues) in the project. +The current tasks can be found in the [open issues](https://github.com/JetBrains-Research/Lupa/issues) in the project. If you have some questions or feature requests, please do not hesitate to open new ones. -If you want to find some issues to start off with, please, [filter](https://github.com/nbirillo/Lupa/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22) issues by the `good first issue` label. +If you want to find some issues to start off with, please, [filter](https://github.com/JetBrains-Research/Lupa/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22) issues by the `good first issue` label. Please, add a comment to the issue, if you're starting work on it. @@ -46,6 +46,6 @@ Before submitting the pull request, make sure that you can say "YES" to each poi - You ran the build locally and verified new functionality/analyzers; - You ran related tests locally (or add new ones) and they passed; - You don't have code-style problems according the GitHub Actions - (for [Kotlin](https://github.com/nbirillo/Lupa/blob/main/.github/workflows/kotlin-build.yml) - and for [Python](https://github.com/nbirillo/Lupa/blob/main/.github/workflows/python-build.yml)); -- You do not have merge conflicts in the pull request. \ No newline at end of file + (for [Kotlin](https://github.com/JetBrains-Research/Lupa/blob/main/.github/workflows/kotlin-build.yml) + and for [Python](https://github.com/JetBrains-Research/Lupa/blob/main/.github/workflows/python-build.yml)); +- You do not have merge conflicts in the pull request. From 67fbf5ff3bad43473be79ef2411c204feef4a508 Mon Sep 17 00:00:00 2001 From: Ilya Vlasov <55441714+GirZ0n@users.noreply.github.com> Date: Wed, 21 Jun 2023 12:22:36 +0400 Subject: [PATCH 5/8] fix: try not to update chromium every time --- .github/workflows/python-build.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/python-build.yml b/.github/workflows/python-build.yml index dc8136c0..f3a802c7 100644 --- a/.github/workflows/python-build.yml +++ b/.github/workflows/python-build.yml @@ -41,12 +41,12 @@ jobs: path: ./scripts/venv key: ${{ runner.os }}-pip-cache-v4-${{ hashFiles('./scripts/requirements*.txt') }} - - name: Update Chromium - run: | - sudo apt purge google-chrome-stable - sudo apt purge chromium-browser - sudo apt install -y chromium-browser - chromium --version +# - name: Update Chromium +# run: | +# sudo apt purge google-chrome-stable +# sudo apt purge chromium-browser +# sudo apt install -y chromium-browser +# chromium --version - name: Run tests run: | From 989c4976c06ea255c7689aa9c0ca9b8476d68be8 Mon Sep 17 00:00:00 2001 From: Ilya Vlasov Date: Wed, 21 Jun 2023 12:39:18 +0400 Subject: [PATCH 6/8] style: fix flake8 issue --- .../utils/python_fq_names/filter_unnecessary_fq_names.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/scripts/analysis/utils/python_fq_names/filter_unnecessary_fq_names.py b/scripts/analysis/utils/python_fq_names/filter_unnecessary_fq_names.py index 4e5cdd42..1eeb6de9 100644 --- a/scripts/analysis/utils/python_fq_names/filter_unnecessary_fq_names.py +++ b/scripts/analysis/utils/python_fq_names/filter_unnecessary_fq_names.py @@ -435,9 +435,7 @@ def _is_private_name(fq_name: str) -> bool: if fq_parts[0] == '_thread': return False - return any( - [fq_part.startswith('_') and not __is_dunder_name(fq_part) for fq_part in fq_parts], - ) + return any(fq_part.startswith('_') and not __is_dunder_name(fq_part) for fq_part in fq_parts) def main( From 2c397ab625cb2e118d64328afe06ea699119d77a Mon Sep 17 00:00:00 2001 From: Ilya Vlasov <55441714+GirZ0n@users.noreply.github.com> Date: Wed, 21 Jun 2023 13:00:52 +0400 Subject: [PATCH 7/8] fix: try to update chromium every time --- .github/workflows/python-build.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/python-build.yml b/.github/workflows/python-build.yml index f3a802c7..dc8136c0 100644 --- a/.github/workflows/python-build.yml +++ b/.github/workflows/python-build.yml @@ -41,12 +41,12 @@ jobs: path: ./scripts/venv key: ${{ runner.os }}-pip-cache-v4-${{ hashFiles('./scripts/requirements*.txt') }} -# - name: Update Chromium -# run: | -# sudo apt purge google-chrome-stable -# sudo apt purge chromium-browser -# sudo apt install -y chromium-browser -# chromium --version + - name: Update Chromium + run: | + sudo apt purge google-chrome-stable + sudo apt purge chromium-browser + sudo apt install -y chromium-browser + chromium --version - name: Run tests run: | From fd1f1d73c85d157d20035f45d67269af51fd7fec Mon Sep 17 00:00:00 2001 From: Ilya Vlasov Date: Wed, 21 Jun 2023 13:37:20 +0400 Subject: [PATCH 8/8] deps: update streamlit to 1.23.1 --- scripts/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/requirements.txt b/scripts/requirements.txt index 67ed71c3..d2e4a6bf 100644 --- a/scripts/requirements.txt +++ b/scripts/requirements.txt @@ -12,6 +12,6 @@ typing==3.7.4.3 dacite==1.6.0 psycopg2==2.9.3 cerberus==1.3.4 -streamlit==1.13.0 +streamlit==1.23.1 pyyaml==6.0 bin-packing-problem==1.0.0