From 27581685b3da65401998231c7658c1374ab43947 Mon Sep 17 00:00:00 2001 From: "Joshua D Davis, PhD" Date: Tue, 18 Aug 2020 08:58:29 -0400 Subject: [PATCH 1/6] Add hooks for the pysnmp_mibs package Hook for the package at https://pypi.org/project/pysnmp-mibs/ --- .../hooks/stdhooks/hook-pysnmp_mibs.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-pysnmp_mibs.py diff --git a/src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-pysnmp_mibs.py b/src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-pysnmp_mibs.py new file mode 100644 index 00000000..f57bc4ba --- /dev/null +++ b/src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-pysnmp_mibs.py @@ -0,0 +1,15 @@ +# ------------------------------------------------------------------ +# Copyright (c) 2020 PyInstaller Development Team. +# +# This file is distributed under the terms of the GNU General Public +# License (version 2.0 or later). +# +# The full license is available in LICENSE.GPL.txt, distributed with +# this software. +# +# SPDX-License-Identifier: GPL-2.0-or-later +# ------------------------------------------------------------------ + +from PyInstaller.utils.hooks import collect_data_files + +datas = collect_data_files('pysnmp_mibs', include_py_files=True) \ No newline at end of file From a6f6698f4dbb70911af467437da017d8e2ea02c7 Mon Sep 17 00:00:00 2001 From: "Joshua D Davis, PhD" Date: Tue, 18 Aug 2020 09:19:28 -0400 Subject: [PATCH 2/6] Update hook-pysnmp_mibs.py Added comment description --- .../hooks/stdhooks/hook-pysnmp_mibs.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-pysnmp_mibs.py b/src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-pysnmp_mibs.py index f57bc4ba..2cfe108a 100644 --- a/src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-pysnmp_mibs.py +++ b/src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-pysnmp_mibs.py @@ -10,6 +10,9 @@ # SPDX-License-Identifier: GPL-2.0-or-later # ------------------------------------------------------------------ +# pysnmp_mibs provides MIBS files for pysnmp. It contains MIB files +# expanded beyond the default in pysnmp. + from PyInstaller.utils.hooks import collect_data_files -datas = collect_data_files('pysnmp_mibs', include_py_files=True) \ No newline at end of file +datas = collect_data_files('pysnmp_mibs', include_py_files=True) From 8bb9207669d59783440e404bfe0720c0f117c9c3 Mon Sep 17 00:00:00 2001 From: "Joshua D Davis, PhD" Date: Tue, 18 Aug 2020 09:28:40 -0400 Subject: [PATCH 3/6] Update hook-pysnmp_mibs.py New edits for white space issues --- .../hooks/stdhooks/hook-pysnmp_mibs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-pysnmp_mibs.py b/src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-pysnmp_mibs.py index 2cfe108a..f1887528 100644 --- a/src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-pysnmp_mibs.py +++ b/src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-pysnmp_mibs.py @@ -10,7 +10,7 @@ # SPDX-License-Identifier: GPL-2.0-or-later # ------------------------------------------------------------------ -# pysnmp_mibs provides MIBS files for pysnmp. It contains MIB files +# pysnmp_mibs provides MIBS files for pysnmp. It contains MIB files # expanded beyond the default in pysnmp. from PyInstaller.utils.hooks import collect_data_files From b7b07d33d7a67a2b9edee14e85d26df1aa10bda6 Mon Sep 17 00:00:00 2001 From: Joshua Davis Date: Tue, 18 Aug 2020 09:53:02 -0400 Subject: [PATCH 4/6] Add news for PR 34 --- news/34.new.rst | 1 + 1 file changed, 1 insertion(+) create mode 100644 news/34.new.rst diff --git a/news/34.new.rst b/news/34.new.rst new file mode 100644 index 00000000..6e827857 --- /dev/null +++ b/news/34.new.rst @@ -0,0 +1 @@ +added hook for ``pysnmp_mibs`` for hidden data imports \ No newline at end of file From 2c0a8c11d25b8ef91a2af9303ab03620860593c6 Mon Sep 17 00:00:00 2001 From: "Joshua D Davis, PhD" Date: Thu, 20 Aug 2020 13:08:02 -0400 Subject: [PATCH 5/6] Update news/34.new.rst MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adjust language for present tense. Co-authored-by: Brénainn Woodsend <30940778+bwoodsend@users.noreply.github.com> --- news/34.new.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/news/34.new.rst b/news/34.new.rst index 6e827857..fdb78f2f 100644 --- a/news/34.new.rst +++ b/news/34.new.rst @@ -1 +1 @@ -added hook for ``pysnmp_mibs`` for hidden data imports \ No newline at end of file +Add hook for ``pysnmp_mibs`` which contains hidden data imports. From 78d3cc7aefddf1ea32a4297670e93bdf76b09c74 Mon Sep 17 00:00:00 2001 From: "Joshua D Davis, PhD" Date: Thu, 20 Aug 2020 13:09:42 -0400 Subject: [PATCH 6/6] Update src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-pysnmp_mibs.py MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Brénainn Woodsend <30940778+bwoodsend@users.noreply.github.com> --- .../hooks/stdhooks/hook-pysnmp_mibs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-pysnmp_mibs.py b/src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-pysnmp_mibs.py index f1887528..f4d4bff2 100644 --- a/src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-pysnmp_mibs.py +++ b/src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-pysnmp_mibs.py @@ -11,7 +11,7 @@ # ------------------------------------------------------------------ # pysnmp_mibs provides MIBS files for pysnmp. It contains MIB files -# expanded beyond the default in pysnmp. +# '.py' files which are treated as data files and are loaded by [what are they loaded by?] from PyInstaller.utils.hooks import collect_data_files