From 4f29c8107ed8d0efae29a8b42531fa1d792bae09 Mon Sep 17 00:00:00 2001
From: ldericher <40151420+ldericher@users.noreply.github.com>
Date: Tue, 28 Sep 2021 13:23:15 +0200
Subject: [PATCH] Pipenv => Poetry
---
.idea/kiwi-scp.iml | 2 +-
.idea/misc.xml | 2 +-
Pipfile | 12 ----
Pipfile.lock | 56 -------------------
bump-version.sh | 5 +-
{data => kiwi_scp/data}/etc/command_help.txt | 0
.../data}/etc/docker-compose_default.yml | 0
{data => kiwi_scp/data}/etc/kiwi_default.yml | 0
{data => kiwi_scp/data}/etc/kiwi_header.yml | 0
{data => kiwi_scp/data}/etc/kiwi_help.txt | 0
{data => kiwi_scp/data}/etc/version_tag | 0
.../data}/images/rsync.Dockerfile | 0
poetry.lock | 45 +++++++++++++++
pyproject.toml | 18 ++++++
setup.py | 16 ++++--
15 files changed, 80 insertions(+), 76 deletions(-)
delete mode 100644 Pipfile
delete mode 100644 Pipfile.lock
rename {data => kiwi_scp/data}/etc/command_help.txt (100%)
rename {data => kiwi_scp/data}/etc/docker-compose_default.yml (100%)
rename {data => kiwi_scp/data}/etc/kiwi_default.yml (100%)
rename {data => kiwi_scp/data}/etc/kiwi_header.yml (100%)
rename {data => kiwi_scp/data}/etc/kiwi_help.txt (100%)
rename {data => kiwi_scp/data}/etc/version_tag (100%)
rename {data => kiwi_scp/data}/images/rsync.Dockerfile (100%)
create mode 100644 poetry.lock
create mode 100644 pyproject.toml
diff --git a/.idea/kiwi-scp.iml b/.idea/kiwi-scp.iml
index a74c05f..127e464 100644
--- a/.idea/kiwi-scp.iml
+++ b/.idea/kiwi-scp.iml
@@ -5,7 +5,7 @@
-
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index bd89605..174826d 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,4 @@
-
+
\ No newline at end of file
diff --git a/Pipfile b/Pipfile
deleted file mode 100644
index 38477a7..0000000
--- a/Pipfile
+++ /dev/null
@@ -1,12 +0,0 @@
-[[source]]
-name = "pypi"
-url = "https://pypi.org/simple"
-verify_ssl = true
-
-[dev-packages]
-
-[packages]
-pyyaml = "*"
-
-[requires]
-python_version = "3.6"
diff --git a/Pipfile.lock b/Pipfile.lock
deleted file mode 100644
index 30dd482..0000000
--- a/Pipfile.lock
+++ /dev/null
@@ -1,56 +0,0 @@
-{
- "_meta": {
- "hash": {
- "sha256": "d518a36ed441568acff15b0a3c4b536738a55fb68801cdd682045be04d29954a"
- },
- "pipfile-spec": 6,
- "requires": {
- "python_version": "3.6"
- },
- "sources": [
- {
- "name": "pypi",
- "url": "https://pypi.org/simple",
- "verify_ssl": true
- }
- ]
- },
- "default": {
- "pyyaml": {
- "hashes": [
- "sha256:08682f6b72c722394747bddaf0aa62277e02557c0fd1c42cb853016a38f8dedf",
- "sha256:0f5f5786c0e09baddcd8b4b45f20a7b5d61a7e7e99846e3c799b05c7c53fa696",
- "sha256:129def1b7c1bf22faffd67b8f3724645203b79d8f4cc81f674654d9902cb4393",
- "sha256:294db365efa064d00b8d1ef65d8ea2c3426ac366c0c4368d930bf1c5fb497f77",
- "sha256:3b2b1824fe7112845700f815ff6a489360226a5609b96ec2190a45e62a9fc922",
- "sha256:3bd0e463264cf257d1ffd2e40223b197271046d09dadf73a0fe82b9c1fc385a5",
- "sha256:4465124ef1b18d9ace298060f4eccc64b0850899ac4ac53294547536533800c8",
- "sha256:49d4cdd9065b9b6e206d0595fee27a96b5dd22618e7520c33204a4a3239d5b10",
- "sha256:4e0583d24c881e14342eaf4ec5fbc97f934b999a6828693a99157fde912540cc",
- "sha256:5accb17103e43963b80e6f837831f38d314a0495500067cb25afab2e8d7a4018",
- "sha256:607774cbba28732bfa802b54baa7484215f530991055bb562efbed5b2f20a45e",
- "sha256:6c78645d400265a062508ae399b60b8c167bf003db364ecb26dcab2bda048253",
- "sha256:72a01f726a9c7851ca9bfad6fd09ca4e090a023c00945ea05ba1638c09dc3347",
- "sha256:74c1485f7707cf707a7aef42ef6322b8f97921bd89be2ab6317fd782c2d53183",
- "sha256:895f61ef02e8fed38159bb70f7e100e00f471eae2bc838cd0f4ebb21e28f8541",
- "sha256:8c1be557ee92a20f184922c7b6424e8ab6691788e6d86137c5d93c1a6ec1b8fb",
- "sha256:bb4191dfc9306777bc594117aee052446b3fa88737cd13b7188d0e7aa8162185",
- "sha256:bfb51918d4ff3d77c1c856a9699f8492c612cde32fd3bcd344af9be34999bfdc",
- "sha256:c20cfa2d49991c8b4147af39859b167664f2ad4561704ee74c1de03318e898db",
- "sha256:cb333c16912324fd5f769fff6bc5de372e9e7a202247b48870bc251ed40239aa",
- "sha256:d2d9808ea7b4af864f35ea216be506ecec180628aced0704e34aca0b040ffe46",
- "sha256:d483ad4e639292c90170eb6f7783ad19490e7a8defb3e46f97dfe4bacae89122",
- "sha256:dd5de0646207f053eb0d6c74ae45ba98c3395a571a2891858e87df7c9b9bd51b",
- "sha256:e1d4970ea66be07ae37a3c2e48b5ec63f7ba6804bdddfdbd3cfd954d25a82e63",
- "sha256:e4fac90784481d221a8e4b1162afa7c47ed953be40d31ab4629ae917510051df",
- "sha256:fa5ae20527d8e831e8230cbffd9f8fe952815b2b7dae6ffec25318803a7528fc",
- "sha256:fd7f6999a8070df521b6384004ef42833b9bd62cfee11a09bda1079b4b704247",
- "sha256:fdc842473cd33f45ff6bce46aea678a54e3d21f1b61a7750ce3c498eedfe25d6",
- "sha256:fe69978f3f768926cfa37b867e3843918e012cf83f680806599ddce33c2c68b0"
- ],
- "index": "pypi",
- "version": "==5.4.1"
- }
- },
- "develop": {}
-}
diff --git a/bump-version.sh b/bump-version.sh
index 9278bd4..c313d4c 100755
--- a/bump-version.sh
+++ b/bump-version.sh
@@ -6,7 +6,8 @@ this_dir="$(dirname "${this}")"
git_branch="$(git rev-parse --abbrev-ref HEAD)"
git_tag="$(git describe --abbrev=0)"
version_str="${git_branch##*/}"
+version_str="0.1.6"
-echo "${version_str}" > "${this_dir}/src/etc/version_tag"
+echo "${version_str}" > "${this_dir}/kiwi_scp/data/etc/version_tag"
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"
+sed -ri "s/(version\s*=\s*).*$/\1\"${version_str}\"/" "${this_dir}/pyproject.toml"
diff --git a/data/etc/command_help.txt b/kiwi_scp/data/etc/command_help.txt
similarity index 100%
rename from data/etc/command_help.txt
rename to kiwi_scp/data/etc/command_help.txt
diff --git a/data/etc/docker-compose_default.yml b/kiwi_scp/data/etc/docker-compose_default.yml
similarity index 100%
rename from data/etc/docker-compose_default.yml
rename to kiwi_scp/data/etc/docker-compose_default.yml
diff --git a/data/etc/kiwi_default.yml b/kiwi_scp/data/etc/kiwi_default.yml
similarity index 100%
rename from data/etc/kiwi_default.yml
rename to kiwi_scp/data/etc/kiwi_default.yml
diff --git a/data/etc/kiwi_header.yml b/kiwi_scp/data/etc/kiwi_header.yml
similarity index 100%
rename from data/etc/kiwi_header.yml
rename to kiwi_scp/data/etc/kiwi_header.yml
diff --git a/data/etc/kiwi_help.txt b/kiwi_scp/data/etc/kiwi_help.txt
similarity index 100%
rename from data/etc/kiwi_help.txt
rename to kiwi_scp/data/etc/kiwi_help.txt
diff --git a/data/etc/version_tag b/kiwi_scp/data/etc/version_tag
similarity index 100%
rename from data/etc/version_tag
rename to kiwi_scp/data/etc/version_tag
diff --git a/data/images/rsync.Dockerfile b/kiwi_scp/data/images/rsync.Dockerfile
similarity index 100%
rename from data/images/rsync.Dockerfile
rename to kiwi_scp/data/images/rsync.Dockerfile
diff --git a/poetry.lock b/poetry.lock
new file mode 100644
index 0000000..dd53b7f
--- /dev/null
+++ b/poetry.lock
@@ -0,0 +1,45 @@
+[[package]]
+name = "pyyaml"
+version = "5.4.1"
+description = "YAML parser and emitter for Python"
+category = "main"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*"
+
+[metadata]
+lock-version = "1.1"
+python-versions = "^3.6"
+content-hash = "36970da0e8c6151dcf68abd9008ecef35673f04db53952bfb3fd7544c0516b7f"
+
+[metadata.files]
+pyyaml = [
+ {file = "PyYAML-5.4.1-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:3b2b1824fe7112845700f815ff6a489360226a5609b96ec2190a45e62a9fc922"},
+ {file = "PyYAML-5.4.1-cp27-cp27m-win32.whl", hash = "sha256:129def1b7c1bf22faffd67b8f3724645203b79d8f4cc81f674654d9902cb4393"},
+ {file = "PyYAML-5.4.1-cp27-cp27m-win_amd64.whl", hash = "sha256:4465124ef1b18d9ace298060f4eccc64b0850899ac4ac53294547536533800c8"},
+ {file = "PyYAML-5.4.1-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:bb4191dfc9306777bc594117aee052446b3fa88737cd13b7188d0e7aa8162185"},
+ {file = "PyYAML-5.4.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:6c78645d400265a062508ae399b60b8c167bf003db364ecb26dcab2bda048253"},
+ {file = "PyYAML-5.4.1-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:4e0583d24c881e14342eaf4ec5fbc97f934b999a6828693a99157fde912540cc"},
+ {file = "PyYAML-5.4.1-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:72a01f726a9c7851ca9bfad6fd09ca4e090a023c00945ea05ba1638c09dc3347"},
+ {file = "PyYAML-5.4.1-cp36-cp36m-manylinux2014_s390x.whl", hash = "sha256:895f61ef02e8fed38159bb70f7e100e00f471eae2bc838cd0f4ebb21e28f8541"},
+ {file = "PyYAML-5.4.1-cp36-cp36m-win32.whl", hash = "sha256:3bd0e463264cf257d1ffd2e40223b197271046d09dadf73a0fe82b9c1fc385a5"},
+ {file = "PyYAML-5.4.1-cp36-cp36m-win_amd64.whl", hash = "sha256:e4fac90784481d221a8e4b1162afa7c47ed953be40d31ab4629ae917510051df"},
+ {file = "PyYAML-5.4.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:5accb17103e43963b80e6f837831f38d314a0495500067cb25afab2e8d7a4018"},
+ {file = "PyYAML-5.4.1-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:e1d4970ea66be07ae37a3c2e48b5ec63f7ba6804bdddfdbd3cfd954d25a82e63"},
+ {file = "PyYAML-5.4.1-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:cb333c16912324fd5f769fff6bc5de372e9e7a202247b48870bc251ed40239aa"},
+ {file = "PyYAML-5.4.1-cp37-cp37m-manylinux2014_s390x.whl", hash = "sha256:fe69978f3f768926cfa37b867e3843918e012cf83f680806599ddce33c2c68b0"},
+ {file = "PyYAML-5.4.1-cp37-cp37m-win32.whl", hash = "sha256:dd5de0646207f053eb0d6c74ae45ba98c3395a571a2891858e87df7c9b9bd51b"},
+ {file = "PyYAML-5.4.1-cp37-cp37m-win_amd64.whl", hash = "sha256:08682f6b72c722394747bddaf0aa62277e02557c0fd1c42cb853016a38f8dedf"},
+ {file = "PyYAML-5.4.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:d2d9808ea7b4af864f35ea216be506ecec180628aced0704e34aca0b040ffe46"},
+ {file = "PyYAML-5.4.1-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:8c1be557ee92a20f184922c7b6424e8ab6691788e6d86137c5d93c1a6ec1b8fb"},
+ {file = "PyYAML-5.4.1-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:fd7f6999a8070df521b6384004ef42833b9bd62cfee11a09bda1079b4b704247"},
+ {file = "PyYAML-5.4.1-cp38-cp38-manylinux2014_s390x.whl", hash = "sha256:bfb51918d4ff3d77c1c856a9699f8492c612cde32fd3bcd344af9be34999bfdc"},
+ {file = "PyYAML-5.4.1-cp38-cp38-win32.whl", hash = "sha256:fa5ae20527d8e831e8230cbffd9f8fe952815b2b7dae6ffec25318803a7528fc"},
+ {file = "PyYAML-5.4.1-cp38-cp38-win_amd64.whl", hash = "sha256:0f5f5786c0e09baddcd8b4b45f20a7b5d61a7e7e99846e3c799b05c7c53fa696"},
+ {file = "PyYAML-5.4.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:294db365efa064d00b8d1ef65d8ea2c3426ac366c0c4368d930bf1c5fb497f77"},
+ {file = "PyYAML-5.4.1-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:74c1485f7707cf707a7aef42ef6322b8f97921bd89be2ab6317fd782c2d53183"},
+ {file = "PyYAML-5.4.1-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:d483ad4e639292c90170eb6f7783ad19490e7a8defb3e46f97dfe4bacae89122"},
+ {file = "PyYAML-5.4.1-cp39-cp39-manylinux2014_s390x.whl", hash = "sha256:fdc842473cd33f45ff6bce46aea678a54e3d21f1b61a7750ce3c498eedfe25d6"},
+ {file = "PyYAML-5.4.1-cp39-cp39-win32.whl", hash = "sha256:49d4cdd9065b9b6e206d0595fee27a96b5dd22618e7520c33204a4a3239d5b10"},
+ {file = "PyYAML-5.4.1-cp39-cp39-win_amd64.whl", hash = "sha256:c20cfa2d49991c8b4147af39859b167664f2ad4561704ee74c1de03318e898db"},
+ {file = "PyYAML-5.4.1.tar.gz", hash = "sha256:607774cbba28732bfa802b54baa7484215f530991055bb562efbed5b2f20a45e"},
+]
diff --git a/pyproject.toml b/pyproject.toml
new file mode 100644
index 0000000..b134696
--- /dev/null
+++ b/pyproject.toml
@@ -0,0 +1,18 @@
+[tool.poetry]
+name = "kiwi-scp"
+version = "0.1.6"
+description = "kiwi is the simple tool for managing container servers."
+authors = ["ldericher <40151420+ldericher@users.noreply.github.com>"]
+
+[tool.poetry.dependencies]
+python = "^3.6"
+PyYAML = "^5.4.1"
+
+[tool.poetry.dev-dependencies]
+
+[tool.poetry.scripts]
+kiwi = "kiwi_scp.scripts.kiwi:main"
+
+[build-system]
+requires = ["poetry-core>=1.0.0"]
+build-backend = "poetry.core.masonry.api"
diff --git a/setup.py b/setup.py
index ee07190..a3f96d2 100644
--- a/setup.py
+++ b/setup.py
@@ -3,21 +3,29 @@ from setuptools import setup, find_packages
setup(
name="kiwi_scp",
version="0.1.6",
+ description="kiwi is the simple tool for managing container servers.",
+ long_description=open("README.md").read(),
packages=find_packages(),
+ license="LICENSE",
+
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"])
+ ('./kiwi_scp/', [
+ "*.txt",
+ "*.yml",
+ "*.Dockerfile",
+ "data/etc/version_tag",
+ ])
],
include_package_data=True,
- license="LICENSE",
- description="kiwi is the simple tool for managing container servers.",
- long_description=open("README.md").read(),
)