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
3 changes: 3 additions & 0 deletions .mock/definition/hris/dependents.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ service:
cursor:
type: optional<string>
docs: The pagination cursor value.
employee_id:
type: optional<string>
docs: If provided, will only return dependents for this employee.
include_deleted_data:
type: optional<boolean>
docs: >-
Expand Down
3 changes: 3 additions & 0 deletions .mock/definition/hris/employees.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1183,6 +1183,9 @@ service:
display_full_name:
type: optional<string>
docs: If provided, will only return employees with this display name.
employee_number:
type: optional<string>
docs: If provided, will only return employees with this employee number.
employment_status:
type: optional<EmployeesListRequestEmploymentStatus>
docs: >-
Expand Down
12 changes: 12 additions & 0 deletions .mock/definition/ticketing/__package__.yml
Original file line number Diff line number Diff line change
Expand Up @@ -843,6 +843,18 @@ types:
parent_collection:
type: optional<CollectionParentCollection>
docs: The parent collection for this collection.
collection_url:
type: optional<string>
docs: The 3rd party url of the Collection.
validation:
format: uri
maxLength: 2000
remote_created_at:
type: optional<datetime>
docs: When the third party's collection was created.
remote_updated_at:
type: optional<datetime>
docs: When the third party's collection was updated.
remote_was_deleted:
type: optional<boolean>
docs: >-
Expand Down
9 changes: 9 additions & 0 deletions .mock/definition/ticketing/collections.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,9 @@ service:
docs: >-
If provided, only objects synced by Merge before this date time
will be returned.
name:
type: optional<string>
docs: If provided, will only return collections with this name.
page_size:
type: optional<integer>
docs: Number of results to return per page.
Expand Down Expand Up @@ -105,6 +108,9 @@ service:
access_level: PRIVATE
collection_type: LIST
parent_collection: parent_collection
collection_url: https://example.com
remote_created_at: '2022-01-01T00:00:00Z'
remote_updated_at: '2022-01-01T00:00:00Z'
remote_was_deleted: true
field_mappings:
organization_defined_targets:
Expand Down Expand Up @@ -237,6 +243,9 @@ service:
access_level: PRIVATE
collection_type: LIST
parent_collection: parent_collection
collection_url: https://example.com
remote_created_at: '2022-01-01T00:00:00Z'
remote_updated_at: '2022-01-01T00:00:00Z'
remote_was_deleted: true
field_mappings:
organization_defined_targets:
Expand Down
3 changes: 3 additions & 0 deletions .mock/definition/ticketing/contacts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ service:
cursor:
type: optional<string>
docs: The pagination cursor value.
email_address:
type: optional<string>
docs: If provided, will only return Contacts that match this email.
expand:
type: optional<literal<"account">>
docs: >-
Expand Down
3 changes: 3 additions & 0 deletions .mock/definition/ticketing/tickets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1208,6 +1208,9 @@ service:
docs: >-
If provided, only objects synced by Merge before this date time
will be returned.
name:
type: optional<string>
docs: If provided, will only return tickets with this name.
page_size:
type: optional<integer>
docs: Number of results to return per page.
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ from merge import Merge
client = Merge(
...,
httpx_client=httpx.Client(
proxies="http://my.test.proxy.example.com",
proxy="http://my.test.proxy.example.com",
transport=httpx.HTTPTransport(local_address="0.0.0.0"),
),
)
Expand Down Expand Up @@ -233,3 +233,4 @@ while response.next is not None:




2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "MergePythonClient"

[tool.poetry]
name = "MergePythonClient"
version = "2.3.1"
version = "2.3.2"
description = ""
readme = "README.md"
authors = []
Expand Down
Loading