Skip to content

Commit

Permalink
0.0.14 Make sure 'resources' is always present, even if empty
Browse files Browse the repository at this point in the history
  • Loading branch information
akariv committed Oct 8, 2018
1 parent 3c54a58 commit ae621ae
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 132 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ target/
.idea/
dataflows.iml
celerybeat-schedule
.vscode/

# Resources created by our tests
.coverage.*
Expand Down
123 changes: 0 additions & 123 deletions .vscode/launch.json

This file was deleted.

8 changes: 0 additions & 8 deletions .vscode/settings.json

This file was deleted.

2 changes: 1 addition & 1 deletion dataflows/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.0.13
0.0.14
2 changes: 2 additions & 0 deletions dataflows/processors/load.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,13 @@ def __init__(self, load_source, name=None, resources=None, **options):
def process_datapackage(self, dp: Package):
if isinstance(self.load_source, tuple):
datapackage_descriptor, _ = self.load_source
dp.descriptor.setdefault('resources', [])
for resource_descriptor in datapackage_descriptor['resources']:
if self.resource_matcher.match(resource_descriptor['name']):
dp.add_resource(resource_descriptor)
elif os.path.basename(self.load_source) == 'datapackage.json':
self.load_dp = Package(self.load_source)
dp.descriptor.setdefault('resources', [])
for resource in self.load_dp.resources:
if self.resource_matcher.match(resource.name):
dp.add_resource(resource.descriptor)
Expand Down

0 comments on commit ae621ae

Please sign in to comment.