From 45e29f58c134c7d590b84976ab8ea972543f4fc0 Mon Sep 17 00:00:00 2001 From: 5hayanB Date: Tue, 6 Aug 2024 19:33:46 +0500 Subject: [PATCH 1/7] updated riscv-isac dependency --- riscof/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/riscof/requirements.txt b/riscof/requirements.txt index 6fc0519..692f086 100644 --- a/riscof/requirements.txt +++ b/riscof/requirements.txt @@ -3,4 +3,4 @@ click>=7.1.2 Jinja2>=2.10.1 pytz>=2019.1 riscv-config>=3.2.0 -riscv_isac>=0.7.2 +git+https://github.com/riscv-software-src/riscv-isac@dev From 822042876f7e51c76201d8814dac1a5674abfd2d Mon Sep 17 00:00:00 2001 From: 5hayanB Date: Tue, 6 Aug 2024 21:22:20 +0500 Subject: [PATCH 2/7] updated setup.py to include dependency link of riscv-isac. It's what chatgpt told me. Let's hope it works --- setup.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/setup.py b/setup.py index f31854b..2fc4e63 100644 --- a/setup.py +++ b/setup.py @@ -53,6 +53,9 @@ def read_requires(): ] }, install_requires=read_requires(), + dependency_links=[ + 'git+https://github.com/riscv-software-src/riscv-isac@dev' + ], python_requires=">=3.6.0", entry_points={ "console_scripts": ["riscof=riscof.cli:cli"], From 31d78eaa1a2bbe9ed1011224077952a7e44377b2 Mon Sep 17 00:00:00 2001 From: 5hayanB Date: Tue, 6 Aug 2024 21:32:49 +0500 Subject: [PATCH 3/7] Well, that didn't work. I got an idea tho. What if I just state the branch name instead of the tag number? --- riscof/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/riscof/requirements.txt b/riscof/requirements.txt index 692f086..f787247 100644 --- a/riscof/requirements.txt +++ b/riscof/requirements.txt @@ -3,4 +3,4 @@ click>=7.1.2 Jinja2>=2.10.1 pytz>=2019.1 riscv-config>=3.2.0 -git+https://github.com/riscv-software-src/riscv-isac@dev +riscv-isac=='dev' From de621a243cdfc587d11539f4aeab4fed5d2e52bf Mon Sep 17 00:00:00 2001 From: 5hayanB Date: Tue, 6 Aug 2024 22:10:04 +0500 Subject: [PATCH 4/7] That didn't work too. This is one more attempt at solving this problem --- riscof/requirements.txt | 2 +- setup.py | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/riscof/requirements.txt b/riscof/requirements.txt index f787247..0961443 100644 --- a/riscof/requirements.txt +++ b/riscof/requirements.txt @@ -3,4 +3,4 @@ click>=7.1.2 Jinja2>=2.10.1 pytz>=2019.1 riscv-config>=3.2.0 -riscv-isac=='dev' +riscv_isac diff --git a/setup.py b/setup.py index 2fc4e63..f31854b 100644 --- a/setup.py +++ b/setup.py @@ -53,9 +53,6 @@ def read_requires(): ] }, install_requires=read_requires(), - dependency_links=[ - 'git+https://github.com/riscv-software-src/riscv-isac@dev' - ], python_requires=">=3.6.0", entry_points={ "console_scripts": ["riscof=riscof.cli:cli"], From d833db68cd5f435ff24a56cc39d22897cd331565 Mon Sep 17 00:00:00 2001 From: 5hayanB Date: Tue, 6 Aug 2024 23:11:42 +0500 Subject: [PATCH 5/7] Trying another requirements format --- riscof/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/riscof/requirements.txt b/riscof/requirements.txt index 0961443..4675e21 100644 --- a/riscof/requirements.txt +++ b/riscof/requirements.txt @@ -3,4 +3,4 @@ click>=7.1.2 Jinja2>=2.10.1 pytz>=2019.1 riscv-config>=3.2.0 -riscv_isac +riscv_isac=="dev" From 611adaf2ccb1684ec350e5ba8ac843ca1a5c10cf Mon Sep 17 00:00:00 2001 From: 5hayanB Date: Tue, 6 Aug 2024 23:56:53 +0500 Subject: [PATCH 6/7] Not proud of this one since it needs git as a prerequisite --- riscof/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/riscof/requirements.txt b/riscof/requirements.txt index 4675e21..c4b9e4f 100644 --- a/riscof/requirements.txt +++ b/riscof/requirements.txt @@ -3,4 +3,4 @@ click>=7.1.2 Jinja2>=2.10.1 pytz>=2019.1 riscv-config>=3.2.0 -riscv_isac=="dev" +riscv_isac @ git+https://github.com/riscv-software-src/riscof@dev From 01b464fef458ad913d6d2a2b229af10f7346cfaf Mon Sep 17 00:00:00 2001 From: 5hayanB Date: Tue, 6 Aug 2024 23:59:07 +0500 Subject: [PATCH 7/7] oops --- riscof/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/riscof/requirements.txt b/riscof/requirements.txt index c4b9e4f..7a81612 100644 --- a/riscof/requirements.txt +++ b/riscof/requirements.txt @@ -3,4 +3,4 @@ click>=7.1.2 Jinja2>=2.10.1 pytz>=2019.1 riscv-config>=3.2.0 -riscv_isac @ git+https://github.com/riscv-software-src/riscof@dev +riscv-isac @ git+https://github.com/riscv-software-src/riscv-isac@dev