Skip to content

Commit 0d3613d

Browse files
committed
Working on build
1 parent c6d636e commit 0d3613d

5 files changed

Lines changed: 7 additions & 18 deletions

File tree

MANIFEST.in

Lines changed: 0 additions & 5 deletions
This file was deleted.

epanet_python/output/setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
],
3939
namespace_packages=['epanet'],
4040
packages = {microlib_name},
41-
# py_modules = ['output'],
41+
py_modules = ['output'],
4242
# include_package_data=True
4343
package_data = {microlib_name:['*epanet-output.dll', '*epanet-output.so']},
4444

epanet_python/toolkit/setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
],
3838
namespace_packages = ['epanet'],
3939
packages = {microlib_name},
40-
# py_modules = ['toolkit'],
40+
py_modules = ['toolkit'],
4141
# include_package_data=True
4242
package_data = {microlib_name:['*epanet2.dll', '*epanet2.so']},
4343

setup.py

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
from setuptools import setup, find_namespace_packages
99
from setuptools.command.develop import develop
1010
from setuptools.command.install import install
11-
#from setuptools.command.build import build
11+
1212

1313
import sys
1414
import subprocess
@@ -54,11 +54,6 @@ def run(self):
5454
install.run(self)
5555

5656

57-
#class BuildCmd(build):
58-
# """ Add custom steps for the build command """
59-
# def run(self):
60-
# print("building all microlibs")
61-
6257
setup(
6358
name=PACKAGE_NAME,
6459
version="0.1.0",
@@ -69,12 +64,9 @@ def run(self):
6964
classifiers=[
7065
'Private :: Do Not Upload to pypi server',
7166
],
72-
package_dir={'': 'epanet_python'},
73-
include_package_data=True,
74-
packages=find_namespace_packages(where='epanet_python'),
7567
cmdclass={
7668
'install': InstallCmd,
7769
'develop': DevelopCmd
78-
# 'build': BuildCmd
79-
},
70+
71+
}
8072
)

tox.ini

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ envlist = py36
66
[testenv]
77
whitelist_externals =
88
swig
9+
skipsdist = True
10+
usedevelop = True
911
deps =
1012
pytest
1113
numpy

0 commit comments

Comments
 (0)