diff --git a/.gitignore b/.gitignore index 7a24274..1f4ba80 100644 --- a/.gitignore +++ b/.gitignore @@ -81,6 +81,7 @@ target/ .idea/ dataflows.iml celerybeat-schedule +.vscode/ # Resources created by our tests .coverage.* diff --git a/.vscode/launch.json b/.vscode/launch.json deleted file mode 100644 index cc90412..0000000 --- a/.vscode/launch.json +++ /dev/null @@ -1,123 +0,0 @@ -{ - // Use IntelliSense to learn about possible attributes. - // Hover to view descriptions of existing attributes. - // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 - "version": "0.2.0", - "configurations": [ - - { - "name": "Python: Current File", - "type": "python", - "request": "launch", - "program": "${file}" - }, - { - "name": "Python: test.py", - "type": "python", - "request": "launch", - "program": "${workspaceFolder}/test.py" - }, - { - "name": "Python: Attach", - "type": "python", - "request": "attach", - "localRoot": "${workspaceFolder}", - "remoteRoot": "${workspaceFolder}", - "port": 3000, - "secret": "my_secret", - "host": "localhost" - }, - { - "name": "Python: Terminal (integrated)", - "type": "python", - "request": "launch", - "program": "${file}", - "console": "integratedTerminal" - }, - { - "name": "Python: Terminal (external)", - "type": "python", - "request": "launch", - "program": "${file}", - "console": "externalTerminal" - }, - { - "name": "Python: Django", - "type": "python", - "request": "launch", - "program": "${workspaceFolder}/manage.py", - "args": [ - "runserver", - "--noreload", - "--nothreading" - ], - "debugOptions": [ - "RedirectOutput", - "Django" - ] - }, - { - "name": "Python: Flask (0.11.x or later)", - "type": "python", - "request": "launch", - "module": "flask", - "env": { - "FLASK_APP": "${workspaceFolder}/app.py" - }, - "args": [ - "run", - "--no-debugger", - "--no-reload" - ] - }, - { - "name": "Python: Module", - "type": "python", - "request": "launch", - "module": "module.name" - }, - { - "name": "Python: Pyramid", - "type": "python", - "request": "launch", - "args": [ - "${workspaceFolder}/development.ini" - ], - "debugOptions": [ - "RedirectOutput", - "Pyramid" - ] - }, - { - "name": "Python: Watson", - "type": "python", - "request": "launch", - "program": "${workspaceFolder}/console.py", - "args": [ - "dev", - "runserver", - "--noreload=True" - ] - }, - { - "name": "Python: All debug Options", - "type": "python", - "request": "launch", - "pythonPath": "${config:python.pythonPath}", - "program": "${file}", - "module": "module.name", - "env": { - "VAR1": "1", - "VAR2": "2" - }, - "envFile": "${workspaceFolder}/.env", - "args": [ - "arg1", - "arg2" - ], - "debugOptions": [ - "RedirectOutput" - ] - } - ] -} \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index 0872280..0000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "python.pythonPath": "/Users/adam/.pyenv/versions/3.6.1/bin/python", - "cSpell.words": [ - "fany" - ], - "editor.detectIndentation": false, - "python.jediEnabled": false -} \ No newline at end of file diff --git a/dataflows/VERSION b/dataflows/VERSION index 43b2961..9789c4c 100644 --- a/dataflows/VERSION +++ b/dataflows/VERSION @@ -1 +1 @@ -0.0.13 +0.0.14 diff --git a/dataflows/processors/load.py b/dataflows/processors/load.py index 5d82892..241d0f5 100644 --- a/dataflows/processors/load.py +++ b/dataflows/processors/load.py @@ -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)