Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
caosdb-advanced-user-tools
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
caosdb
Software
caosdb-advanced-user-tools
Commits
d2ccc04a
Commit
d2ccc04a
authored
Jul 19, 2020
by
Henrik tom Wörden
Browse files
Options
Downloads
Plain Diff
Merge branch 'table-error' into tmp
parents
d5f4e612
0c04ec6d
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
CHANGELOG.md
+1
-1
1 addition, 1 deletion
CHANGELOG.md
src/caosadvancedtools/table_importer.py
+4
-0
4 additions, 0 deletions
src/caosadvancedtools/table_importer.py
with
5 additions
and
1 deletion
CHANGELOG.md
+
1
−
1
View file @
d2ccc04a
...
...
@@ -16,7 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed ###
-
The suppression module is now a logging filter
-
The suppression module is now a logging filter
.
-
The WebUIHandler is now a python logging formatter.
-
instead of
`get_entity`
, type-specific functions are used in
`cfood.py`
when the type of the entity in question is known.
...
...
...
...
This diff is collapsed.
Click to expand it.
src/caosadvancedtools/table_importer.py
+
4
−
0
View file @
d2ccc04a
...
...
@@ -102,6 +102,8 @@ class XLS_Importer(object):
converts an xls file into a Pandas DataFrame.
The converters of the XLS_Importer object are used.
Raises: DataInconsistencyError
"""
try
:
xls_file
=
pd
.
io
.
excel
.
ExcelFile
(
filename
)
...
...
@@ -139,6 +141,8 @@ class XLS_Importer(object):
"""
checks whether all required columns, i.e. columns for which converters
were defined exist.
Raises: DataInconsistencyError
"""
for
col
in
self
.
required_columns
:
...
...
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment