Browse Source

Update Makefile and setup.py dependencies

tags/nilmtools-1.0
Jim Paris 11 years ago
parent
commit
533892e624
2 changed files with 5 additions and 3 deletions
  1. +4
    -2
      Makefile
  2. +1
    -1
      setup.py

+ 4
- 2
Makefile View File

@@ -9,8 +9,10 @@ else
endif endif


test: test:
-@make install >/dev/null 2>&1
nilmtool -u ${URL} remove /test/foo -s min -e max
@make install >/dev/null
# nilmtool -u ${URL} destroy /test/foo
# nilmtool -u ${URL} create /test/foo float32_3
# nilmtool -u ${URL} remove /test/foo -s min -e max
python src/sinefit.py \ python src/sinefit.py \
-u ${URL} -c 4 -f 60 \ -u ${URL} -c 4 -f 60 \
/lees-compressor/no-leak/raw/1 /test/foo /lees-compressor/no-leak/raw/1 /test/foo


+ 1
- 1
setup.py View File

@@ -61,7 +61,7 @@ setup(name='nilmtools',
long_description = "NILM Database Tools", long_description = "NILM Database Tools",
license = "Proprietary", license = "Proprietary",
author_email = 'jim@jtan.com', author_email = 'jim@jtan.com',
install_requires = [ 'nilmdb >= 1.3.0',
install_requires = [ 'nilmdb >= 1.4.6',
'numpy', 'numpy',
'scipy', 'scipy',
'matplotlib', 'matplotlib',


Loading…
Cancel
Save