From 8c37f148c234d9ad096559ad30f02453c34a10b0 Mon Sep 17 00:00:00 2001 From: Ashton Reimer Date: Fri, 14 Jun 2019 00:47:51 -0700 Subject: [PATCH 1/4] Bumping version numbers, updated contact info, replaced valid cores. --- resen/Resen.py | 6 +++--- resen/__init__.py | 4 ++-- setup.py | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/resen/Resen.py b/resen/Resen.py index b21754e..2fa8e61 100644 --- a/resen/Resen.py +++ b/resen/Resen.py @@ -144,9 +144,9 @@ def __init__(self,resen_root_dir): def __get_valid_cores(self): # TODO: download json file from resen-core github repo # and if that fails, fallback to hardcoded list - return [{"version":"2019.1.0rc1","repo":"resen-core","org":"earthcubeingeo", - "image_id":'sha256:ac8e2819e502a307be786e07ea4deda987a05cdccba1d8a90a415ea103c101ff', - "repodigest":'sha256:1da843059202f13443cd89e035acd5ced4f9c21fe80d778ce2185984c54be00b'},] + return [{"version":"2019.1.0rc2","repo":"resen-core","org":"earthcubeingeo", + "image_id":'sha256:0453af64162b56626e841fb42665d1db3073208406496313a68c555108230533', + "repodigest":'sha256:207c313bc06b0ddab0307f53a8950b80f60b8529fa612418633608b9e4631efb'},] def load_config(self): bucket_config = os.path.join(self.resen_root_dir,'buckets.json') diff --git a/resen/__init__.py b/resen/__init__.py index 412dc2f..a244ad8 100644 --- a/resen/__init__.py +++ b/resen/__init__.py @@ -1,3 +1,3 @@ -__version__ = '2019.1.0rc1' +__version__ = '2019.1.0rc2' -from .Resen import Resen \ No newline at end of file +from .Resen import Resen diff --git a/setup.py b/setup.py index 3579d66..64000d6 100644 --- a/setup.py +++ b/setup.py @@ -23,7 +23,7 @@ # Versions should comply with PEP440. For a discussion on single-sourcing # the version across setup.py and the project code, see # https://packaging.python.org/en/latest/single_source_version.html - version='19.1.0', #TODO: parse this from resen/__init__.py + version='2019.1.0rc2', #TODO: parse this from resen/__init__.py description='A python package for watching, copying, and transporting files around.', long_description=long_description, @@ -33,7 +33,7 @@ # Author details author='NSF Integrated Geoscience Observatory', - author_email='ashton.reimer@sri.com', + author_email='ingeo-team@ingeo.datatransport.org', # Choose your license license='GPLv3', From 25d2130f4cd30e4d12ef3dc450def834ed379766 Mon Sep 17 00:00:00 2001 From: Ashton Reimer Date: Fri, 14 Jun 2019 11:34:20 -0700 Subject: [PATCH 2/4] update rc2 digest and image ids --- resen/Resen.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resen/Resen.py b/resen/Resen.py index 2fa8e61..8a74a4f 100644 --- a/resen/Resen.py +++ b/resen/Resen.py @@ -145,8 +145,8 @@ def __get_valid_cores(self): # TODO: download json file from resen-core github repo # and if that fails, fallback to hardcoded list return [{"version":"2019.1.0rc2","repo":"resen-core","org":"earthcubeingeo", - "image_id":'sha256:0453af64162b56626e841fb42665d1db3073208406496313a68c555108230533', - "repodigest":'sha256:207c313bc06b0ddab0307f53a8950b80f60b8529fa612418633608b9e4631efb'},] + "image_id":'sha256:3ba43e401c1b1a8eca8969aec8426a22d99bca349fd837270fa06dbcaefaeb47', + "repodigest":'sha256:c3783e3b7f05ec17f9381a01009b794666107780d964e8087c62f7baaa00049d'},] def load_config(self): bucket_config = os.path.join(self.resen_root_dir,'buckets.json') From 0b0968e58feb8e018fd821ff42c0ed0cee1ecaea Mon Sep 17 00:00:00 2001 From: "Pablo M. Reyes" <3052100+pmreyes2@users.noreply.github.com> Date: Fri, 14 Jun 2019 12:01:08 -0700 Subject: [PATCH 3/4] very minor typo in percentage string format %6.2f instead of %5.2f to hold a complete 100.00 % --- resen/Resen.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resen/Resen.py b/resen/Resen.py index 8a74a4f..573e79b 100644 --- a/resen/Resen.py +++ b/resen/Resen.py @@ -750,7 +750,7 @@ def update_bar(sum_total,accumulated,t0,current_time, scale=0.5): nchars = int(percentage*scale) bar = "\r["+nchars*"="+">"+(int(100*scale)-nchars)*" "+"]" time_info = "Elapsed time: %s"%truncate_secs(current_time - t0) - print(bar+" %5.2f %%, %5.3f/%4.2fGB %s"%(percentage, + print(bar+" %6.2f %%, %5.3f/%4.2fGB %s"%(percentage, accumulated/1024**3,sum_total/1024**3,time_info),end="") id_list = [] From 0b17150286d0e4ac9a124a95374a351f5c0ca5f8 Mon Sep 17 00:00:00 2001 From: Ashton Reimer Date: Fri, 14 Jun 2019 12:45:14 -0700 Subject: [PATCH 4/4] Updated resen-core image info. --- resen/Resen.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resen/Resen.py b/resen/Resen.py index 573e79b..faa63e9 100644 --- a/resen/Resen.py +++ b/resen/Resen.py @@ -145,8 +145,8 @@ def __get_valid_cores(self): # TODO: download json file from resen-core github repo # and if that fails, fallback to hardcoded list return [{"version":"2019.1.0rc2","repo":"resen-core","org":"earthcubeingeo", - "image_id":'sha256:3ba43e401c1b1a8eca8969aec8426a22d99bca349fd837270fa06dbcaefaeb47', - "repodigest":'sha256:c3783e3b7f05ec17f9381a01009b794666107780d964e8087c62f7baaa00049d'},] + "image_id":'sha256:8b4750aa5186bdcf69a50fa10b0fd24a7c2293ef6135a9fdc594e0362443c99c', + "repodigest":'sha256:2fe3436297c23a0d5393c8dae8661c40fc73140e602bd196af3be87a5e215bc2'},] def load_config(self): bucket_config = os.path.join(self.resen_root_dir,'buckets.json')