Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix CI build #2144

Merged
merged 3 commits into from
Apr 27, 2023
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
13 changes: 4 additions & 9 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,14 @@ jobs:
fail-fast: false
matrix:
os: [ ubuntu, windows, macos ]
python-version: [3.7, 3.8, 3.9, '3.10']
python-version: [3.8, '3.10', 3.11]
include:
- python-version: 3.7
node-version: 12
- python-version: 3.8
node-version: 14
- python-version: 3.9
node-version: 16
- python-version: '3.10'
node-version: 16
exclude:
- os: windows
python-version: 2.7
node-version: 18
- python-version: 3.11
node-version: 20
steps:
- uses: actions/checkout@v2
- name: Set up Node ${{ matrix.node-version }}
Expand Down
2 changes: 0 additions & 2 deletions python/cssbeautifier/_main.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ def beautify_file(file_name, opts=None):


def usage(stream=sys.stdout):

print(
"cssbeautifier.py@"
+ __version__
Expand Down Expand Up @@ -102,7 +101,6 @@ def usage(stream=sys.stdout):


def main():

argv = sys.argv[1:]

try:
Expand Down
2 changes: 0 additions & 2 deletions python/cssbeautifier/css/beautifier.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ def beautify_file(file_name, opts=default_options()):


def usage(stream=sys.stdout):

print(
"cssbeautifier.py@"
+ __version__
Expand Down Expand Up @@ -384,7 +383,6 @@ def beautify(self):
if self._options.brace_style == "expand":
self._output.add_new_line(True)
elif self._ch == ":":

for i in range(0, len(self.NON_SEMICOLON_NEWLINE_PROPERTY)):
if self._input.lookBack(self.NON_SEMICOLON_NEWLINE_PROPERTY[i]):
insideNonSemiColonValues = True
Expand Down
2 changes: 0 additions & 2 deletions python/jsbeautifier/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ def beautify_file(file_name, opts=default_options()):


def usage(stream=sys.stdout):

print(
"jsbeautifier.py@"
+ __version__
Expand Down Expand Up @@ -156,7 +155,6 @@ def usage(stream=sys.stdout):


def main():

argv = sys.argv[1:]

try:
Expand Down
1 change: 0 additions & 1 deletion python/jsbeautifier/core/directives.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@

class Directives:
def __init__(self, start_block_pattern, end_block_pattern):

self.__directives_block_pattern = re.compile(
start_block_pattern + r" beautify( \w+[:]\w+)+ " + end_block_pattern
)
Expand Down
1 change: 0 additions & 1 deletion python/jsbeautifier/core/output.py
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,6 @@ def __add_column(self):

class Output:
def __init__(self, options, baseIndentString=""):

self.__indent_cache = IndentStringCache(options, baseIndentString)
self.raw = False
self._end_with_newline = options.end_with_newline
Expand Down
1 change: 0 additions & 1 deletion python/jsbeautifier/core/templatablepattern.py
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,6 @@ def _read_template(self):
resulting_string or self.__patterns.django_value.read()
)
if not self._excluded.django:

resulting_string = (
resulting_string or self.__patterns.django_comment.read()
)
Expand Down
1 change: 0 additions & 1 deletion python/jsbeautifier/javascript/beautifier.py
Original file line number Diff line number Diff line change
Expand Up @@ -1369,7 +1369,6 @@ def handle_operator(self, current_token):
and self._options.preserve_newlines
and current_token.text in Tokenizer.positionable_operators
):

isColon = current_token.text == ":"
isTernaryColon = isColon and in_ternary
isOtherColon = isColon and not in_ternary
Expand Down
3 changes: 0 additions & 3 deletions python/jsbeautifier/javascript/tokenizer.py
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,6 @@ def _read_string(self, c):
return None

def _read_regexp(self, c, previous_token):

if c == "/" and self.allowRegExOrXML(previous_token):
# handle regexp
resulting_string = self._input.next()
Expand Down Expand Up @@ -425,7 +424,6 @@ def _read_non_javascript(self, c):
resulting_string = ""

if c == "#":

# she-bang
if self._is_first_token():
resulting_string = self._patterns.shebang.read()
Expand Down Expand Up @@ -471,7 +469,6 @@ def _read_non_javascript(self, c):
self._input.back()

elif c == "<" and self._is_first_token():

if self._patterns.html_comment_start.read():
c = "<!--"
while self._input.hasNext() and not self._input.testChar(
Expand Down