Browse Source

Rename src/ directory to nilmtools/

tags/nilmtools-1.3.0^0
Jim Paris 7 years ago
parent
commit
5d83d93019
14 changed files with 10 additions and 11 deletions
  1. +8
    -8
      Makefile
  2. +0
    -0
      nilmtools/__init__.py
  3. +1
    -1
      nilmtools/_version.py
  4. +0
    -0
      nilmtools/cleanup.py
  5. +0
    -0
      nilmtools/copy_one.py
  6. +0
    -0
      nilmtools/copy_wildcard.py
  7. +0
    -0
      nilmtools/decimate.py
  8. +0
    -0
      nilmtools/decimate_auto.py
  9. +0
    -0
      nilmtools/filter.py
  10. +0
    -0
      nilmtools/insert.py
  11. +0
    -0
      nilmtools/median.py
  12. +0
    -0
      nilmtools/prep.py
  13. +0
    -0
      nilmtools/sinefit.py
  14. +1
    -2
      setup.py

+ 8
- 8
Makefile View File

@@ -11,16 +11,16 @@ endif
test: test_cleanup

test_cleanup:
src/cleanup.py -e extras/cleanup.cfg
src/cleanup.py extras/cleanup.cfg
nilmtools/cleanup.py -e extras/cleanup.cfg
nilmtools/cleanup.py extras/cleanup.cfg

test_insert:
@make install >/dev/null
src/insert.py --file --dry-run /test/foo </dev/null
nilmtools/insert.py --file --dry-run /test/foo </dev/null

test_copy:
@make install >/dev/null
src/copy_wildcard.py -U "http://nilmdb.com/bucket/" -D /lees*
nilmtools/copy_wildcard.py -U "http://nilmdb.com/bucket/" -D /lees*

/tmp/raw.dat:
octave --eval 'fs = 8000;' \
@@ -37,8 +37,8 @@ test_prep: /tmp/raw.dat
nilmtool create /test/sinefit float32_3
nilmtool create /test/prep float32_8
nilmtool insert -s '@0' -t -r 8000 /test/raw /tmp/raw.dat
src/sinefit.py -a 0.5 -c 1 /test/raw /test/sinefit
src/prep.py -c 2 /test/raw /test/sinefit /test/prep
nilmtools/sinefit.py -a 0.5 -c 1 /test/raw /test/sinefit
nilmtools/prep.py -c 2 /test/raw /test/sinefit /test/prep
nilmtool extract -s min -e max /test/prep | head -20

test_decimate:
@@ -46,8 +46,8 @@ test_decimate:
-@nilmtool destroy /lees-compressor/no-leak/raw/16 || true
-@nilmtool create /lees-compressor/no-leak/raw/4 float32_18 || true
-@nilmtool create /lees-compressor/no-leak/raw/16 float32_18 || true
time python src/decimate.py -s '2013-02-04 18:10:00' -e '2013-02-04 18:11:00' /lees-compressor/no-leak/raw/1 /lees-compressor/no-leak/raw/4
python src/decimate.py -s '2013-02-04 18:10:00' -e '2013-02-04 18:11:00' /lees-compressor/no-leak/raw/4 /lees-compressor/no-leak/raw/16
time python nilmtools/decimate.py -s '2013-02-04 18:10:00' -e '2013-02-04 18:11:00' /lees-compressor/no-leak/raw/1 /lees-compressor/no-leak/raw/4
python nilmtools/decimate.py -s '2013-02-04 18:10:00' -e '2013-02-04 18:11:00' /lees-compressor/no-leak/raw/4 /lees-compressor/no-leak/raw/16

version:
python setup.py version


src/__init__.py → nilmtools/__init__.py View File


src/_version.py → nilmtools/_version.py View File

@@ -181,7 +181,7 @@ def versions_from_parentdir(parentdir_prefix, versionfile_source, verbose=False)

tag_prefix = "nilmtools-"
parentdir_prefix = "nilmtools-"
versionfile_source = "src/_version.py"
versionfile_source = "nilmtools/_version.py"

def get_versions(default={"version": "unknown", "full": ""}, verbose=False):
variables = { "refnames": git_refnames, "full": git_full }

src/cleanup.py → nilmtools/cleanup.py View File


src/copy_one.py → nilmtools/copy_one.py View File


src/copy_wildcard.py → nilmtools/copy_wildcard.py View File


src/decimate.py → nilmtools/decimate.py View File


src/decimate_auto.py → nilmtools/decimate_auto.py View File


src/filter.py → nilmtools/filter.py View File


src/insert.py → nilmtools/insert.py View File


src/median.py → nilmtools/median.py View File


src/prep.py → nilmtools/prep.py View File


src/sinefit.py → nilmtools/sinefit.py View File


+ 1
- 2
setup.py View File

@@ -30,7 +30,7 @@ except ImportError:
# Versioneer manages version numbers from git tags.
# https://github.com/warner/python-versioneer
import versioneer
versioneer.versionfile_source = 'src/_version.py'
versioneer.versionfile_source = 'nilmtools/_version.py'
versioneer.versionfile_build = 'nilmtools/_version.py'
versioneer.tag_prefix = 'nilmtools-'
versioneer.parentdir_prefix = 'nilmtools-'
@@ -68,7 +68,6 @@ setup(name='nilmtools',
],
packages = [ 'nilmtools',
],
package_dir = { 'nilmtools': 'src' },
entry_points = {
'console_scripts': [
'nilm-decimate = nilmtools.decimate:main',


Loading…
Cancel
Save