From d9177eeb1abd3ab9394e6c1355b7feef36c88d63 Mon Sep 17 00:00:00 2001 From: Jochem Berends Date: Wed, 3 Jul 2024 10:23:20 +0200 Subject: [PATCH] Refine package location messages and update .env template The commit makes important modifications in echoing package location messages in both 'config.py' and 'build.py' files by inserting the actual package name. It provides more precise information to the user. The default URL and SCOPE_ID in the '.env.template' has also been replaced with placeholders for security purposes. Additionally, a new GitToolBoxBlame settings file is added to the '.idea' directory and '.env.template' is excluded from MANIFEST.in. --- .env.template | 4 ++-- .idea/git_toolbox_blame.xml | 6 ++++++ MANIFEST.in | 3 +-- kecpkg/commands/build.py | 2 +- kecpkg/commands/config.py | 2 +- pyproject.toml.depr | 19 ------------------- 6 files changed, 11 insertions(+), 25 deletions(-) create mode 100644 .idea/git_toolbox_blame.xml delete mode 100644 pyproject.toml.depr diff --git a/.env.template b/.env.template index 6a99c48..98a5794 100644 --- a/.env.template +++ b/.env.template @@ -14,6 +14,6 @@ ## KECHAIN_SCOPE_ID - the UUID of the project / scope. ## -KECHAIN_URL=https://pim3-test.ke-chain.com +KECHAIN_URL=https://....ke-chain.com KECHAIN_TOKEN=... token from your user account ... -KECHAIN_SCOPE_ID=12345678-1234-5678-123456-7812345678 +KECHAIN_SCOPE_ID=... scope id ... diff --git a/.idea/git_toolbox_blame.xml b/.idea/git_toolbox_blame.xml new file mode 100644 index 0000000..7dc1249 --- /dev/null +++ b/.idea/git_toolbox_blame.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/MANIFEST.in b/MANIFEST.in index 9e73c53..d04bb90 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -12,6 +12,7 @@ graft tests graft kecpkg prune .idea prune .env* +exclude .env.template prune *.depr exclude build_release.sh recursive-include kecpkg *.template @@ -20,5 +21,3 @@ global-exclude *.pyc exclude *-OFF exclude *.yml prune .github - - diff --git a/kecpkg/commands/build.py b/kecpkg/commands/build.py index a2ec128..e16221c 100644 --- a/kecpkg/commands/build.py +++ b/kecpkg/commands/build.py @@ -87,7 +87,7 @@ @click.option("-v", "--verbose", help="Be more verbose", is_flag=True) def build(package=None, **options): """Build the package and create a kecpkg file.""" - echo_info(f"Locating package ``") + echo_info(f"Locating package `{package}`") package_dir = get_package_dir(package_name=package) package_name = os.path.basename(package_dir) echo_info(f"Package `{package_name}` has been selected") diff --git a/kecpkg/commands/config.py b/kecpkg/commands/config.py index b84b14f..4f0731e 100644 --- a/kecpkg/commands/config.py +++ b/kecpkg/commands/config.py @@ -72,7 +72,7 @@ def config(package, **options): (or recently uploaded) last_upload: date and time of the last upload """ - echo_info(f"Locating package ``") + echo_info(f"Locating package `{package}`") package_dir = get_package_dir(package_name=package) package_name = os.path.basename(package_dir) echo_info(f"Package `{package_name}` has been selected") diff --git a/pyproject.toml.depr b/pyproject.toml.depr deleted file mode 100644 index c96a0ed..0000000 --- a/pyproject.toml.depr +++ /dev/null @@ -1,19 +0,0 @@ -[metadata] -name = 'kecpkg-tools' -version = '0.0.1' -description = 'packaging tools to assist in the creation of new kecpkg KE-chain executable SIM packages.' -author = 'Jochem Berends' -author_email = 'jochem.berends@ke-works.com' -license = 'Apache-2.0' -url = 'https://github.com/_/kecpkg-tools' - -[requires] -python_version = ['2.7', '3.5', '3.6', 'pypy', 'pypy3'] -requires = ['click', 'atomicwrites', 'jinja2', 'hatch', 'pykechain>=1.13', 'python-gnupg'] -testing_requires = ['coverage', 'pytest', 'toml', 'flake8', ] - -[build-system] -requires = ['setuptools', 'wheel'] - -[tool.hatch.commands] -prerelease = 'hatch build'