From fb7e006259938cc156271b35a7e1459a8eb2f81a Mon Sep 17 00:00:00 2001 From: ayushuk Date: Sun, 14 May 2023 19:26:46 -0700 Subject: [PATCH 01/10] Update version numbers --- pip_version | 2 +- version | 2 +- win_version | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pip_version b/pip_version index a423d421..8a0feb98 100644 --- a/pip_version +++ b/pip_version @@ -1 +1 @@ -3.4.2 \ No newline at end of file +3.4.3 \ No newline at end of file diff --git a/version b/version index a423d421..8a0feb98 100644 --- a/version +++ b/version @@ -1 +1 @@ -3.4.2 \ No newline at end of file +3.4.3 \ No newline at end of file diff --git a/win_version b/win_version index 0ccc3dcd..20cef1f4 100644 --- a/win_version +++ b/win_version @@ -1 +1 @@ -3.4.2.0 \ No newline at end of file +3.4.3.0 \ No newline at end of file From e620f0154ecffef20bae1d247efe72491f6f36e3 Mon Sep 17 00:00:00 2001 From: BennyBot <48661356+BennyBot@users.noreply.github.com> Date: Mon, 22 Jan 2024 21:26:32 -0500 Subject: [PATCH 02/10] =?UTF-8?q?=F0=9F=90=9B=20Fix=20default=20template?= =?UTF-8?q?=20selection=20#318?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pros/conductor/conductor.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pros/conductor/conductor.py b/pros/conductor/conductor.py index b3a8e045..43713cd1 100644 --- a/pros/conductor/conductor.py +++ b/pros/conductor/conductor.py @@ -333,7 +333,7 @@ def new_project(self, path: str, no_default_libs: bool = False, **kwargs) -> Pro proj.save() if not no_default_libs: - libraries = self.early_access_libraries if self.use_early_access else self.default_libraries + libraries = self.early_access_libraries if self.use_early_access and (kwargs.get("version", ">").startswith("4") or kwargs.get("version", ">").startswith(">")) else self.default_libraries for library in libraries[proj.target]: try: # remove kernel version so that latest template satisfying query is correctly selected From 93a0288b6b24ac71d5060c8acaec4074dfbabffc Mon Sep 17 00:00:00 2001 From: ayushuk Date: Mon, 22 Jan 2024 21:42:08 -0500 Subject: [PATCH 03/10] Update version numbers --- pip_version | 2 +- version | 2 +- win_version | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pip_version b/pip_version index 8a0feb98..e5b82034 100644 --- a/pip_version +++ b/pip_version @@ -1 +1 @@ -3.4.3 \ No newline at end of file +3.5.0 \ No newline at end of file diff --git a/version b/version index 8a0feb98..e5b82034 100644 --- a/version +++ b/version @@ -1 +1 @@ -3.4.3 \ No newline at end of file +3.5.0 \ No newline at end of file diff --git a/win_version b/win_version index 20cef1f4..ec9d2348 100644 --- a/win_version +++ b/win_version @@ -1 +1 @@ -3.4.3.0 \ No newline at end of file +3.5.0.0 \ No newline at end of file From 4b11400363f31deb207d0a40fdb94d53414aa853 Mon Sep 17 00:00:00 2001 From: ayushuk Date: Thu, 21 Mar 2024 14:48:26 -0400 Subject: [PATCH 04/10] Update version numbers --- pip_version | 2 +- version | 2 +- win_version | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pip_version b/pip_version index e5b82034..d5c0c991 100644 --- a/pip_version +++ b/pip_version @@ -1 +1 @@ -3.5.0 \ No newline at end of file +3.5.1 diff --git a/version b/version index e5b82034..d5c0c991 100644 --- a/version +++ b/version @@ -1 +1 @@ -3.5.0 \ No newline at end of file +3.5.1 diff --git a/win_version b/win_version index ec9d2348..a11b5ad0 100644 --- a/win_version +++ b/win_version @@ -1 +1 @@ -3.5.0.0 \ No newline at end of file +3.5.1.0 From f64e9df4ce5fa9c919208d7a7ee92f5f28a840f2 Mon Sep 17 00:00:00 2001 From: ayushuk Date: Fri, 17 May 2024 20:28:55 -0700 Subject: [PATCH 05/10] Update version numbers --- pip_version | 2 +- version | 2 +- win_version | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pip_version b/pip_version index 3c8ff8c3..87ce4929 100644 --- a/pip_version +++ b/pip_version @@ -1 +1 @@ -3.5.1 \ No newline at end of file +3.5.2 diff --git a/version b/version index 3c8ff8c3..87ce4929 100644 --- a/version +++ b/version @@ -1 +1 @@ -3.5.1 \ No newline at end of file +3.5.2 diff --git a/win_version b/win_version index eebed617..fcb1d758 100644 --- a/win_version +++ b/win_version @@ -1 +1 @@ -3.5.1.0 \ No newline at end of file +3.5.2.0 From 5381cbf3b3b39e62f37be131d91d9919bf75a607 Mon Sep 17 00:00:00 2001 From: Ayush Shukla <71904196+ayushuk@users.noreply.github.com> Date: Sat, 18 May 2024 16:42:30 -0400 Subject: [PATCH 06/10] =?UTF-8?q?=E2=AC=87=EF=B8=8F=20Downgrade=20rich=20c?= =?UTF-8?q?lick=20(#355)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index c84eddb0..beb4f05c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ click>=8 -rich-click +rich-click==1.7.4 pyserial cachetools requests From 025a945027e89fd2ae670cd6e8efc1b257d44a8e Mon Sep 17 00:00:00 2001 From: Ayush Shukla <71904196+ayushuk@users.noreply.github.com> Date: Sat, 18 May 2024 17:10:39 -0400 Subject: [PATCH 07/10] =?UTF-8?q?=F0=9F=9A=B8=20Apply=20liblvgl=20as=20a?= =?UTF-8?q?=20default=20template=20for=20PROS=204=20(#356)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pros/conductor/conductor.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pros/conductor/conductor.py b/pros/conductor/conductor.py index 4b195283..cc01f4f0 100644 --- a/pros/conductor/conductor.py +++ b/pros/conductor/conductor.py @@ -107,7 +107,7 @@ def __init__(self, file=None): needs_saving = True if self.default_libraries is None: self.default_libraries = { - 'v5': ['okapilib'], + 'v5': ['okapilib', 'liblvgl'], 'cortex': [] } needs_saving = True @@ -386,6 +386,9 @@ def new_project(self, path: str, no_default_libs: bool = False, **kwargs) -> Pro if kwargs['version'][0] == '>' or kwargs['version'][0] == '4': libraries[proj.target].remove('okapilib') + if 'liblvgl' in libraries[proj.target] and kwargs['version'][0] != '>' and kwargs['version'][0] != '4': + libraries[proj.target].remove('liblvgl') + for library in libraries[proj.target]: try: # remove kernel version so that latest template satisfying query is correctly selected From e1de29bef62bc40793e990d39d3a75f814b365e0 Mon Sep 17 00:00:00 2001 From: Mayank Patibandla <34776435+mayankpatibandla@users.noreply.github.com> Date: Tue, 21 May 2024 17:56:12 -0400 Subject: [PATCH 08/10] =?UTF-8?q?=F0=9F=90=9B=20Fix=20removing=20default?= =?UTF-8?q?=20template=20(#357)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pros/conductor/conductor.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pros/conductor/conductor.py b/pros/conductor/conductor.py index cc01f4f0..320dc843 100644 --- a/pros/conductor/conductor.py +++ b/pros/conductor/conductor.py @@ -383,13 +383,13 @@ def new_project(self, path: str, no_default_libs: bool = False, **kwargs) -> Pro if not no_default_libs: libraries = self.early_access_libraries if proj.use_early_access and (kwargs.get("version", ">").startswith("4") or kwargs.get("version", ">").startswith(">")) else self.default_libraries - if kwargs['version'][0] == '>' or kwargs['version'][0] == '4': - libraries[proj.target].remove('okapilib') - - if 'liblvgl' in libraries[proj.target] and kwargs['version'][0] != '>' and kwargs['version'][0] != '4': - libraries[proj.target].remove('liblvgl') - for library in libraries[proj.target]: + if kwargs['version'][0] == '>' or kwargs['version'][0] == '4': + if library == "okapilib": + continue + if kwargs['version'][0] != '>' and kwargs['version'][0] != '4': + if library == "liblvgl": + continue try: # remove kernel version so that latest template satisfying query is correctly selected if 'version' in kwargs: From ef353ddf9779b9a07181ebb84ca10f8663b15f2c Mon Sep 17 00:00:00 2001 From: Mayank Patibandla <34776435+mayankpatibandla@users.noreply.github.com> Date: Tue, 21 May 2024 22:27:10 -0400 Subject: [PATCH 09/10] =?UTF-8?q?=F0=9F=94=96=20Release=203.5.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pip_version | 2 +- version | 2 +- win_version | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pip_version b/pip_version index 80d13b7d..678fd88a 100644 --- a/pip_version +++ b/pip_version @@ -1 +1 @@ -3.5.2 \ No newline at end of file +3.5.3 \ No newline at end of file diff --git a/version b/version index 80d13b7d..678fd88a 100644 --- a/version +++ b/version @@ -1 +1 @@ -3.5.2 \ No newline at end of file +3.5.3 \ No newline at end of file diff --git a/win_version b/win_version index 64b6522a..1067a669 100644 --- a/win_version +++ b/win_version @@ -1 +1 @@ -3.5.2.0 \ No newline at end of file +3.5.3.0 \ No newline at end of file From b173977eab55ef47798a89be5e93a04de608ea1d Mon Sep 17 00:00:00 2001 From: Mayank Patibandla <34776435+mayankpatibandla@users.noreply.github.com> Date: Tue, 21 May 2024 23:40:36 -0400 Subject: [PATCH 10/10] =?UTF-8?q?=F0=9F=90=9B=20Fix=20removed=20kernel=20v?= =?UTF-8?q?ersion=20for=20PROS=203=20projects?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pros/conductor/conductor.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pros/conductor/conductor.py b/pros/conductor/conductor.py index 320dc843..6c1f4e2c 100644 --- a/pros/conductor/conductor.py +++ b/pros/conductor/conductor.py @@ -383,11 +383,12 @@ def new_project(self, path: str, no_default_libs: bool = False, **kwargs) -> Pro if not no_default_libs: libraries = self.early_access_libraries if proj.use_early_access and (kwargs.get("version", ">").startswith("4") or kwargs.get("version", ">").startswith(">")) else self.default_libraries + version = kwargs['version'][0] for library in libraries[proj.target]: - if kwargs['version'][0] == '>' or kwargs['version'][0] == '4': + if version == '>' or version == '4': if library == "okapilib": continue - if kwargs['version'][0] != '>' and kwargs['version'][0] != '4': + if version != '>' and version != '4': if library == "liblvgl": continue try: