Browse Source

Move datetime_tz package under nilmdb.utils

datetime_tz isn't readily available, so it's a lot easier to just
package it within the nilmdb tree.
tags/nilmdb-0.2^2
Jim Paris 9 years ago
parent
commit
f316026592
10 changed files with 7 additions and 9 deletions
  1. +1
    -0
      .coveragerc
  2. +1
    -1
      nilmdb/cmdline/cmdline.py
  3. +0
    -0
      nilmdb/utils/datetime_tz/__init__.py
  4. +0
    -0
      nilmdb/utils/datetime_tz/pytz_abbr.py
  5. +1
    -1
      nilmdb/utils/timestamper.py
  6. +0
    -1
      setup.py
  7. +1
    -2
      tests/test_client.py
  8. +1
    -1
      tests/test_cmdline.py
  9. +1
    -1
      tests/test_interval.py
  10. +1
    -2
      tests/test_timestamper.py

+ 1
- 0
.coveragerc View File

@@ -7,3 +7,4 @@
exclude_lines =
pragma: no cover
if 0:
omit = nilmdb/utils/datetime_tz*

+ 1
- 1
nilmdb/cmdline/cmdline.py View File

@@ -2,8 +2,8 @@

import nilmdb
from nilmdb.utils.printf import *
from nilmdb.utils import datetime_tz

import datetime_tz
import dateutil.parser
import sys
import re


datetime_tz/__init__.py → nilmdb/utils/datetime_tz/__init__.py View File


datetime_tz/pytz_abbr.py → nilmdb/utils/datetime_tz/pytz_abbr.py View File


+ 1
- 1
nilmdb/utils/timestamper.py View File

@@ -1,10 +1,10 @@
"""File-like objects that add timestamps to the input lines"""

from nilmdb.utils.printf import *
from nilmdb.utils import datetime_tz

import time
import os
import datetime_tz

class Timestamper(object):
"""A file-like object that adds timestamps to lines of an input file."""


+ 0
- 1
setup.py View File

@@ -32,7 +32,6 @@ setup(name='nilmdb',
],
install_requires = [ 'distribute',
'decorator',
'datetime_tz',
],
packages = [ 'nilmdb',
'nilmdb.utils',


+ 1
- 2
tests/test_client.py View File

@@ -4,8 +4,7 @@ import nilmdb
from nilmdb.utils.printf import *
from nilmdb.utils import timestamper
from nilmdb.client import ClientError, ServerError

import datetime_tz
from nilmdb.utils import datetime_tz

from nose.tools import *
from nose.tools import assert_raises


+ 1
- 1
tests/test_cmdline.py View File

@@ -3,12 +3,12 @@
import nilmdb
from nilmdb.utils.printf import *
import nilmdb.cmdline
from nilmdb.utils import datetime_tz

import unittest
from nose.tools import *
from nose.tools import assert_raises
import itertools
import datetime_tz
import os
import re
import shutil


+ 1
- 1
tests/test_interval.py View File

@@ -2,7 +2,7 @@

import nilmdb
from nilmdb.utils.printf import *
import datetime_tz
from nilmdb.utils import datetime_tz

from nose.tools import *
from nose.tools import assert_raises


+ 1
- 2
tests/test_timestamper.py View File

@@ -1,7 +1,6 @@
import nilmdb
from nilmdb.utils.printf import *

import datetime_tz
from nilmdb.utils import datetime_tz

from nose.tools import *
from nose.tools import assert_raises


Loading…
Cancel
Save