From be660c91e817a39bb3bbbffadeca6ee77d041539 Mon Sep 17 00:00:00 2001 From: Ahmed Bilal Khalid Date: Fri, 30 Aug 2019 18:26:22 +0500 Subject: [PATCH] a --- Pipfile | 1 + Pipfile.lock | 106 ++++++++++++++++++++++++++++------------------- app/abk.py | 32 ++++++++++++++ app/api.py | 2 +- app/helper.py | 33 ++++++++++++++- meowPip | 15 +++++++ meowPippy | 15 +++++++ new_pip.txt | 2 + requirements.txt | 0 9 files changed, 160 insertions(+), 46 deletions(-) create mode 100644 app/abk.py create mode 100644 meowPip create mode 100644 meowPippy create mode 100644 new_pip.txt create mode 100644 requirements.txt diff --git a/Pipfile b/Pipfile index 7809482..7a24987 100644 --- a/Pipfile +++ b/Pipfile @@ -9,6 +9,7 @@ prospector = "*" [packages] click = "*" +pipfile = "*" [requires] python_version = "3.7" diff --git a/Pipfile.lock b/Pipfile.lock index 092d54d..07a37be 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,44 +1,64 @@ { "_meta": { "hash": { - "sha256": "889e682e3db0471b72d904bf85ca600a2f783edcf226ef591a5408589adcaf72" + "sha256": "737ca855c96829ca692f40d2501d5f65fa3e88746564dc09e827257685deab84" }, "pipfile-spec": 6, - "requires": {"python_version": "3.7"}, + "requires": { + "python_version": "3.7" + }, "sources": [ - {"name": "pypi", "url": "https://pypi.org/simple", "verify_ssl": true} - ], + { + "name": "pypi", + "url": "https://pypi.org/simple", + "verify_ssl": true + } + ] }, "default": { "click": { "hashes": [ "sha256:2335065e6395b9e67ca716de5f7526736bfa6ceead690adf616d925bdc622b13", - "sha256:5b94b49521f6456670fdb30cd82a4eca9412788a93fa6dd6df72c94d5a8ff2d7", + "sha256:5b94b49521f6456670fdb30cd82a4eca9412788a93fa6dd6df72c94d5a8ff2d7" ], "index": "pypi", - "version": "==7.0", + "version": "==7.0" + }, + "pipfile": { + "hashes": [ + "sha256:f7d9f15de8b660986557eb3cc5391aa1a16207ac41bc378d03f414762d36c984" + ], + "index": "pypi", + "version": "==0.0.2" + }, + "toml": { + "hashes": [ + "sha256:229f81c57791a41d65e399fc06bf0848bab550a9dfd5ed66df18ce5f05e73d5c", + "sha256:235682dd292d5899d361a811df37e04a8828a5b1da3115886b73cf81ebc9100e" + ], + "version": "==0.10.0" } }, "develop": { "astroid": { "hashes": [ "sha256:6560e1e1749f68c64a4b5dee4e091fce798d2f0d84ebe638cf0e0585a343acf4", - "sha256:b65db1bbaac9f9f4d190199bb8680af6f6f84fd3769a5ea883df8a91fe68b4c4", + "sha256:b65db1bbaac9f9f4d190199bb8680af6f6f84fd3769a5ea883df8a91fe68b4c4" ], - "version": "==2.2.5", + "version": "==2.2.5" }, "dodgy": { "hashes": [ "sha256:65e13cf878d7aff129f1461c13cb5fd1bb6dfe66bb5327e09379c3877763280c" ], - "version": "==0.1.9", + "version": "==0.1.9" }, "isort": { "hashes": [ "sha256:54da7e92468955c4fceacd0c86bd0ec997b0e1ee80d97f67c35a78b719dccab1", - "sha256:6e811fcb295968434526407adb8796944f1988c5b65e8139058f2014cbe100fd", + "sha256:6e811fcb295968434526407adb8796944f1988c5b65e8139058f2014cbe100fd" ], - "version": "==4.3.21", + "version": "==4.3.21" }, "lazy-object-proxy": { "hashes": [ @@ -59,84 +79,84 @@ "sha256:ae33dd198f772f714420c5ab698ff05ff900150486c648d29951e9c70694338e", "sha256:b4a2b782b8a8c5522ad35c93e04d60e2ba7f7dcb9271ec8e8c3e08239be6c7b4", "sha256:c462eb33f6abca3b34cdedbe84d761f31a60b814e173b98ede3c81bb48967c4f", - "sha256:fd135b8d35dfdcdb984828c84d695937e58cc5f49e1c854eb311c4d6aa03f4f1", + "sha256:fd135b8d35dfdcdb984828c84d695937e58cc5f49e1c854eb311c4d6aa03f4f1" ], - "version": "==1.4.2", + "version": "==1.4.2" }, "mccabe": { "hashes": [ "sha256:ab8a6258860da4b6677da4bd2fe5dc2c659cff31b3ee4f7f5d64e79735b80d42", - "sha256:dd8d182285a0fe56bace7f45b5e7d1a6ebcbf524e8f3bd87eb0f125271b8831f", + "sha256:dd8d182285a0fe56bace7f45b5e7d1a6ebcbf524e8f3bd87eb0f125271b8831f" ], - "version": "==0.6.1", + "version": "==0.6.1" }, "pep8-naming": { "hashes": [ "sha256:1b419fa45b68b61cd8c5daf4e0c96d28915ad14d3d5f35fcc1e7e95324a33a2e", - "sha256:4eedfd4c4b05e48796f74f5d8628c068ff788b9c2b08471ad408007fc6450e5a", + "sha256:4eedfd4c4b05e48796f74f5d8628c068ff788b9c2b08471ad408007fc6450e5a" ], - "version": "==0.4.1", + "version": "==0.4.1" }, "prospector": { "hashes": [ "sha256:aba551e53dc1a5a432afa67385eaa81d7b4cf4c162dc1a4d0ee00b3a0712ad90" ], "index": "pypi", - "version": "==1.1.7", + "version": "==1.1.7" }, "pycodestyle": { "hashes": [ "sha256:cbc619d09254895b0d12c2c691e237b2e91e9b2ecf5e84c26b35400f93dcfb83", - "sha256:cbfca99bd594a10f674d0cd97a3d802a1fdef635d4361e1a2658de47ed261e3a", + "sha256:cbfca99bd594a10f674d0cd97a3d802a1fdef635d4361e1a2658de47ed261e3a" ], - "version": "==2.4.0", + "version": "==2.4.0" }, "pydocstyle": { "hashes": [ "sha256:04c84e034ebb56eb6396c820442b8c4499ac5eb94a3bda88951ac3dc519b6058", - "sha256:66aff87ffe34b1e49bff2dd03a88ce6843be2f3346b0c9814410d34987fbab59", + "sha256:66aff87ffe34b1e49bff2dd03a88ce6843be2f3346b0c9814410d34987fbab59" ], - "version": "==4.0.1", + "version": "==4.0.1" }, "pyflakes": { "hashes": [ "sha256:08bd6a50edf8cffa9fa09a463063c425ecaaf10d1eb0335a7e8b1401aef89e6f", - "sha256:8d616a382f243dbf19b54743f280b80198be0bca3a5396f1d2e1fca6223e8805", + "sha256:8d616a382f243dbf19b54743f280b80198be0bca3a5396f1d2e1fca6223e8805" ], - "version": "==1.6.0", + "version": "==1.6.0" }, "pylint": { "hashes": [ "sha256:5d77031694a5fb97ea95e828c8d10fc770a1df6eb3906067aaed42201a8a6a09", - "sha256:723e3db49555abaf9bf79dc474c6b9e2935ad82230b10c1138a71ea41ac0fff1", + "sha256:723e3db49555abaf9bf79dc474c6b9e2935ad82230b10c1138a71ea41ac0fff1" ], "index": "pypi", - "version": "==2.3.1", + "version": "==2.3.1" }, "pylint-celery": { "hashes": [ "sha256:41e32094e7408d15c044178ea828dd524beedbdbe6f83f712c5e35bde1de4beb" ], - "version": "==0.3", + "version": "==0.3" }, "pylint-django": { "hashes": [ "sha256:75c69d1ec2275918c37f175976da20e2f1e1e62e067098a685cd263ffa833dfd", - "sha256:c7cb6384ea7b33ea77052a5ae07358c10d377807390ef27b2e6ff997303fadb7", + "sha256:c7cb6384ea7b33ea77052a5ae07358c10d377807390ef27b2e6ff997303fadb7" ], - "version": "==2.0.10", + "version": "==2.0.10" }, "pylint-flask": { "hashes": [ "sha256:f4d97de2216bf7bfce07c9c08b166e978fe9f2725de2a50a9845a97de7e31517" ], - "version": "==0.6", + "version": "==0.6" }, "pylint-plugin-utils": { "hashes": [ "sha256:8d9e31d5ea8b7b0003e1f0f136b44a5235896a32e47c5bc2ef1143e9f6ba0b74" ], - "version": "==0.5", + "version": "==0.5" }, "pyyaml": { "hashes": [ @@ -152,34 +172,34 @@ "sha256:b0997827b4f6a7c286c01c5f60384d218dca4ed7d9efa945c3e1aa623d5709ae", "sha256:b631ef96d3222e62861443cc89d6563ba3eeb816eeb96b2629345ab795e53681", "sha256:bf47c0607522fdbca6c9e817a6e81b08491de50f3766a7a0e6a5be7905961b41", - "sha256:f81025eddd0327c7d4cfe9b62cf33190e1e736cc6e97502b3ec425f574b3e7a8", + "sha256:f81025eddd0327c7d4cfe9b62cf33190e1e736cc6e97502b3ec425f574b3e7a8" ], - "version": "==5.1.2", + "version": "==5.1.2" }, "requirements-detector": { "hashes": [ "sha256:9fbc4b24e8b7c3663aff32e3eba34596848c6b91bd425079b386973bd8d08931" ], - "version": "==0.6", + "version": "==0.6" }, "setoptconf": { "hashes": [ "sha256:5b0b5d8e0077713f5d5152d4f63be6f048d9a1bb66be15d089a11c898c3cf49c" ], - "version": "==0.2.0", + "version": "==0.2.0" }, "six": { "hashes": [ "sha256:3350809f0555b11f552448330d0b52d5f24c91a322ea4a15ef22629740f3761c", - "sha256:d16a0141ec1a18405cd4ce8b4613101da75da0e9a7aec5bdd4fa804d0e0eba73", + "sha256:d16a0141ec1a18405cd4ce8b4613101da75da0e9a7aec5bdd4fa804d0e0eba73" ], - "version": "==1.12.0", + "version": "==1.12.0" }, "snowballstemmer": { "hashes": [ "sha256:9f3b9ffe0809d174f7047e121431acf99c89a7040f0ca84f94ba53a498e6d0c9" ], - "version": "==1.9.0", + "version": "==1.9.0" }, "typed-ast": { "hashes": [ @@ -197,16 +217,16 @@ "sha256:d755f03c1e4a51e9b24d899561fec4ccaf51f210d52abdf8c07ee2849b212a36", "sha256:d7c45933b1bdfaf9f36c579671fec15d25b06c8398f113dab64c18ed1adda01d", "sha256:d896919306dd0aa22d0132f62a1b78d11aaf4c9fc5b3410d3c666b818191630a", - "sha256:ffde2fbfad571af120fcbfbbc61c72469e72f550d676c3342492a9dfdefb8f12", + "sha256:ffde2fbfad571af120fcbfbbc61c72469e72f550d676c3342492a9dfdefb8f12" ], "markers": "implementation_name == 'cpython'", - "version": "==1.4.0", + "version": "==1.4.0" }, "wrapt": { "hashes": [ "sha256:565a021fd19419476b9362b05eeaa094178de64f8361e44468f9e9d7843901e1" ], - "version": "==1.11.2", - }, - }, + "version": "==1.11.2" + } + } } diff --git a/app/abk.py b/app/abk.py new file mode 100644 index 0000000..5edb98f --- /dev/null +++ b/app/abk.py @@ -0,0 +1,32 @@ +import subprocess +import os + +from pipfile import Pipfile + + +def globally_installed_py_packages(): + output = subprocess.check_output("pip list --format freeze".split(), env={}) + output = output.decode("utf-8") + output = output.strip() + global_packages = output.split("\n") + return global_packages + + +global_packages = globally_installed_py_packages() + +p = Pipfile.load(filename="meowPip") +content = "" +with open("meowPip", "r") as f: + content = f.read() + +for pip_package in p.data["default"]: + version = p.data["default"][pip_package] + if version == "*": + for package in global_packages: + package = package.lower() + if package.startswith(pip_package.lower()): + substr = f'{pip_package} = "*"' + content = content.replace(substr, package) + +with open("meowPippy", "w") as f: + f.write(content) \ No newline at end of file diff --git a/app/api.py b/app/api.py index 9502395..8cf8e8a 100644 --- a/app/api.py +++ b/app/api.py @@ -54,7 +54,7 @@ def setup( content = ( f"AUTH_NAME={auth_name}\n" f"AUTH_SEED={auth_seed}\n" - f"AUTH_REALM={auth_seed}\n" + f"AUTH_REALM={auth_realm}\n" f"REALM_ALLOWED={list(realm_allowed)}\n" f"OTP_SERVER={otp_server}\n" f"ETCD_URL={etcd_url}\n" diff --git a/app/helper.py b/app/helper.py index 99e0b4f..5f9050c 100644 --- a/app/helper.py +++ b/app/helper.py @@ -5,6 +5,7 @@ import os from dataclasses import dataclass from abc import ABC from enum import Enum +from pipfile import Pipfile class ResultType(Enum): @@ -97,10 +98,39 @@ class VirtualenvOperation(object): else: return Result(output, ResultType.success) + +def globally_installed_py_packages(): + output = subprocess.check_output("pip list --format freeze".split(), env={}) + output = output.decode("utf-8") + output = output.strip() + global_packages = output.split("\n") + return global_packages + + class PipenvOperation(object): @staticmethod def create(path=".", site_packages=False): if site_packages: + global_packages = globally_installed_py_packages() + + p = Pipfile.load(filename=os.path.join(path, "Pipfile")) + content = "" + with open(os.path.join(path, "Pipfile"), "r") as f: + content = f.read() + + for pip_package in p.data["default"]: + version = p.data["default"][pip_package] + if version == "*": + for package in global_packages: + package = package.lower() + if package.startswith(pip_package.lower()): + substr = f'{pip_package} = "*"' + content = content.replace(substr, package) + + with open(os.path.join(path, "Pipfile"), "w") as f: + f.write(content) + + command = f"pipenv --site-packages --python 3" else: command = "pipenv --python 3" @@ -118,7 +148,7 @@ class PipenvOperation(object): else: with open(os.path.join(path, "requirements.txt"), "w") as f: subprocess.Popen("pipenv run pip freeze".split(), cwd=path, stdout=f) - command = f"pip install -r requirements.txt" + command = f"pipenv run pip install -r requirements.txt" try: output = subprocess.check_output(command.split(), cwd=path) except subprocess.CalledProcessError as e: @@ -126,7 +156,6 @@ class PipenvOperation(object): else: return Result(output, ResultType.success) - class FileOperation(object): @staticmethod def write(path, content, mode="w"): diff --git a/meowPip b/meowPip new file mode 100644 index 0000000..7a24987 --- /dev/null +++ b/meowPip @@ -0,0 +1,15 @@ +[[source]] +name = "pypi" +url = "https://pypi.org/simple" +verify_ssl = true + +[dev-packages] +pylint = "*" +prospector = "*" + +[packages] +click = "*" +pipfile = "*" + +[requires] +python_version = "3.7" diff --git a/meowPippy b/meowPippy new file mode 100644 index 0000000..692d9f6 --- /dev/null +++ b/meowPippy @@ -0,0 +1,15 @@ +[[source]] +name = "pypi" +url = "https://pypi.org/simple" +verify_ssl = true + +[dev-packages] +pylint = "*" +prospector = "*" + +[packages] +click==7.0 +pipfile = "*" + +[requires] +python_version = "3.7" diff --git a/new_pip.txt b/new_pip.txt new file mode 100644 index 0000000..479e7a1 --- /dev/null +++ b/new_pip.txt @@ -0,0 +1,2 @@ +click==7.0 +pipfile diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..e69de29