diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 0fd9451..d2c00ab 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -1 +1 @@ -custom: ["https://flattr.com/@Krateng", "https://paypal.me/krateng"] +custom: ["https://paypal.me/krateng"] diff --git a/maloja/__main__.py b/maloja/__main__.py index e39fce3..78d9a7a 100644 --- a/maloja/__main__.py +++ b/maloja/__main__.py @@ -141,7 +141,7 @@ def print_info(): print(col['lightblue']("Timezone: "),f"UTC{conf.malojaconfig['timezone']:+d}") print() try: - import pkg_resources + from setuptools.dist import pkg_resources for pkg in ("sqlalchemy","waitress","bottle","doreah","jinja2"): print(col['cyan'] (f"{pkg}:".ljust(13)),pkg_resources.get_distribution(pkg).version) except ImportError: diff --git a/maloja/setup.py b/maloja/setup.py index b74dbab..cfa52f4 100644 --- a/maloja/setup.py +++ b/maloja/setup.py @@ -1,7 +1,7 @@ import os from importlib import resources -from distutils import dir_util +from setuptools import distutils from doreah.io import col, ask, prompt from doreah import auth @@ -23,7 +23,7 @@ ext_apikeys = [ def copy_initial_local_files(): with resources.files("maloja") / 'data_files' as folder: for cat in dir_settings: - dir_util.copy_tree(os.path.join(folder,cat),dir_settings[cat],update=False) + distutils.dir_util.copy_tree(os.path.join(folder,cat),dir_settings[cat],update=False) charset = list(range(10)) + list("abcdefghijklmnopqrstuvwxyz") + list("ABCDEFGHIJKLMNOPQRSTUVWXYZ") def randomstring(length=32):