Skip to content

Commit 003f64a

Browse files
committed
cleanup: relocated patch to scripts, added argcomplete to install_requires, updated .gitmodules to pin pybind11
1 parent 52c6d98 commit 003f64a

8 files changed

+13
-82
lines changed

.gitmodules

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
[submodule "deps/pybind11"]
22
path = deps/pybind11
3-
url = https://github.com/Kisensum/pybind11.git
3+
# url = https://github.com/Kisensum/pybind11.git
4+
url = https://github.com/kefeimo/pybind11.git
45
[submodule "deps/dnp3"]
56
path = deps/dnp3
67
# url = https://github.com/automatak/dnp3.git

imasteroperations.patch

-12
This file was deleted.

requirements-freeze.txt

-61
This file was deleted.

requirements.txt

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# pydnp3 # require build from cpp source
2+
argcomplete
23

34
# develop
45
cmake
File renamed without changes.
File renamed without changes.

setup.py

+10-8
Original file line numberDiff line numberDiff line change
@@ -96,13 +96,13 @@ def build_extension(self, ext):
9696
if not os.path.exists(self.build_temp):
9797
os.makedirs(self.build_temp)
9898

99-
setup_path = os.path.dirname(os.path.abspath(__file__))
100-
if not "<string>" in open(os.path.join(setup_path, 'deps', 'dnp3', 'cpp', 'libs', 'include', 'asiodnp3', 'IMasterOperations.h')).read():
101-
dnp3_path = os.path.join(setup_path, 'deps', 'dnp3')
102-
patch_path = os.path.join(setup_path, 'imasteroperations.patch')
103-
# dnp3_python_path = os.path.join(setup_path, 'src', 'dnp3_python')
104-
105-
subprocess.check_call(['git', 'apply', patch_path], cwd=dnp3_path)
99+
# setup_path = os.path.dirname(os.path.abspath(__file__))
100+
# if not "<string>" in open(os.path.join(setup_path, 'deps', 'dnp3', 'cpp', 'libs', 'include', 'asiodnp3', 'IMasterOperations.h')).read():
101+
# dnp3_path = os.path.join(setup_path, 'deps', 'dnp3')
102+
# patch_path = os.path.join(setup_path, 'imasteroperations.patch')
103+
# # dnp3_python_path = os.path.join(setup_path, 'src', 'dnp3_python')
104+
#
105+
# subprocess.check_call(['git', 'apply', patch_path], cwd=dnp3_path)
106106

107107
subprocess.check_call(['cmake', ext.sourcedir] + cmake_args, cwd=self.build_temp, env=env)
108108
subprocess.check_call(['cmake', '--build', '.'] + build_args, cwd=self.build_temp)
@@ -116,7 +116,9 @@ def build_extension(self, ext):
116116
url='https://github.com/VOLTTRON/dnp3-python',
117117
description='pydnp3 -- python binding for opendnp3',
118118
# long_description='long description',
119-
# install_requires=['pybind11>=2.2'],
119+
install_requires=[
120+
# 'pybind11>=2.2',
121+
'argcomplete'],
120122
ext_modules=[CMakeExtension('pydnp3')],
121123
cmdclass=dict(build_ext=CMakeBuild),
122124
zip_safe=False,

src/dnp3demo/__init__.py

Whitespace-only changes.

0 commit comments

Comments
 (0)