diff --git a/elmada/_version.py b/elmada/_version.py index 27fdca4..81f0fde 100644 --- a/elmada/_version.py +++ b/elmada/_version.py @@ -1 +1 @@ -__version__ = "0.0.3" +__version__ = "0.0.4" diff --git a/elmada/cc_share.py b/elmada/cc_share.py index 4f32695..b351bd4 100644 --- a/elmada/cc_share.py +++ b/elmada/cc_share.py @@ -24,7 +24,7 @@ def get_ccgt_shares_from_cascade(): wiki = get_wiki_shares(cache=True).rename("manual") opsd = pd.Series({"DE": get_ccgt_DE()}).rename("opsd") - df = pd.concat([wiki, rich_geo, opsd], 1, sort=False) + df = pd.concat([wiki, rich_geo, opsd], axis=1, sort=False) def select_source(row): if not np.isnan(row["opsd"]): @@ -293,7 +293,7 @@ def get_ccgt_IT(): df2 = pd.DataFrame.from_dict(is_ccgt, "index", columns=["is_ccgt", "source"]).reset_index( drop=True ) - df = pd.concat([df, df2], 1) + df = pd.concat([df, df2], axis=1) df["is_ccgt"] = df["is_ccgt"].astype("float") return (df[cap_col] * df["is_ccgt"]).sum() / df[cap_col].sum() diff --git a/environment.yml b/environment.yml index be66d5f..a7088c6 100644 --- a/environment.yml +++ b/environment.yml @@ -16,7 +16,6 @@ dependencies: # NOTE: here '=' (single) - pytest - pytest-cov - pytest-mock - - python-snappy - python>=3.7 - quandl - requests diff --git a/setup.py b/setup.py index f024a69..5427c7a 100644 --- a/setup.py +++ b/setup.py @@ -53,7 +53,6 @@ def get_extra_requires(path, add_all=True): "numpy", "pandas", "pyarrow", - "python-snappy", "quandl", "requests", "scipy",