Skip to content

Commit

Permalink
Merge pull request #34 from EarthCubeInGeo/mnt_2019.1.0rc2_prep
Browse files Browse the repository at this point in the history
[MNT]: 2019.1.0rc2 prep
  • Loading branch information
asreimer authored Jun 14, 2019
2 parents 8af1f37 + 0b17150 commit 5faed8e
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions resen/Resen.py
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,
accumulated/1024**3,sum_total/1024**3,time_info),end="")

id_list = []
Expand Down
4 changes: 2 additions & 2 deletions resen/__init__.py
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
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

0 comments on commit 5faed8e

Please sign in to comment.