diff --git a/requirements/common.in b/requirements/common.in index bdbd35669f..a623fb9581 100644 --- a/requirements/common.in +++ b/requirements/common.in @@ -169,8 +169,8 @@ pyoembed==0.1.2 # these tightly, including fetching content not included in the normal # release tarballs (which is a bug). So we need to pin it makes sense # to pin a version from Git rather than a release. --e "git+https://github.com/zulip/python-zulip-api.git@0.4.5#egg=zulip==0.4.5_git&subdirectory=zulip" --e "git+https://github.com/zulip/python-zulip-api.git@0.4.5#egg=zulip_bots==0.4.5+git&subdirectory=zulip_bots" +-e "git+https://github.com/zulip/python-zulip-api.git@0.4.6#egg=zulip==0.4.6_git&subdirectory=zulip" +-e "git+https://github.com/zulip/python-zulip-api.git@0.4.6#egg=zulip_bots==0.4.6+git&subdirectory=zulip_bots" # Used for Hesiod lookups, etc. py3dns==3.1.0 diff --git a/requirements/dev.txt b/requirements/dev.txt index 2e7f807718..1c291280b1 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -11,8 +11,8 @@ git+https://github.com/zulip/talon.git@7d8bdc4dbcfcc5a73298747293b99fe53da55315#egg=talon==1.2.10.zulip1 git+https://github.com/zulip/ultrajson@70ac02bec#egg=ujson==1.35+git -git+https://github.com/zulip/python-zulip-api.git@0.4.5#egg=zulip==0.4.5_git&subdirectory=zulip -git+https://github.com/zulip/python-zulip-api.git@0.4.5#egg=zulip_bots==0.4.5+git&subdirectory=zulip_bots +git+https://github.com/zulip/python-zulip-api.git@0.4.6#egg=zulip==0.4.6_git&subdirectory=zulip +git+https://github.com/zulip/python-zulip-api.git@0.4.6#egg=zulip_bots==0.4.6+git&subdirectory=zulip_bots alabaster==0.7.10 apns2==0.3.0 argon2-cffi==18.1.0 diff --git a/requirements/prod.txt b/requirements/prod.txt index b04b7dbb34..6230242936 100644 --- a/requirements/prod.txt +++ b/requirements/prod.txt @@ -11,8 +11,8 @@ git+https://github.com/zulip/talon.git@7d8bdc4dbcfcc5a73298747293b99fe53da55315#egg=talon==1.2.10.zulip1 git+https://github.com/zulip/ultrajson@70ac02bec#egg=ujson==1.35+git -git+https://github.com/zulip/python-zulip-api.git@0.4.5#egg=zulip==0.4.5_git&subdirectory=zulip -git+https://github.com/zulip/python-zulip-api.git@0.4.5#egg=zulip_bots==0.4.5+git&subdirectory=zulip_bots +git+https://github.com/zulip/python-zulip-api.git@0.4.6#egg=zulip==0.4.6_git&subdirectory=zulip +git+https://github.com/zulip/python-zulip-api.git@0.4.6#egg=zulip_bots==0.4.6+git&subdirectory=zulip_bots apns2==0.3.0 argon2-cffi==18.1.0 asn1crypto==0.23.0 # via cryptography diff --git a/templates/zerver/api/fixtures.json b/templates/zerver/api/fixtures.json index f451483f82..a609cfd44f 100644 --- a/templates/zerver/api/fixtures.json +++ b/templates/zerver/api/fixtures.json @@ -327,6 +327,19 @@ "last_event_id": -1, "msg": "", "queue_id": "1517975029:0", + "realm_emoji": { + "1": { + "author": { + "email": "iago@zulip.com", + "full_name": "Iago", + "id": 5 + }, + "deactivated": false, + "id": "1", + "name": "green_tick", + "source_url": "/user_avatars/1/emoji/images/1.png" + } + }, "result": "success" }, "remove-subscriptions": { diff --git a/templates/zerver/api/register-queue.md b/templates/zerver/api/register-queue.md index 07cd2e8e60..199fc0d852 100644 --- a/templates/zerver/api/register-queue.md +++ b/templates/zerver/api/register-queue.md @@ -74,6 +74,10 @@ zulip(config).then((client) => { #### Example response +**Note:** If you omit the `event_types` argument to `client.register()`, +the JSON response will include the necessary initial data about +all supported event types. + A typical successful JSON response may look like: {generate_code_example|register-queue|fixture} diff --git a/version.py b/version.py index 068fdbcc04..74003dd75a 100644 --- a/version.py +++ b/version.py @@ -8,4 +8,4 @@ ZULIP_VERSION = "1.8.0+git" # Typically, adding a dependency only requires a minor version bump, and # removing a dependency requires a major version bump. -PROVISION_VERSION = '19.2' +PROVISION_VERSION = '19.3' diff --git a/zerver/lib/api_test_helpers.py b/zerver/lib/api_test_helpers.py index 6b940e5b37..7eec764edd 100644 --- a/zerver/lib/api_test_helpers.py +++ b/zerver/lib/api_test_helpers.py @@ -419,22 +419,12 @@ def register_queue(client): # {code_example|start} # Register the queue - result = client.register() - # {code_example|end} - - client.deregister(result['queue_id']) - fixture = FIXTURES['register-queue'] - test_against_fixture(result, fixture, check_if_equal=['msg', 'result'], - check_if_exists=['last_event_id', 'queue_id']) - - # {code_example|start} - # You may pass in one or more of the arguments documented below - # as keyword arguments, like so: result = client.register( - event_types=['messages'] + event_types=['messages', 'realm_emoji'] ) # {code_example|end} + fixture = FIXTURES['register-queue'] test_against_fixture(result, fixture, check_if_equal=['msg', 'result'], check_if_exists=['last_event_id', 'queue_id'])