Skip to content

Commit

Permalink
replace progressbar by tqdm
Browse files Browse the repository at this point in the history
  • Loading branch information
FabianHofmann committed Feb 22, 2023
1 parent ec4191f commit 825d3e8
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 12 deletions.
1 change: 0 additions & 1 deletion envs/environment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ dependencies:
- networkx
- scipy
- shapely>=2.0
- progressbar2
- pyomo
- matplotlib<3.6
- proj
Expand Down
21 changes: 10 additions & 11 deletions scripts/_helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
# SPDX-License-Identifier: MIT

from pathlib import Path

import urllib
from tqdm import tqdm
import pandas as pd

REGION_COLS = ["geometry", "name", "x", "y", "country"]
Expand Down Expand Up @@ -251,16 +252,14 @@ def aggregate_costs(n, flatten=False, opts=None, existing_only=False):


def progress_retrieve(url, file):
import urllib

from progressbar import ProgressBar

pbar = ProgressBar(0, 100)

def dlProgress(count, blockSize, totalSize):
pbar.update(int(count * blockSize * 100 / totalSize))

urllib.request.urlretrieve(url, file, reporthook=dlProgress)

with tqdm(unit='B', unit_scale=True, unit_divisor=1024, miniters=1, position=0, leave=True) as t:
def update_to(b=1, bsize=1, tsize=None):
if tsize is not None:
t.total = tsize
t.update(b * bsize - t.n)

urllib.request.urlretrieve(url, file, reporthook=update_to)


def get_aggregation_strategies(aggregation_strategies):
Expand Down

0 comments on commit 825d3e8

Please sign in to comment.