From 3338699257b5f8ee7e5c703b820229d3b6c1b291 Mon Sep 17 00:00:00 2001 From: David Peter Date: Sun, 28 Nov 2021 12:41:38 +0100 Subject: [PATCH] Remove the 'requirements.txt' syntax This is needed because the syntax is only available under GPL v3.0, which is not compatible with `bat`s license. --- .gitmodules | 3 --- CHANGELOG.md | 1 + assets/syntaxes/02_Extra/requirementstxt | 1 - .../02_Extra/requirementstxt.sublime-syntax | 19 ------------------- .../RequirementsTXT/requirements.txt | 8 -------- .../source/RequirementsTXT/requirements.txt | 8 -------- 6 files changed, 1 insertion(+), 39 deletions(-) delete mode 160000 assets/syntaxes/02_Extra/requirementstxt delete mode 100644 assets/syntaxes/02_Extra/requirementstxt.sublime-syntax delete mode 100644 tests/syntax-tests/highlighted/RequirementsTXT/requirements.txt delete mode 100644 tests/syntax-tests/source/RequirementsTXT/requirements.txt diff --git a/.gitmodules b/.gitmodules index 5ea7bddd..e97868e0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -113,9 +113,6 @@ [submodule "assets/syntaxes/Org mode"] path = assets/syntaxes/02_Extra/Org mode url = https://github.com/jezcope/Org.tmbundle.git -[submodule "assets/syntaxes/requirementstxt"] - path = assets/syntaxes/02_Extra/requirementstxt - url = https://github.com/wuub/requirementstxt [submodule "assets/syntaxes/DotENV"] path = assets/syntaxes/02_Extra/DotENV url = https://github.com/zaynali53/DotENV diff --git a/CHANGELOG.md b/CHANGELOG.md index d786edf2..c91be472 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -35,6 +35,7 @@ - Racket, see #1884 (@jubnzv) - LiveScript, see #1915 (@Enselic) - MediaWiki, see #1925 (@sorairolake) +- The `requirements.txt` syntax has been removed due to incompatible license requirements. ## New themes diff --git a/assets/syntaxes/02_Extra/requirementstxt b/assets/syntaxes/02_Extra/requirementstxt deleted file mode 160000 index 775e6dd6..00000000 --- a/assets/syntaxes/02_Extra/requirementstxt +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 775e6dd62aa16f7b28632a200882ff6ad0315b01 diff --git a/assets/syntaxes/02_Extra/requirementstxt.sublime-syntax b/assets/syntaxes/02_Extra/requirementstxt.sublime-syntax deleted file mode 100644 index 8ef40fe4..00000000 --- a/assets/syntaxes/02_Extra/requirementstxt.sublime-syntax +++ /dev/null @@ -1,19 +0,0 @@ -%YAML 1.2 ---- -# http://www.sublimetext.com/docs/3/syntax.html -name: requirements.txt -file_extensions: - - requirements.txt -scope: source.requirementstxt -contexts: - main: - - match: (#).*$\n? - scope: comment.line.requirementstxt - captures: - 1: punctuation.definition.comment.requirementstxt - - match: '(?i)^[a-z0-9_\-\.]+' - scope: string.package_name.requirementstxt - - match: (?i)==|<|<=|>=|> - scope: keyword.operator.logical.punctuation.requirementstxt - - match: '(?i)\d+\.[\da-z\-_\.]*' - scope: constant.numeric.verions.requirementstxt diff --git a/tests/syntax-tests/highlighted/RequirementsTXT/requirements.txt b/tests/syntax-tests/highlighted/RequirementsTXT/requirements.txt deleted file mode 100644 index b7c5155f..00000000 --- a/tests/syntax-tests/highlighted/RequirementsTXT/requirements.txt +++ /dev/null @@ -1,8 +0,0 @@ -#this is a sample requirements.txt file - -django==11.2.0 -pywheels>=12.4 #a whitespace followed by comments -Nuitka<0.6.8.4 -wxPython>=1.0, <=2.1 - -#this is another comment diff --git a/tests/syntax-tests/source/RequirementsTXT/requirements.txt b/tests/syntax-tests/source/RequirementsTXT/requirements.txt deleted file mode 100644 index 83d71e0e..00000000 --- a/tests/syntax-tests/source/RequirementsTXT/requirements.txt +++ /dev/null @@ -1,8 +0,0 @@ -#this is a sample requirements.txt file - -django==11.2.0 -pywheels>=12.4 #a whitespace followed by comments -Nuitka<0.6.8.4 -wxPython>=1.0, <=2.1 - -#this is another comment