Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[MNT]: 2019.1.0rc2 prep #34

Merged
merged 4 commits into from
Jun 14, 2019
Merged

[MNT]: 2019.1.0rc2 prep #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8c37f14
Bumping version numbers, updated contact info, replaced valid cores.
asreimer Jun 14, 2019
25d2130
update rc2 digest and image ids
asreimer Jun 14, 2019
0b0968e
very minor typo in percentage string format
pmreyes2 Jun 14, 2019
0b17150
Updated resen-core image info.
asreimer Jun 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions resen/Resen.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:8b4750aa5186bdcf69a50fa10b0fd24a7c2293ef6135a9fdc594e0362443c99c',
"repodigest":'sha256:2fe3436297c23a0d5393c8dae8661c40fc73140e602bd196af3be87a5e215bc2'},]

def load_config(self):
bucket_config = os.path.join(self.resen_root_dir,'buckets.json')
Expand Down Expand Up @@ -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,
asreimer marked this conversation as resolved.
Show resolved Hide resolved
accumulated/1024**3,sum_total/1024**3,time_info),end="")

id_list = []
Expand Down
4 changes: 2 additions & 2 deletions resen/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
__version__ = '2019.1.0rc1'
__version__ = '2019.1.0rc2'

from .Resen import Resen
from .Resen import Resen
4 changes: 2 additions & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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',
Expand Down