15 Nov
2018
15 Nov
'18
3:40 a.m.
Module: check_mk
Branch: master
Commit: de07ac7493d0b332018e2a8ca7e22f5a7ff896c1
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=de07ac7493d0b3…
Author: Sven Panne <sp(a)mathias-kettner.de>
Date: Thu Nov 15 09:28:21 2018 +0100
Regenerate Pipfile with the help of a Makefile target.
Change-Id: Ida631566b0e819a52b60f58a674eaaefbf9c9ff8
---
Pipfile | 52 +++++++++++++++++-------------------
Pipfile.lock | 10 +++----
omd/packages/python-modules/Makefile | 33 ++++++++++++++++++++++-
3 files changed, 61 insertions(+), 34 deletions(-)
diff --git a/Pipfile b/Pipfile
index 046391b..eea62ed 100644
--- a/Pipfile
+++ b/Pipfile
@@ -1,7 +1,4 @@
-# Two slightly ugly problems:
-# * We need to keep this in sync with omd/packages/python-modules/Makefile
-# * The actual versions depend on the platform, we use the Ubuntu bionic ones below.
-
+# ATTENTION: Most of this file is generated by omd/packages/python-modules/Makefile
[[source]]
url = "https://pypi.python.org/simple"
verify_ssl = true
@@ -28,8 +25,8 @@ isort = "*"
[packages]
setuptools_scm = "==3.1.0"
pysphere = "==0.1.7"
-"pyasn1" = "==0.4.4"
-"pyasn1-modules" = "==0.2.2"
+pyasn1 = "==0.4.4"
+pyasn1-modules = "==0.2.2"
pycryptodomex = "==3.6.6"
ordereddict = "==1.1"
ply = "==3.11"
@@ -57,7 +54,6 @@ dnspython = "==1.15.0"
# python-ad = "==0.9" This seems to be dead and is not on PyPi!
idna = "==2.7"
asn1crypto = "==0.24.0"
-# For 1.5 we ship cryptography 1.9 with Check_MK and ignore the requirement of pyghmi of
2.1 in regular packages
cryptography = "==2.3.1"
certifi = "==2018.10.15"
chardet = "==3.0.4"
@@ -68,41 +64,41 @@ pykerberos = "==1.2.1"
requests-kerberos = "==0.12.0"
tinkerforge = "==2.1.19"
bcrypt = "==3.1.4"
-pynacl = "==1.3.0"
+PyNaCl = "==1.3.0"
paramiko = "==2.4.2"
pbr = "==5.1.0"
pyghmi = "==1.2.14"
typing = "==3.6.6"
-scandir = "==1.9"
+scandir = "==1.9.0"
pathlib2 = "==2.3.2"
python-dateutil = "==2.7.5"
python-snap7 = "==0.10"
rrdtool = "==0.1.14" # Actually we ship the binding which comes with rrdtool
itself...
-PyJWT = "==1.6.4" # needed by azure stuff
-SecretStorage = {version = "==2.3.1", markers = "sys_platform ==
'linux2' and python_version < '3.5'"} # needed by azure stuff
-adal = "==1.2.0" # needed by azure stuff
+PyJWT = "==1.6.4"
+SecretStorage = {version = "==2.3.1", markers = "sys_platform ==
'linux2' and python_version < '3.5'"}
+adal = "==1.2.0"
azure-nspkg = "==3.0.2"
azure-common = "==1.1.16"
azure-mgmt-nspkg = "==3.0.2"
-isodate = "==0.6.0" # needed by azure stuff
-oauthlib = "==2.1.0" # needed by azure stuff
-requests-oauthlib = "==1.0.0" # needed by azure stuff
-msrest = "==0.6.1" # needed by azure stuff
-msrestazure = "==0.5.0" # needed by azure stuff
+isodate = "==0.6.0"
+oauthlib = "==2.1.0"
+requests-oauthlib = "==1.0.0"
+msrest = "==0.6.1"
+msrestazure = "==0.5.0"
azure-mgmt-monitor = "==0.5.2"
azure-mgmt-resource = "==2.0.0"
azure-mgmt-compute = "==4.3.1"
-configparser = "==3.5.0" # needed by azure stuff
-entrypoints = "==0.2.3" # needed by azure stuff
-keyring = "==15.1.0" # needed by azure stuff
-Werkzeug = "==0.14.1" # Added for the GUI
-passlib = "==1.7.1" # Added for the GUI
-docutils = "==0.14" # needed for aws stuff
-futures = "==3.2.0" # needed for aws stuff
-jmespath = "==0.9.3" # needed for aws stuff
-botocore = "==1.12.43" # needed for aws stuff
-s3transfer = "==0.1.13" # needed for aws stuff
-boto3 = "==1.9.42" # needed for aws stuff
+configparser = "==3.5.0"
+entrypoints = "==0.2.3"
+keyring = "==15.1.0"
+Werkzeug = "==0.14.1"
+passlib = "==1.7.1"
+docutils = "==0.14"
+futures = "==3.2.0"
+jmespath = "==0.9.3"
+botocore = "==1.12.43"
+s3transfer = "==0.1.13"
+boto3 = "==1.9.42"
[requires]
python_version = "2.7"
diff --git a/Pipfile.lock b/Pipfile.lock
index a578cdd..5642a19 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -1,7 +1,7 @@
{
"_meta": {
"hash": {
- "sha256":
"ce90d9f7e22515ae1d0200fa6fdd1037dc9e99e2e46917bb16e7efa8dc6add06"
+ "sha256":
"6aa6508c4734ada85d078892af762fe6f7d5f43b12e8ad6ee64d15934f02e84d"
},
"pipfile-spec": 6,
"requires": {
@@ -793,7 +793,7 @@
"sha256:f5c71e29b4e2af7ccdc03a020c626ede51da471173b4a6ad1e904f2b2e04b4bd"
],
"index": "pypi",
- "version": "==1.9"
+ "version": "==1.9.0"
},
"secretstorage": {
"hashes": [
@@ -905,7 +905,7 @@
"sha256:9d98697f088eb1b0fa451391f91afb5e3ebde16bbdb272819fd091151fda4f1a",
"sha256:f0b0e4eba956de51238e17573b7087e852dfe9854afd2e9c873f73fc0ca0a6dd"
],
- "markers": "python_version < '3.4'",
+ "markers": "python_version == '2.7'",
"version": "==1.5"
},
"backports.ssl-match-hostname": {
@@ -1034,7 +1034,7 @@
"sha256:330cc27ccbf7f1e992e69fef78261dc7c6569012cf397db8d3de0234e6c937ca",
"sha256:a7bb0f2cf3a3fd1ab2732cb49eba4252c2af4240442415b4abce3b87022a8f50"
],
- "markers": "python_version < '3.0'",
+ "markers": "python_version < '3.3'",
"version": "==1.0.2"
},
"futures": {
@@ -1345,7 +1345,7 @@
"sha256:f5c71e29b4e2af7ccdc03a020c626ede51da471173b4a6ad1e904f2b2e04b4bd"
],
"index": "pypi",
- "version": "==1.9"
+ "version": "==1.9.0"
},
"singledispatch": {
"hashes": [
diff --git a/omd/packages/python-modules/Makefile b/omd/packages/python-modules/Makefile
index 043e083..7bc5d06 100644
--- a/omd/packages/python-modules/Makefile
+++ b/omd/packages/python-modules/Makefile
@@ -169,7 +169,7 @@ MODULES += botocore-1.12.43.tar.gz
MODULES += s3transfer-0.1.13.tar.gz
MODULES += boto3-1.9.42.tar.gz
-.PHONY: build check-freetds install skel clean
+.PHONY: build check-freetds install skel clean dump-Pipfile
# NOTE: Cruel hack below! We need to have a recent GCC visible in the PATH
# because the SSSE3 detection in pycryptodomex is slightly broken. :-/
@@ -252,3 +252,34 @@ skel:
clean:
rm -rf dest $(PACKAGE_PYTHON_MODULES_DESTDIR)
+
+dump-Pipfile:
+ @echo '# ATTENTION: Most of this file is generated by
omd/packages/python-modules/Makefile'
+ @echo '[[source]]'
+ @echo 'url = "https://pypi.python.org/simple"'
+ @echo 'verify_ssl = true'
+ @echo 'name = "pypi"'
+ @echo ''
+ @echo '[dev-packages]'
+ @echo 'pytest = "*"'
+ @echo 'pytest-cov = "*"'
+ @echo 'pytest-mock = "*"'
+ @echo '"beautifulsoup4" = "*"'
+ @echo 'pytest-stepwise = "*"'
+ @echo 'dill = "*"'
+ @echo '"html5lib" = "*"'
+ @echo 'bandit = "*"'
+ @echo 'lockfile = "*"'
+ @echo 'lxml = "*"'
+ @echo 'pylint = "*"'
+ @echo 'pyenchant = "*"'
+ @echo 'yapf = "*"'
+ @echo 'docker = "*"'
+ @echo 'mockldap = "*"'
+ @echo 'isort = "*"'
+ @echo ''
+ @echo '[packages]'
+ @echo $(patsubst %.zip,%,$(patsubst %.tar.gz,%,$(MODULES))) | tr ' '
'\n' | sed 's/-\([0-9.]*\)$$/ = "==\1"/'
+ @echo ''
+ @echo '[requires]'
+ @echo 'python_version = "2.7"'