Merge branch 'master' into allow-organization-id-on-create-chart

.github/workflows/build.yml

@@ -10,17 +10,17 @@ jobs:
         python-version: ["3.7", "3.8"]
 
     steps:
-    - uses: actions/checkout@v2.3.4
+    - uses: actions/checkout@v2.4.0
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2.2.2
+      uses: actions/setup-python@v2.3.2
       with:
         python-version: ${{ matrix.python-version }}
 
     - name: Install poetry
       run: make download-poetry
 
     - name: Set up cache
-      uses: actions/[email protected].6
+      uses: actions/[email protected].7
       with:
         path: .venv
         key: venv-${{ matrix.python-version }}-${{ hashFiles('pyproject.toml') }}-${{ hashFiles('poetry.lock') }}

.github/workflows/greetings.yml

@@ -6,7 +6,7 @@ jobs:
   greeting:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/first-interaction@v1
+    - uses: actions/first-interaction@v1.1.0
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
         pr-message:  'Hello @${{ github.actor }}, thank you for submitting a PR! We will respond as soon as possible.'

.github/workflows/publish.yml

@@ -12,17 +12,17 @@ jobs:
         python-version: ["3.9"]
 
     steps:
-    - uses: actions/checkout@v2.3.4
+    - uses: actions/checkout@v2.4.0
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2.2.2
+      uses: actions/setup-python@v2.3.2
       with:
         python-version: ${{ matrix.python-version }}
 
     - name: Install poetry
       run: make download-poetry
 
     - name: Set up cache
-      uses: actions/[email protected].6
+      uses: actions/[email protected].7
       with:
         path: .venv
         key: venv-${{ matrix.python-version }}-${{ hashFiles('pyproject.toml') }}-${{ hashFiles('poetry.lock') }}

.github/workflows/release-drafter.yml

@@ -11,6 +11,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       # Drafts your next Release notes as Pull Requests are merged into "master"
-      - uses: release-drafter/release-drafter@v5.15.0
+      - uses: release-drafter/release-drafter@v5.18.1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Makefile

@@ -103,7 +103,6 @@ check-safety:
 	$(POETRY_COMMAND_FLAG)poetry check
 	$(PIP_COMMAND_FLAG)poetry run pip check
 	$(PIP_COMMAND_FLAG)poetry run python -m pip install --upgrade pip
-	$(SAFETY_COMMAND_FLAG)poetry run safety check --full-report
 	$(BANDIT_COMMAND_FLAG)poetry run bandit -ll -r datawrapper/
 
 .PHONY: check-style

datawrapper/__main__.py

@@ -11,7 +11,7 @@
 
         dw.account_info()
 """
-from typing import Any, Dict, Iterable, List, Union
+from typing import Any, Dict, Iterable, List, Optional, Union
 
 import json
 import os
@@ -127,6 +127,7 @@ def create_chart(
         data: Union[pd.DataFrame, None] = None,
         folder_id: str = "",
         organization_id: str = "",
+        metadata: Optional[Dict[Any, Any]] = None,
     ) -> Union[Dict[Any, Any], None, Any]:
         """Creates a new Datawrapper chart, table or map.
         You can pass a pandas DataFrame as a `data` argument to upload data.
@@ -144,6 +145,8 @@ def create_chart(
             ID of folder in Datawrapper.de for the chart, table or map to be created in, by default ""
         organization_id : str, optional
             ID of the team where the chart should be created. The authenticated user must have access to this team.
+        metadata: dict, optional
+            A Python dictionary of properties to add.
 
         Returns
         -------
@@ -160,6 +163,8 @@ def create_chart(
             _data["folderId"] = folder_id
         if organization_id:
             _data["organizationId"] = organization_id
+        if metadata:
+            _data["metadata"] = metadata  # type: ignore
 
         new_chart_response = r.post(
             url=self._CHARTS_URL, headers=_header, data=json.dumps(_data)
@@ -609,6 +614,7 @@ def get_charts(
         search: str = "",
         order: str = "DESC",
         order_by: str = "createdAt",
+        folder_id: str = "",
         limit: int = 25,
         folder_id: str = "",
         team_id: str = "",
@@ -627,6 +633,8 @@ def get_charts(
             Result order (ascending or descending), by default "DESC"
         order_by : str, optional
             Attribute to order by. One of createdAt, email, id, or name, by default "createdAt"
+        folder_id: str, optional
+            ID of the folder to search charts in, by default ""
         limit : int, optional
             Maximum items to fetch, by default 25
         folder_id : str, optional
@@ -654,6 +662,8 @@ def get_charts(
             _query["order"] = order
         if order_by:
             _query["orderBy"] = order_by
+        if folder_id:
+            _query["folderId"] = folder_id
         if limit:
             _query["limit"] = str(limit)
         if folder_id: