pip installable, but not correct

This commit is contained in:
Jörn-Michael Miehe 2021-09-28 12:17:53 +02:00
parent e6d70a71dd
commit ba3c34c7a7
40 changed files with 29 additions and 8 deletions

View file

@ -4,7 +4,9 @@ this="$(readlink -f "${0}")"
this_dir="$(dirname "${this}")" this_dir="$(dirname "${this}")"
git_branch="$(git rev-parse --abbrev-ref HEAD)" git_branch="$(git rev-parse --abbrev-ref HEAD)"
git_tag="$(git describe --abbrev=0)"
version_str="${git_branch##*/}" version_str="${git_branch##*/}"
echo "${version_str}" > "${this_dir}/src/etc/version_tag" echo "${version_str}" > "${this_dir}/src/etc/version_tag"
sed -ri "s/(version\s*:).*$/\1 '${version_str}'/" "${this_dir}/example/kiwi.yml" sed -ri "s/(version\s*:).*$/\1 '${version_str}'/" "${this_dir}/example/kiwi.yml"
sed -ri "s/(version\s*=\s*).*$/\1\"${version_str}\",/" "${this_dir}/setup.py"

View file

@ -3,9 +3,6 @@ import logging
import os import os
import subprocess import subprocess
# local
from .config import LoadedConfig
def _is_executable(filename): def _is_executable(filename):
if filename is None: if filename is None:

View file

@ -1,6 +1,6 @@
import os import os
from kiwi.project import Project from .project import Project
class Projects: class Projects:

View file

View file

@ -4,7 +4,7 @@
import logging import logging
# local # local
import kiwi import kiwi_scp
def set_verbosity(logger, handler, verbosity): def set_verbosity(logger, handler, verbosity):
@ -28,10 +28,10 @@ def main():
# add a new handler (needed to set the level) # add a new handler (needed to set the level)
log_handler = logging.StreamHandler() log_handler = logging.StreamHandler()
logging.getLogger().addHandler(log_handler) logging.getLogger().addHandler(log_handler)
set_verbosity(logging.getLogger(), log_handler, kiwi.verbosity()) set_verbosity(logging.getLogger(), log_handler, kiwi_scp.verbosity())
# run the app # run the app
if not kiwi.run(): if not kiwi_scp.run():
quit(1) quit(1)

View file

@ -3,7 +3,6 @@ import logging
import subprocess import subprocess
# local # local
from .._constants import CONF_DIRECTORY_NAME
from ..config import LoadedConfig from ..config import LoadedConfig
from ..executable import Executable from ..executable import Executable
from ..projects import Projects from ..projects import Projects

23
setup.py Normal file
View file

@ -0,0 +1,23 @@
from setuptools import setup, find_packages
setup(
name="kiwi_scp",
version="0.1.6",
packages=find_packages(),
author="LDericher",
author_email="ldericher@gmx.de",
setup_requires="setuptools-pipfile",
use_pipfile=True,
entry_points={
"console_scripts": [
"kiwi = kiwi_scp.scripts.kiwi:main"
],
},
data_files=[
("", ["data/etc/kiwi_help.txt"])
],
include_package_data=True,
license="LICENSE",
description="kiwi is the simple tool for managing container servers.",
long_description=open("README.md").read(),
)