Module: check_mk Branch: master Commit: 1a8e3adbd6081528c34ea56ae6ac00bbc54355f6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1a8e3adbd60815… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Fri May 25 14:20:10 2018 +0200 Updated python-snap7 from some 0.4...0.5-ish master snapshot to 0.9. Change-Id: Ie222771c829dd6edd417199be49df27bad44572b --- Pipfile | 2 +- Pipfile.lock | 6 +++--- omd/packages/snap7/.gitignore | 5 ++--- omd/packages/snap7/Makefile | 7 +++---- omd/packages/snap7/python-snap7-0.9.tar.gz | Bin 0 -> 30789 bytes omd/packages/snap7/python-snap7-master.zip | Bin 55311 -> 0 bytes omd/packages/snap7/python-snap7-master.zip.LIESMICH | 1 - 7 files changed, 9 insertions(+), 12 deletions(-) diff --git a/Pipfile b/Pipfile index 10cb37e..52f1df6 100644 --- a/Pipfile +++ b/Pipfile @@ -63,7 +63,7 @@ typing = "==3.6.4" scandir = "==1.7" pathlib2 = "==2.3.2" python-dateutil = "==2.6.1" -python-snap7 = "==0.5" # actually some unknown version between 0.4 and 0.5... >:-( +python-snap7 = "==0.9" [requires] python_version = "2.7" diff --git a/Pipfile.lock b/Pipfile.lock index bc20ddb..981025b 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "4c9a78a171b6cbf75f960981ccc627ebe04cb758b10689332d7d641e3be6a187" + "sha256": "ee03534b1fb68ed11d8099781224d70118fd47e966da7181e3e5b1488a3914c4" }, "pipfile-spec": 6, "requires": { @@ -459,10 +459,10 @@ }, "python-snap7": { "hashes": [ - "sha256:46c0306a0f399c7ec43a028d8d81935fc02d09bf1476bf6bfb710752ba50779c" + "sha256:2df6806a2f28f9012497283c253980fb89090ab316c427b3b67f4fb4834643e7" ], "index": "pypi", - "version": "==0.5" + "version": "==0.9" }, "reportlab": { "hashes": [ diff --git a/omd/packages/snap7/.gitignore b/omd/packages/snap7/.gitignore index bb60b97..dd08a21 100644 --- a/omd/packages/snap7/.gitignore +++ b/omd/packages/snap7/.gitignore @@ -1,3 +1,2 @@ -python-snap7-0.4 -python-snap7-master -snap7-full-1.3.0 +python-snap7-[0-9].[0-9]/ +snap7-full-1.3.0/ diff --git a/omd/packages/snap7/Makefile b/omd/packages/snap7/Makefile index 9875ede..a79670f 100644 --- a/omd/packages/snap7/Makefile +++ b/omd/packages/snap7/Makefile @@ -7,22 +7,21 @@ NAME = snap7 VERSION = 1.3.0 DIR = snap7-full-$(VERSION) -PY_VERSION = master -PY_DIR = python-snap7-$(PY_VERSION) +PY_DIR = python-snap7-0.9 ARCH = $(shell uname -m) ifeq ($(ARCH),i686) ARCH=i386 endif -.PHONY: skel +.PHONY: build install skel clean build: check-python tar xzf $(DIR).tar.gz cd $(DIR)/build/unix && $(MAKE) -f $(ARCH)_linux.mk # Now handle the python module - unzip -o $(PY_DIR).zip + tar xvzf $(PY_DIR).tar.gz set -e ; for p in python-patches/*.dif ; do \ echo "applying $$p..." ; \ diff --git a/omd/packages/snap7/python-snap7-0.9.tar.gz b/omd/packages/snap7/python-snap7-0.9.tar.gz new file mode 100644 index 0000000..300b5a4 Binary files /dev/null and b/omd/packages/snap7/python-snap7-0.9.tar.gz differ diff --git a/omd/packages/snap7/python-snap7-master.zip b/omd/packages/snap7/python-snap7-master.zip deleted file mode 100644 index 9e297e4..0000000 Binary files a/omd/packages/snap7/python-snap7-master.zip and /dev/null differ diff --git a/omd/packages/snap7/python-snap7-master.zip.LIESMICH b/omd/packages/snap7/python-snap7-master.zip.LIESMICH deleted file mode 100644 index a78c9f8..0000000 --- a/omd/packages/snap7/python-snap7-master.zip.LIESMICH +++ /dev/null @@ -1 +0,0 @@ -wget -O python-snap7-git.tar.gz https://github.com/gijzelaerr/python-snap7/archive/master.zip