Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lint: Remove unused ignorelongline and lint:ignore comments. 

Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg 2020-09-01 17:57:15 -07:00 committed by Tim Abbott
parent 72d2e5df15
commit edaed497ed
4 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
templates/zerver/help/bots-and-integrations.md
View File

@ -40,7 +40,7 @@ The **bot type** determines what the bot can do.
Bot type | Permissions | Common uses Bot type | Permissions | Common uses
---|---|--- ---|---|---
Incoming webhook | Send messages into Zulip | Third party integrations Incoming webhook | Send messages into Zulip | Third party integrations
Outgoing webhook | Send messages into Zulip, read messages where the bot is addressed | Third party integrations, most custom bots <!-- # ignorelongline --> Outgoing webhook | Send messages into Zulip, read messages where the bot is addressed | Third party integrations, most custom bots
Generic | Anything the bot creator can do | Automating tasks, bots that listen to all messages on a stream Generic | Anything the bot creator can do | Automating tasks, bots that listen to all messages on a stream
API super bot (self-hosted only) | Anything any user can do | Mirroring API super bot (self-hosted only) | Anything any user can do | Mirroring

8
tools/setup/emoji/emoji_names.py
View File

@ -141,7 +141,7 @@ EMOJI_NAME_MAPS: Dict[str, Dict[str, Any]] = {
'1f47b': {'canonical_name': 'ghost', 'aliases': ['boo', 'spooky', 'haunted']}, '1f47b': {'canonical_name': 'ghost', 'aliases': ['boo', 'spooky', 'haunted']},
'1f480': {'canonical_name': 'skull', 'aliases': []}, '1f480': {'canonical_name': 'skull', 'aliases': []},
# alternates seemed like reasonable additions # alternates seemed like reasonable additions
'2620': {'canonical_name': 'skull_and_crossbones', 'aliases': ['pirate', 'death', 'hazard', 'toxic', 'poison']}, # ignorelongline '2620': {'canonical_name': 'skull_and_crossbones', 'aliases': ['pirate', 'death', 'hazard', 'toxic', 'poison']},
# ufo seemed like a natural addition # ufo seemed like a natural addition
'1f47d': {'canonical_name': 'alien', 'aliases': ['ufo']}, '1f47d': {'canonical_name': 'alien', 'aliases': ['ufo']},
'1f47e': {'canonical_name': 'space_invader', 'aliases': []}, '1f47e': {'canonical_name': 'space_invader', 'aliases': []},
@ -327,7 +327,7 @@ EMOJI_NAME_MAPS: Dict[str, Dict[str, Any]] = {
# safety and invincibility inspired by # safety and invincibility inspired by
# https://mashable.com/2015/10/23/ios-9-1-emoji-guide/. hard_hat and # https://mashable.com/2015/10/23/ios-9-1-emoji-guide/. hard_hat and
# rescue_worker seem like good additions # rescue_worker seem like good additions
'26d1': {'canonical_name': 'helmet', 'aliases': ['hard_hat', 'rescue_worker', 'safety_first', 'invincible']}, # ignorelongline '26d1': {'canonical_name': 'helmet', 'aliases': ['hard_hat', 'rescue_worker', 'safety_first', 'invincible']},
# backpack from gemoji, dominates satchel on google trends # backpack from gemoji, dominates satchel on google trends
'1f392': {'canonical_name': 'backpack', 'aliases': ['satchel']}, '1f392': {'canonical_name': 'backpack', 'aliases': ['satchel']},
'1f45d': {'canonical_name': 'pouch', 'aliases': []}, '1f45d': {'canonical_name': 'pouch', 'aliases': []},
@ -689,7 +689,7 @@ EMOJI_NAME_MAPS: Dict[str, Dict[str, Any]] = {
# Seems like the best emoji for hungry and meal. fork_and_knife_and_plate # Seems like the best emoji for hungry and meal. fork_and_knife_and_plate
# is from gemoji/unicode, and I think is better than the shorter iamcal # is from gemoji/unicode, and I think is better than the shorter iamcal
# version in this case. The rest just seemed like good additions. # version in this case. The rest just seemed like good additions.
'1f37d': {'canonical_name': 'hungry', 'aliases': ['meal', 'table_setting', 'fork_and_knife_with_plate', 'lets_eat']}, # ignorelongline '1f37d': {'canonical_name': 'hungry', 'aliases': ['meal', 'table_setting', 'fork_and_knife_with_plate', 'lets_eat']},
# most people interested in this sport call it football # most people interested in this sport call it football
'26bd': {'canonical_name': 'football', 'aliases': ['soccer']}, '26bd': {'canonical_name': 'football', 'aliases': ['soccer']},
'1f3c0': {'canonical_name': 'basketball', 'aliases': []}, '1f3c0': {'canonical_name': 'basketball', 'aliases': []},
@ -831,7 +831,7 @@ EMOJI_NAME_MAPS: Dict[str, Dict[str, Any]] = {
# the iamcal names # the iamcal names
'1f69a': {'canonical_name': 'moving_truck', 'aliases': []}, '1f69a': {'canonical_name': 'moving_truck', 'aliases': []},
# see Places/11 for truck. Rest seem reasonable additions. # see Places/11 for truck. Rest seem reasonable additions.
'1f69b': {'canonical_name': 'truck', 'aliases': ['tractor-trailer', 'big_rig', 'semi_truck', 'transport_truck']}, # ignorelongline '1f69b': {'canonical_name': 'truck', 'aliases': ['tractor-trailer', 'big_rig', 'semi_truck', 'transport_truck']},
'1f69c': {'canonical_name': 'tractor', 'aliases': []}, '1f69c': {'canonical_name': 'tractor', 'aliases': []},
# kick_scooter and scooter seem better for Places/14 and Places /16 than # kick_scooter and scooter seem better for Places/14 and Places /16 than
# scooter and motor_scooter. # scooter and motor_scooter.

4
tools/setup/emoji/import_emoji_names_from_csv
View File

@ -120,10 +120,6 @@ def main() -> None:
else: else:
emoji_entry = ACTIVE_ENTRY % dict(**context) emoji_entry = ACTIVE_ENTRY % dict(**context)
# If an entry is longer than 120 then append
# ` # ignorelongline` to avoid lint errors.
if len(emoji_entry.split('\n')[-1]) >= 110:
emoji_entry += ' # ignorelongline'
emoji_entries += emoji_entry emoji_entries += emoji_entry
with open(args.output_file_path, 'w') as fp: with open(args.output_file_path, 'w') as fp:

2
zerver/tests/test_push_notifications.py
View File

@ -556,7 +556,7 @@ class AnalyticsBouncerTest(BouncerTestCase):
mock_request.side_effect = self.bounce_request mock_request.side_effect = self.bounce_request
# Send fixture generated with Zulip 2.0 code # Send fixture generated with Zulip 2.0 code
send_to_push_bouncer('POST', 'server/analytics', { send_to_push_bouncer('POST', 'server/analytics', {
'realm_counts': '[{"id":1,"property":"invites_sent::day","subgroup":null,"end_time":574300800.0,"value":5,"realm":2}]', # lint:ignore 'realm_counts': '[{"id":1,"property":"invites_sent::day","subgroup":null,"end_time":574300800.0,"value":5,"realm":2}]',
'installation_counts': '[]', 'installation_counts': '[]',
'version': '"2.0.6+git"'}) 'version': '"2.0.6+git"'})
self.assertEqual(mock_request.call_count, 1) self.assertEqual(mock_request.call_count, 1)