forked from platformio/platformio-core
Python style formatting
This commit is contained in:
1 parent
653f8b87ec
commit
a251470ebd
20 files changed
+141
-108
No files matched your search
@@ -120,8 +120,9 @@ class LibraryManager(BasePkgManager):
|
||||
if item[k] == "*":
|
||||
del item[k]
|
||||
elif isinstance(item[k], basestring):
|
||||
item[k] = [i.strip() for i in item[k].split(",")
|
||||
if i.strip()]
|
||||
item[k] = [
|
||||
i.strip() for i in item[k].split(",") if i.strip()
|
||||
]
|
||||
return items
|
||||
|
||||
@staticmethod
|
||||
|
||||
@@ -164,8 +164,9 @@ class PkgInstallerMixin(object):
|
||||
if not pkgdata:
|
||||
continue
|
||||
try:
|
||||
pkg_dir = self._install_from_url(
|
||||
name, pkgdata['url'], requirements, pkgdata.get("sha1"))
|
||||
pkg_dir = self._install_from_url(name, pkgdata['url'],
|
||||
requirements,
|
||||
pkgdata.get("sha1"))
|
||||
break
|
||||
except Exception as e: # pylint: disable=broad-except
|
||||
click.secho("Warning! Package Mirror: %s" % e, fg="yellow")
|
||||
@@ -240,8 +241,9 @@ class PkgInstallerMixin(object):
|
||||
curmanifest['version'], partial=True)
|
||||
# if current package version < new package, backup it
|
||||
if tmpmanver > curmanver:
|
||||
os.rename(pkg_dir, join(self.package_dir, "%s@%s" % (
|
||||
name, curmanifest['version'])))
|
||||
os.rename(pkg_dir,
|
||||
join(self.package_dir, "%s@%s" %
|
||||
(name, curmanifest['version'])))
|
||||
elif tmpmanver < curmanver:
|
||||
pkg_dir = join(self.package_dir, "%s@%s" %
|
||||
(name, tmpmanifest['version']))
|
||||
@@ -492,10 +494,11 @@ class BasePkgManager(PkgRepoMixin, PkgInstallerMixin):
|
||||
label=manifest['name'])
|
||||
return True
|
||||
|
||||
def update(self, # pylint: disable=too-many-return-statements
|
||||
name,
|
||||
requirements=None,
|
||||
only_check=False):
|
||||
def update( # pylint: disable=too-many-return-statements
|
||||
self,
|
||||
name,
|
||||
requirements=None,
|
||||
only_check=False):
|
||||
name, requirements, url = self.parse_pkg_name(name, requirements)
|
||||
package_dir = self.get_package_dir(name, None, url)
|
||||
if not package_dir:
|
||||
|
||||
@@ -42,13 +42,13 @@ class PlatformManager(BasePkgManager):
|
||||
def manifest_name(self):
|
||||
return "platform.json"
|
||||
|
||||
def install(self, # pylint: disable=too-many-arguments
|
||||
def install(self,
|
||||
name,
|
||||
requirements=None,
|
||||
with_packages=None,
|
||||
without_packages=None,
|
||||
skip_default_package=False,
|
||||
**_):
|
||||
**_): # pylint: disable=too-many-arguments
|
||||
platform_dir = BasePkgManager.install(self, name, requirements)
|
||||
p = PlatformFactory.newPlatform(self.get_manifest_path(platform_dir))
|
||||
p.install_packages(with_packages, without_packages,
|
||||
@@ -66,8 +66,12 @@ class PlatformManager(BasePkgManager):
|
||||
self.cleanup_packages(p.packages.keys())
|
||||
return True
|
||||
|
||||
def update(self, # pylint: disable=arguments-differ
|
||||
name, requirements=None, only_packages=False, only_check=False):
|
||||
def update( # pylint: disable=arguments-differ
|
||||
self,
|
||||
name,
|
||||
requirements=None,
|
||||
only_packages=False,
|
||||
only_check=False):
|
||||
name, requirements, _ = self.parse_pkg_name(name, requirements)
|
||||
if not only_packages:
|
||||
BasePkgManager.update(self, name, requirements, only_check)
|
||||
|
||||
Reference in new issue
Block a user