Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

# configuration settings for labeler

version: v1
Expand Down
19 changes: 19 additions & 0 deletions .github/workflows/python-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down
1 change: 0 additions & 1 deletion doc/api/devices.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 0 additions & 1 deletion doc/api/invoices.md
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion doc/models/device-code.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
| `name` | `string` | Optional | An optional user-defined name for the device code.<br>**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'`<br>*Default: `'TERMINAL_API'`* |
| `product_type` | `string` | Required, Constant | **Default**: `'TERMINAL_API'`<br>*Default: `'TERMINAL_API'`* |
| `location_id` | `string` | Optional | The location assigned to this code.<br>**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. |
Expand Down
2 changes: 1 addition & 1 deletion doc/models/gift-card-activity-block.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Describes a gift card activity of the BLOCK type.

| Name | Type | Tags | Description |
| --- | --- | --- | --- |
| `reason` | `string` | Required | **Default**: `'CHARGEBACK_BLOCK'`<br>*Default: `'CHARGEBACK_BLOCK'`* |
| `reason` | `string` | Required, Constant | **Default**: `'CHARGEBACK_BLOCK'`<br>*Default: `'CHARGEBACK_BLOCK'`* |

## Example (as JSON)

Expand Down
2 changes: 1 addition & 1 deletion doc/models/gift-card-activity-unblock.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Present only when `GiftCardActivityType` is UNBLOCK.

| Name | Type | Tags | Description |
| --- | --- | --- | --- |
| `reason` | `string` | Required | **Default**: `'CHARGEBACK_UNBLOCK'`<br>*Default: `'CHARGEBACK_UNBLOCK'`* |
| `reason` | `string` | Required, Constant | **Default**: `'CHARGEBACK_UNBLOCK'`<br>*Default: `'CHARGEBACK_UNBLOCK'`* |

## Example (as JSON)

Expand Down
2 changes: 1 addition & 1 deletion doc/models/invoice-sort.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Identifies the sort field and sort order.

| Name | Type | Tags | Description |
| --- | --- | --- | --- |
| `field` | `string` | Required | The field to use for sorting.<br>**Default**: `'INVOICE_SORT_DATE'`<br>*Default: `'INVOICE_SORT_DATE'`* |
| `field` | `string` | Required, Constant | The field to use for sorting.<br>**Default**: `'INVOICE_SORT_DATE'`<br>*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)
Expand Down
6 changes: 3 additions & 3 deletions doc/models/list-loyalty-programs-response.md
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
}
]
}
Expand Down
6 changes: 3 additions & 3 deletions doc/models/retrieve-loyalty-program-response.md
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
}
}
```
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -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
12 changes: 6 additions & 6 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion square/api/base_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
2 changes: 1 addition & 1 deletion square/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -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():
Expand Down
2 changes: 1 addition & 1 deletion test-requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
nose==1.3.7
nose>=1.3.7