Commit 757f1d86 authored by julian.gethmann's avatar julian.gethmann

Update PyScaffold requirement

parent d2bf046c
......@@ -9,6 +9,7 @@ Changelog
* remove not implemented argument `show_url` of `dump_cassandra_data()`
* write tests that are independent of access to the IBPT network
* move directory structure to new one (cassandra->src/cassandra) to complete `PyScaffold` structure
* Upgrade PyScaffold to be compatible with new setuptools versions
0.7.1 (2017-10-31)
------------------
......
......@@ -23,7 +23,7 @@ entry_points = """
def setup_package():
needs_sphinx = {'build_sphinx', 'upload_docs'}.intersection(sys.argv)
sphinx = ['sphinx'] if needs_sphinx else []
setup(setup_requires=['pyscaffold>=3.0a0,<3.1a0'] + sphinx,
setup(setup_requires=['pyscaffold>=3.0.2a0,<3.1a0'] + sphinx,
entry_points=entry_points,
use_pyscaffold=True)
......
......@@ -86,8 +86,7 @@ def _css_time(timestamp):
timestamp = timestamp.decode("utf-8")
except AttributeError:
pass
return datetime.fromtimestamp(
int(CassandraHelper.cassandra_time(timestamp[:-10])[:-9]))
return datetime.fromtimestamp(int(CassandraHelper.cassandra_time(timestamp[:-10])[:-9]))
def load_css_data(filename, system="np", dropna=True):
......@@ -142,7 +141,7 @@ def load_css_data(filename, system="np", dropna=True):
skiprows=skip_lines,
names=header,
index_col=0,
dtype=dtype,
# dtype=dtype,
converters=convs,
keep_default_na=True,
# na_values="#N/A",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment