From 1512a6982b652a113a05b025fce049d55d237f02 Mon Sep 17 00:00:00 2001 From: autobot Date: Thu, 30 Sep 2021 16:46:55 +0000 Subject: [PATCH] Generated PR for Release: 14.1.1.20210915 --- .github/labeler.yml | 1 + .github/workflows/python-package.yml | 19 +++++++++++++++++++ CHANGELOG.md | 4 ++++ doc/api/devices.md | 1 - doc/api/invoices.md | 1 - doc/models/device-code.md | 2 +- doc/models/gift-card-activity-block.md | 2 +- doc/models/gift-card-activity-unblock.md | 2 +- doc/models/invoice-sort.md | 2 +- doc/models/list-loyalty-programs-response.md | 6 +++--- .../retrieve-loyalty-program-response.md | 6 +++--- requirements.txt | 2 +- setup.py | 12 ++++++------ square/api/base_api.py | 2 +- square/client.py | 2 +- test-requirements.txt | 2 +- 16 files changed, 44 insertions(+), 22 deletions(-) diff --git a/.github/labeler.yml b/.github/labeler.yml index 1e82c55e..1d486d97 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -1,3 +1,4 @@ + # configuration settings for labeler version: v1 diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 64bc76f7..6774b90a 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -34,3 +34,22 @@ jobs: - name: Test with nose run: | nosetests + + labeler: + needs: build + if: ${{ github.event_name == 'pull_request' }} + runs-on: ubuntu-latest + steps: + - name: automerge-labeler + uses: fuxingloh/multi-labeler@v1 + + automerge: + needs: labeler + if: ${{ github.event_name == 'pull_request' }} + runs-on: ubuntu-latest + steps: + - name: automerge + uses: "pascalgn/automerge-action@v0.14.2" + env: + GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" + MERGE_LABELS: "automerge,automerge-branch,automerge-author" diff --git a/CHANGELOG.md b/CHANGELOG.md index 8bc25388..849327d4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Change Log +## Version 14.1.1.20210915 (2021-09-15) +## SDK updates +* Upgraded josnpickle dependency + ## Version 14.1.0.20210915 (2021-09-15) ## API updates diff --git a/doc/api/devices.md b/doc/api/devices.md index 654bdff2..cd312850 100644 --- a/doc/api/devices.md +++ b/doc/api/devices.md @@ -87,7 +87,6 @@ body['device_code']['id'] = 'id0' body['device_code']['name'] = 'Counter 1' body['device_code']['code'] = 'code8' body['device_code']['device_id'] = 'device_id6' -body['device_code']['product_type'] = 'TERMINAL_API' body['device_code']['location_id'] = 'B5E4484SHHNYH' result = devices_api.create_device_code(body) diff --git a/doc/api/invoices.md b/doc/api/invoices.md index e9d377f9..49f87cc6 100644 --- a/doc/api/invoices.md +++ b/doc/api/invoices.md @@ -193,7 +193,6 @@ body['query']['filter'] = {} body['query']['filter']['location_ids'] = ['ES0RJRZYEC39A'] body['query']['filter']['customer_ids'] = ['JDKYHBWT1D4F8MFH63DBMEN8Y4'] body['query']['sort'] = {} -body['query']['sort']['field'] = 'INVOICE_SORT_DATE' body['query']['sort']['order'] = 'DESC' body['limit'] = 164 body['cursor'] = 'cursor0' diff --git a/doc/models/device-code.md b/doc/models/device-code.md index ba3eeb0e..72b764d1 100644 --- a/doc/models/device-code.md +++ b/doc/models/device-code.md @@ -13,7 +13,7 @@ | `name` | `string` | Optional | An optional user-defined name for the device code.
**Constraints**: *Maximum Length*: `128` | | `code` | `string` | Optional | The unique code that can be used to login. | | `device_id` | `string` | Optional | The unique id of the device that used this code. Populated when the device is paired up. | -| `product_type` | `string` | Required | **Default**: `'TERMINAL_API'`
*Default: `'TERMINAL_API'`* | +| `product_type` | `string` | Required, Constant | **Default**: `'TERMINAL_API'`
*Default: `'TERMINAL_API'`* | | `location_id` | `string` | Optional | The location assigned to this code.
**Constraints**: *Maximum Length*: `50` | | `status` | [`str (Device Code Status)`](/doc/models/device-code-status.md) | Optional | DeviceCode.Status enum. | | `pair_by` | `string` | Optional | When this DeviceCode will expire and no longer login. Timestamp in RFC 3339 format. | diff --git a/doc/models/gift-card-activity-block.md b/doc/models/gift-card-activity-block.md index 372a1d6c..c48c8241 100644 --- a/doc/models/gift-card-activity-block.md +++ b/doc/models/gift-card-activity-block.md @@ -11,7 +11,7 @@ Describes a gift card activity of the BLOCK type. | Name | Type | Tags | Description | | --- | --- | --- | --- | -| `reason` | `string` | Required | **Default**: `'CHARGEBACK_BLOCK'`
*Default: `'CHARGEBACK_BLOCK'`* | +| `reason` | `string` | Required, Constant | **Default**: `'CHARGEBACK_BLOCK'`
*Default: `'CHARGEBACK_BLOCK'`* | ## Example (as JSON) diff --git a/doc/models/gift-card-activity-unblock.md b/doc/models/gift-card-activity-unblock.md index 6bcbc24e..e7fc1b4e 100644 --- a/doc/models/gift-card-activity-unblock.md +++ b/doc/models/gift-card-activity-unblock.md @@ -11,7 +11,7 @@ Present only when `GiftCardActivityType` is UNBLOCK. | Name | Type | Tags | Description | | --- | --- | --- | --- | -| `reason` | `string` | Required | **Default**: `'CHARGEBACK_UNBLOCK'`
*Default: `'CHARGEBACK_UNBLOCK'`* | +| `reason` | `string` | Required, Constant | **Default**: `'CHARGEBACK_UNBLOCK'`
*Default: `'CHARGEBACK_UNBLOCK'`* | ## Example (as JSON) diff --git a/doc/models/invoice-sort.md b/doc/models/invoice-sort.md index 3aea9d30..bace148e 100644 --- a/doc/models/invoice-sort.md +++ b/doc/models/invoice-sort.md @@ -11,7 +11,7 @@ Identifies the sort field and sort order. | Name | Type | Tags | Description | | --- | --- | --- | --- | -| `field` | `string` | Required | The field to use for sorting.
**Default**: `'INVOICE_SORT_DATE'`
*Default: `'INVOICE_SORT_DATE'`* | +| `field` | `string` | Required, Constant | The field to use for sorting.
**Default**: `'INVOICE_SORT_DATE'`
*Default: `'INVOICE_SORT_DATE'`* | | `order` | [`str (Sort Order)`](/doc/models/sort-order.md) | Optional | The order (e.g., chronological or alphabetical) in which results from a request are returned. | ## Example (as JSON) diff --git a/doc/models/list-loyalty-programs-response.md b/doc/models/list-loyalty-programs-response.md index cd881e10..eec41aa4 100644 --- a/doc/models/list-loyalty-programs-response.md +++ b/doc/models/list-loyalty-programs-response.md @@ -37,14 +37,14 @@ A response that contains all loyalty programs. } } ], - "created_at": "\"2020-04-20T16:55:11Z\"", + "created_at": "2020-04-20T16:55:11Z", "id": "d619f755-2d17-41f3-990d-c04ecedd64dd", "location_ids": [ "P034NEENMD09F" ], "reward_tiers": [ { - "created_at": "\"2020-04-20T16:55:11Z\"", + "created_at": "2020-04-20T16:55:11Z", "definition": { "discount_type": "FIXED_PERCENTAGE", "percentage_discount": "10", @@ -64,7 +64,7 @@ A response that contains all loyalty programs. "one": "Point", "other": "Points" }, - "updated_at": "\"2020-05-01T02:00:02Z\"" + "updated_at": "2020-05-01T02:00:02Z" } ] } diff --git a/doc/models/retrieve-loyalty-program-response.md b/doc/models/retrieve-loyalty-program-response.md index 3ec8c3c9..2ff3dc1f 100644 --- a/doc/models/retrieve-loyalty-program-response.md +++ b/doc/models/retrieve-loyalty-program-response.md @@ -36,14 +36,14 @@ A response that contains the loyalty program. } } ], - "created_at": "\"2020-04-20T16:55:11Z\"", + "created_at": "2020-04-20T16:55:11Z", "id": "d619f755-2d17-41f3-990d-c04ecedd64dd", "location_ids": [ "P034NEENMD09F" ], "reward_tiers": [ { - "created_at": "\"2020-04-20T16:55:11Z\"", + "created_at": "2020-04-20T16:55:11Z", "definition": { "discount_type": "FIXED_PERCENTAGE", "percentage_discount": "10", @@ -63,7 +63,7 @@ A response that contains the loyalty program. "one": "Point", "other": "Points" }, - "updated_at": "\"2020-05-01T02:00:02Z\"" + "updated_at": "2020-05-01T02:00:02Z" } } ``` diff --git a/requirements.txt b/requirements.txt index 07f801db..bdfc7446 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ -requests~=2.24 jsonpickle~=1.4, >= 1.4.1 +requests~=2.24 cachecontrol~=0.12.6 python-dateutil~=2.8.1 deprecation~=2.1 diff --git a/setup.py b/setup.py index 85a4957f..3356624f 100644 --- a/setup.py +++ b/setup.py @@ -12,7 +12,7 @@ setup( name='squareup', - version='14.1.0.20210915', + version='14.1.1.20210915', description='Use Square APIs to manage and run business including payment, customer, product, inventory, and employee management.', long_description=long_description, long_description_content_type="text/markdown", @@ -21,11 +21,11 @@ url='https://squareup.com/developers', packages=find_packages(), install_requires=[ - 'requests>=2.9.1, <3.0', - 'jsonpickle>=0.7.1, <1.0', - 'cachecontrol>=0.11.7, <1.0', - 'python-dateutil>=2.5.3, <3.0', - 'deprecation>=2.0.6' + 'jsonpickle~=1.4, >= 1.4.1', + 'requests~=2.24', + 'cachecontrol~=0.12.6', + 'python-dateutil~=2.8.1', + 'deprecation~=2.1' ], tests_require=[ 'nose>=1.3.7' diff --git a/square/api/base_api.py b/square/api/base_api.py index 1d62defd..5e65e04b 100644 --- a/square/api/base_api.py +++ b/square/api/base_api.py @@ -21,7 +21,7 @@ class BaseApi(object): def global_headers(self): return { - 'user-agent': 'Square-Python-SDK/14.1.0.20210915', + 'user-agent': 'Square-Python-SDK/14.1.1.20210915', 'Square-Version': self.config.square_version } diff --git a/square/client.py b/square/client.py index 4f685e3a..174c4c01 100644 --- a/square/client.py +++ b/square/client.py @@ -41,7 +41,7 @@ class Client(object): @staticmethod def sdk_version(): - return '14.1.0.20210915' + return '14.1.1.20210915' @staticmethod def square_version(): diff --git a/test-requirements.txt b/test-requirements.txt index 9eccdff6..7331c33c 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1 +1 @@ -nose==1.3.7 +nose>=1.3.7