Skip to content

Commit

Permalink
🔀 Backmerge master
Browse files Browse the repository at this point in the history
  • Loading branch information
mayankpatibandla authored May 22, 2024
2 parents 842a79f + b173977 commit f3618f4
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 8 deletions.
2 changes: 1 addition & 1 deletion pip_version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.5.1
3.5.3
12 changes: 8 additions & 4 deletions pros/conductor/conductor.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -383,10 +383,14 @@ 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')

version = kwargs['version'][0]
for library in libraries[proj.target]:
if version == '>' or version == '4':
if library == "okapilib":
continue
if version != '>' and version != '4':
if library == "liblvgl":
continue
try:
# remove kernel version so that latest template satisfying query is correctly selected
if 'version' in kwargs:
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
click>=8
rich-click
rich-click==1.7.4
pyserial
cachetools
requests
Expand Down
2 changes: 1 addition & 1 deletion version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.5.1
3.5.3
2 changes: 1 addition & 1 deletion win_version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.5.1.0
3.5.3.0

0 comments on commit f3618f4

Please sign in to comment.