From c59c88f16e672daeae30db3ba2bc701f5657c402 Mon Sep 17 00:00:00 2001 From: Paul Chaignon Date: Tue, 14 Mar 2017 01:19:06 +0100 Subject: [PATCH] Update grammar whitelist (#3510) * Remove a few hashes for grammars with BSD licenses There was an error in Licensee v8.8.2, which caused it to not recognize some BSD licenses. v8.8.3 fixes it. * Update submodules Remove 2 grammars from the whitelist because their licenses were added to a LICENSE file which a proper format (one that Licensee detects). MagicPython now supports all scopes that were previously supported by language-python. --- .gitmodules | 3 --- grammars.yml | 8 ++++---- test/test_grammars.rb | 8 -------- vendor/CodeMirror | 2 +- vendor/grammars/MagicPython | 2 +- vendor/grammars/SublimeBrainfuck | 2 +- vendor/grammars/SublimeEthereum | 2 +- vendor/grammars/SublimePapyrus | 2 +- vendor/grammars/SublimePuppet | 2 +- vendor/grammars/Terraform.tmLanguage | 2 +- vendor/grammars/atom-language-clean | 2 +- vendor/grammars/atom-language-p4 | 2 +- vendor/grammars/atom-language-perl6 | 2 +- vendor/grammars/ceylon-sublimetext | 2 +- vendor/grammars/idris | 2 +- vendor/grammars/language-blade | 2 +- vendor/grammars/language-coffee-script | 2 +- vendor/grammars/language-csharp | 2 +- vendor/grammars/language-csound | 2 +- vendor/grammars/language-css | 2 +- vendor/grammars/language-gfm | 2 +- vendor/grammars/language-javascript | 2 +- vendor/grammars/language-jison | 2 +- vendor/grammars/language-less | 2 +- vendor/grammars/language-python | 1 - vendor/grammars/language-regexp | 2 +- vendor/grammars/language-roff | 2 +- vendor/grammars/language-rpm-spec | 2 +- vendor/grammars/language-yaml | 2 +- vendor/grammars/latex.tmbundle | 2 +- vendor/grammars/reason | 2 +- vendor/grammars/shaders-tmLanguage | 2 +- vendor/grammars/swift.tmbundle | 2 +- 33 files changed, 33 insertions(+), 45 deletions(-) delete mode 160000 vendor/grammars/language-python diff --git a/.gitmodules b/.gitmodules index 8ba30b38..4a0961a4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -67,9 +67,6 @@ [submodule "vendor/grammars/language-javascript"] path = vendor/grammars/language-javascript url = https://github.com/atom/language-javascript -[submodule "vendor/grammars/language-python"] - path = vendor/grammars/language-python - url = https://github.com/atom/language-python [submodule "vendor/grammars/language-shellscript"] path = vendor/grammars/language-shellscript url = https://github.com/atom/language-shellscript diff --git a/grammars.yml b/grammars.yml index 88ccc6ae..2f566a9e 100755 --- a/grammars.yml +++ b/grammars.yml @@ -56,6 +56,8 @@ vendor/grammars/MQL5-sublime: vendor/grammars/MagicPython: - source.python - source.regexp.python +- text.python.console +- text.python.traceback vendor/grammars/Modelica: - source.modelica vendor/grammars/NSIS: @@ -182,6 +184,7 @@ vendor/grammars/atom-language-1c-bsl: - source.sdbl vendor/grammars/atom-language-clean: - source.clean +- source.gfm.clean vendor/grammars/atom-language-p4: - source.p4 vendor/grammars/atom-language-perl6: @@ -224,7 +227,6 @@ vendor/grammars/capnproto.tmbundle: vendor/grammars/carto-atom: - source.css.mss vendor/grammars/ceylon-sublimetext: -- module.ceylon - source.ceylon vendor/grammars/chapel-tmbundle: - source.chapel @@ -403,6 +405,7 @@ vendor/grammars/language-javascript: - source.js - source.js.regexp - source.js.regexp.replacement +- source.jsdoc vendor/grammars/language-jison: - source.jison - source.jisonlex @@ -422,9 +425,6 @@ vendor/grammars/language-ninja: - source.ninja vendor/grammars/language-povray: - source.pov-ray sdl -vendor/grammars/language-python: -- text.python.console -- text.python.traceback vendor/grammars/language-regexp: - source.regexp - source.regexp.extended diff --git a/test/test_grammars.rb b/test/test_grammars.rb index 46dca50b..3551708b 100644 --- a/test/test_grammars.rb +++ b/test/test_grammars.rb @@ -13,7 +13,6 @@ class TestGrammars < Minitest::Test HASH_WHITELIST = [ "bc12b3b4917eab9aedb87ec1305c2a4376e34fd1", # TextMate bundles "16c4748566b3dd996594af0410a1875b22d3a2b3", # language-yaml and atom-salt - "ebae2d87e06d3acef075d049fcfc8958c0364863", # go-tmbundle "ff21db2554d69d78b2220db5615b16bbba0788d3", # factor "b4381ebae3235e91aaf5ccab1e8e94e9ad4faef4", # jflex.tmbundle "da39a3ee5e6b4b0d3255bfef95601890afd80709", # SCSS.tmbundle @@ -22,7 +21,6 @@ class TestGrammars < Minitest::Test "60e1fe192238a032341d5dd3cd80535459fc84e4", # language-coffee-script "94fbd554ec1837fb7c508fd7425326639c3f4103", # language-csharp "70fb557a431891c2d634c33fa7367feab5066fd6", # language-javascript - "e0528c23cd967f999e058f1408ccb5b7237daaba", # language-python "8653305b358375d0fced85dc24793b99919b11ef", # language-shellscript "9f0c0b0926a18f5038e455e8df60221125fc3111", # elixir-tmbundle "a4dadb2374282098c5b8b14df308906f5347d79a", # mako-tmbundle @@ -42,16 +40,10 @@ class TestGrammars < Minitest::Test "c9118c370411f2f049c746c0fd096554e877aea2", # atom-language-perl6 "15a502335012f27f8a5991139298edb87a6e467d", # atom-language-rust "304be6184f7f344d44a1d13bddf511019624fd22", # language-css - "437a5288fec1cfe57fccf1065702cbf8c1b2dd3b", # PHP-Twig.tmbundle - "5a99f728b5d7a216138dbb52f29337858eb3fadf", # SublimeBrainfuck "8c538244ba88ef9902a4faf11a2b9acec46f2a4e", # sublime-nginx - "4c585ff8dede0e3422b48c1a08af8d3a2520a0aa", # dart-sublime-bundle - "1955ed00933a17ac6195425a3b2f7f13ac35a251", # Isabelle.tmbundle "82c356d6ecb143a8a20e1658b0d6a2d77ea8126f", # idl.tmbundle - "a685013dbb5bf3f03da76bc9a787daa6d63a1207", # Agda.tmbundle "9dafd4e2a79cb13a6793b93877a254bc4d351e74", # sublime-text-ox "8e111741d97ba2e27b3d18a309d426b4a37e604f", # sublime-varnish - "a20ba4269977bd5d9b7178605fb7c80b1ed7af12", # SublimeEthereum ].freeze # List of allowed SPDX license names diff --git a/vendor/CodeMirror b/vendor/CodeMirror index 7943e50e..27bfabac 160000 --- a/vendor/CodeMirror +++ b/vendor/CodeMirror @@ -1 +1 @@ -Subproject commit 7943e50e3c09d195dbe1679ea9294d717dc888d4 +Subproject commit 27bfabac6e7f39088092b9ce9a692bdb382d3b1b diff --git a/vendor/grammars/MagicPython b/vendor/grammars/MagicPython index 18de6108..b75b17bf 160000 --- a/vendor/grammars/MagicPython +++ b/vendor/grammars/MagicPython @@ -1 +1 @@ -Subproject commit 18de6108ce2d2520c77958db312d31a78777139b +Subproject commit b75b17bf8e3acd3be35b1cecc7eff9da0e734260 diff --git a/vendor/grammars/SublimeBrainfuck b/vendor/grammars/SublimeBrainfuck index 571332e4..4fda534b 160000 --- a/vendor/grammars/SublimeBrainfuck +++ b/vendor/grammars/SublimeBrainfuck @@ -1 +1 @@ -Subproject commit 571332e4652cb6682dd62517deb2dd80e28a35e3 +Subproject commit 4fda534b0edfba46f1e0d920aad5f519746f2ab2 diff --git a/vendor/grammars/SublimeEthereum b/vendor/grammars/SublimeEthereum index 51dec7b1..b5061403 160000 --- a/vendor/grammars/SublimeEthereum +++ b/vendor/grammars/SublimeEthereum @@ -1 +1 @@ -Subproject commit 51dec7b1e4f9381dfdcce54976473b27ee11b4d8 +Subproject commit b506140321fac5ed37292071a99ef2a6ef500185 diff --git a/vendor/grammars/SublimePapyrus b/vendor/grammars/SublimePapyrus index a98c4200..6dc86d92 160000 --- a/vendor/grammars/SublimePapyrus +++ b/vendor/grammars/SublimePapyrus @@ -1 +1 @@ -Subproject commit a98c42007caf01e47ad3a16ae8d8dcf7dea39ef2 +Subproject commit 6dc86d921a20573fb1be6f076a0022d4d28629e4 diff --git a/vendor/grammars/SublimePuppet b/vendor/grammars/SublimePuppet index a90d5a4e..c18abfbf 160000 --- a/vendor/grammars/SublimePuppet +++ b/vendor/grammars/SublimePuppet @@ -1 +1 @@ -Subproject commit a90d5a4e084a3bb17809e3b59033fbf813749ced +Subproject commit c18abfbf2b6b5af1441438fb456a298fa50d2f97 diff --git a/vendor/grammars/Terraform.tmLanguage b/vendor/grammars/Terraform.tmLanguage index 327d7123..85c3f54f 160000 --- a/vendor/grammars/Terraform.tmLanguage +++ b/vendor/grammars/Terraform.tmLanguage @@ -1 +1 @@ -Subproject commit 327d712327aefd94fc3df7ca6f2ff83e2fe3fecd +Subproject commit 85c3f54f8576cced0a39a962c82dd9229d2e46ef diff --git a/vendor/grammars/atom-language-clean b/vendor/grammars/atom-language-clean index e1bd324d..67ce940e 160000 --- a/vendor/grammars/atom-language-clean +++ b/vendor/grammars/atom-language-clean @@ -1 +1 @@ -Subproject commit e1bd324dffe8a8a5c93214ec41eecee798cca28a +Subproject commit 67ce940eb262c1f93473bbdb15daeec82d24f40e diff --git a/vendor/grammars/atom-language-p4 b/vendor/grammars/atom-language-p4 index 9086e387..999e3af3 160000 --- a/vendor/grammars/atom-language-p4 +++ b/vendor/grammars/atom-language-p4 @@ -1 +1 @@ -Subproject commit 9086e387fc96932666b7a3b1ffe6345e61264fd8 +Subproject commit 999e3af38909ac0f47988e6375e3921f6428b621 diff --git a/vendor/grammars/atom-language-perl6 b/vendor/grammars/atom-language-perl6 index b8c0a2f3..bf91482f 160000 --- a/vendor/grammars/atom-language-perl6 +++ b/vendor/grammars/atom-language-perl6 @@ -1 +1 @@ -Subproject commit b8c0a2f3fed8eff24d4e093565071cb3cbc172f5 +Subproject commit bf91482f2ec0852b505b5357ae952978cd30f476 diff --git a/vendor/grammars/ceylon-sublimetext b/vendor/grammars/ceylon-sublimetext index 67ae76cf..0ee3154f 160000 --- a/vendor/grammars/ceylon-sublimetext +++ b/vendor/grammars/ceylon-sublimetext @@ -1 +1 @@ -Subproject commit 67ae76cfb1d992f4718ac121008f5d974b370cc2 +Subproject commit 0ee3154f3795ff03050ee678a37e6b0afb899069 diff --git a/vendor/grammars/idris b/vendor/grammars/idris index 56fe4d65..4268aefb 160000 --- a/vendor/grammars/idris +++ b/vendor/grammars/idris @@ -1 +1 @@ -Subproject commit 56fe4d65a6b30130658a3f07d1898a873e5a9785 +Subproject commit 4268aefba37457de01c14a3f2c23107af6c9e269 diff --git a/vendor/grammars/language-blade b/vendor/grammars/language-blade index 76318de6..34a2ab49 160000 --- a/vendor/grammars/language-blade +++ b/vendor/grammars/language-blade @@ -1 +1 @@ -Subproject commit 76318de66f4b185399f12b8ac28d0f80ac48739a +Subproject commit 34a2ab498cee537f1a426c226f4114d1486e1e52 diff --git a/vendor/grammars/language-coffee-script b/vendor/grammars/language-coffee-script index 6f5f2202..f117dc3e 160000 --- a/vendor/grammars/language-coffee-script +++ b/vendor/grammars/language-coffee-script @@ -1 +1 @@ -Subproject commit 6f5f2202dfd17c3106f1a5b25bb59927a847d606 +Subproject commit f117dc3ecf372b60ad930506bf45b1c7f95b6284 diff --git a/vendor/grammars/language-csharp b/vendor/grammars/language-csharp index f1462897..2d5f0422 160000 --- a/vendor/grammars/language-csharp +++ b/vendor/grammars/language-csharp @@ -1 +1 @@ -Subproject commit f1462897f9805520733f6dd2060360bd002b3e02 +Subproject commit 2d5f04229aa107672b0024071c8addb4a5178a5b diff --git a/vendor/grammars/language-csound b/vendor/grammars/language-csound index 0db8ee76..13b553cd 160000 --- a/vendor/grammars/language-csound +++ b/vendor/grammars/language-csound @@ -1 +1 @@ -Subproject commit 0db8ee76a58e0ae759719450c1eb15a54831eb0a +Subproject commit 13b553cd016e19cf4abacd287a24ae4fc13f9c0d diff --git a/vendor/grammars/language-css b/vendor/grammars/language-css index 5d4af2db..22b06249 160000 --- a/vendor/grammars/language-css +++ b/vendor/grammars/language-css @@ -1 +1 @@ -Subproject commit 5d4af2db39dc5e4236e1a954610a0fb6ba7b5cdf +Subproject commit 22b06249de20d0f0f9457d3f94cec5844ca4f138 diff --git a/vendor/grammars/language-gfm b/vendor/grammars/language-gfm index 727bcc84..04b60f51 160000 --- a/vendor/grammars/language-gfm +++ b/vendor/grammars/language-gfm @@ -1 +1 @@ -Subproject commit 727bcc84ac077d9f5e633a7d31807e5116a2a65b +Subproject commit 04b60f51e2e5d3e37eff1ade041d6bc911bd9333 diff --git a/vendor/grammars/language-javascript b/vendor/grammars/language-javascript index 4146e0f3..2ba9a989 160000 --- a/vendor/grammars/language-javascript +++ b/vendor/grammars/language-javascript @@ -1 +1 @@ -Subproject commit 4146e0f3a160fc3ac0b80714af144e9ca8ea5329 +Subproject commit 2ba9a9891f70729226fb80ea727ee25bd0db2bc7 diff --git a/vendor/grammars/language-jison b/vendor/grammars/language-jison index 1cf15347..cb78f805 160000 --- a/vendor/grammars/language-jison +++ b/vendor/grammars/language-jison @@ -1 +1 @@ -Subproject commit 1cf15347b96f832c8335b3bf2e1fa73a47913de9 +Subproject commit cb78f8056c6dc6538903fb9025c1b8a33eefcd4b diff --git a/vendor/grammars/language-less b/vendor/grammars/language-less index 65152fe4..0eb05fd2 160000 --- a/vendor/grammars/language-less +++ b/vendor/grammars/language-less @@ -1 +1 @@ -Subproject commit 65152fe43b33655d06a61bfcf2f47b857d0209f1 +Subproject commit 0eb05fd2c4271e9354007f2fc5c2bdf103609ef9 diff --git a/vendor/grammars/language-python b/vendor/grammars/language-python deleted file mode 160000 index 0bb1c441..00000000 --- a/vendor/grammars/language-python +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0bb1c4410883bccd38b179d46307bec547d762f4 diff --git a/vendor/grammars/language-regexp b/vendor/grammars/language-regexp index f7ad4626..3b5782b2 160000 --- a/vendor/grammars/language-regexp +++ b/vendor/grammars/language-regexp @@ -1 +1 @@ -Subproject commit f7ad4626adb046149df554e50623370df9c16e60 +Subproject commit 3b5782b2fd24a79018199f1f300266068e41a5eb diff --git a/vendor/grammars/language-roff b/vendor/grammars/language-roff index ff9e1210..abc92330 160000 --- a/vendor/grammars/language-roff +++ b/vendor/grammars/language-roff @@ -1 +1 @@ -Subproject commit ff9e1210ef0703492433c7db5fd599e1d1f402eb +Subproject commit abc92330c69b3107f93610fe4a7652ef84418814 diff --git a/vendor/grammars/language-rpm-spec b/vendor/grammars/language-rpm-spec index b639f166..5252d481 160000 --- a/vendor/grammars/language-rpm-spec +++ b/vendor/grammars/language-rpm-spec @@ -1 +1 @@ -Subproject commit b639f16683e6cc3a212a02ecab1a2ab721a75abe +Subproject commit 5252d48153483f4595eb45fc29dcca905803e47d diff --git a/vendor/grammars/language-yaml b/vendor/grammars/language-yaml index c7fd9b4e..9288a431 160000 --- a/vendor/grammars/language-yaml +++ b/vendor/grammars/language-yaml @@ -1 +1 @@ -Subproject commit c7fd9b4e8cec784afc731d95bf6d11ed7c6e9044 +Subproject commit 9288a431caf95a8376d102f7142e75c467f37550 diff --git a/vendor/grammars/latex.tmbundle b/vendor/grammars/latex.tmbundle index 60f4ed80..9d330182 160000 --- a/vendor/grammars/latex.tmbundle +++ b/vendor/grammars/latex.tmbundle @@ -1 +1 @@ -Subproject commit 60f4ed80f3cbb14b7fa5161f971f8e1d083734ee +Subproject commit 9d3301824fda1815b1c0f849f051130bf10bc7d0 diff --git a/vendor/grammars/reason b/vendor/grammars/reason index 18e87ab6..292c834f 160000 --- a/vendor/grammars/reason +++ b/vendor/grammars/reason @@ -1 +1 @@ -Subproject commit 18e87ab63f20ee959ebc654ac5d8c01d6d6bd83a +Subproject commit 292c834f0f40feea76c5bd0a7a201026154e484e diff --git a/vendor/grammars/shaders-tmLanguage b/vendor/grammars/shaders-tmLanguage index cd1ef40f..a6ee9f41 160000 --- a/vendor/grammars/shaders-tmLanguage +++ b/vendor/grammars/shaders-tmLanguage @@ -1 +1 @@ -Subproject commit cd1ef40f549f9ce2b9e6b73498688de114a85382 +Subproject commit a6ee9f41e4b99812c6698462cae4868c80f82a3b diff --git a/vendor/grammars/swift.tmbundle b/vendor/grammars/swift.tmbundle index c7aca87c..d6a8cf29 160000 --- a/vendor/grammars/swift.tmbundle +++ b/vendor/grammars/swift.tmbundle @@ -1 +1 @@ -Subproject commit c7aca87ccb7887cb5f5510c6dfe914d9bb073dae +Subproject commit d6a8cf2992391cf4c510c24cb32c2f4c3c0b470a