Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
utmpn
cassandra
Commits
757f1d86
Commit
757f1d86
authored
Mar 20, 2018
by
julian.gethmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update PyScaffold requirement
parent
d2bf046c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
CHANGELOG.rst
CHANGELOG.rst
+1
-0
setup.py
setup.py
+1
-1
src/cassandra/css_read.py
src/cassandra/css_read.py
+2
-3
No files found.
CHANGELOG.rst
View file @
757f1d86
...
...
@@ -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)
------------------
...
...
setup.py
View file @
757f1d86
...
...
@@ -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
.2
a0,<3.1a0'
]
+
sphinx
,
entry_points
=
entry_points
,
use_pyscaffold
=
True
)
...
...
src/cassandra/css_read.py
View file @
757f1d86
...
...
@@ -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",
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment