Skip to content

Commit

Permalink
Bump actions/checkout from 1 to 4 (#106)
Browse files Browse the repository at this point in the history
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Rafal Chlodnicki <rchl2k@gmail.com>
  • Loading branch information
dependabot[bot] and rchl authored Oct 14, 2023
1 parent 94dd20f commit 2f98628
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 30 deletions.
40 changes: 17 additions & 23 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,51 +16,45 @@ on:

jobs:
Unittesting:
name: Unittesting (ST${{ matrix.sublime-text.version }}, ${{ matrix.os }})
name: Unittesting (${{ matrix.os }})
strategy:
fail-fast: false
matrix:
os: ["ubuntu-latest", "macOS-latest"]
sublime-text:
- version: 3
lsp-tag: 'st3'
- version: 4
lsp-tag: 'main'
runs-on: ${{ matrix.os }}
steps:
- uses: actions/setup-node@v2
with:
node-version: '18'
- if: ${{ matrix.os == 'ubuntu-latest' && matrix.sublime-text.version == '3' }}
run: |
sudo apt update
sudo apt install at-spi2-core
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- if: ${{ matrix.os == 'macOS-latest' }}
run: brew unlink openssl
- uses: SublimeText/UnitTesting/actions/setup@v1
with:
sublime-text-version: ${{ matrix.sublime-text.version }}
sublime-text-version: 4
extra-packages: |
sublimelsp/LSP@${{ matrix.sublime-text.lsp-tag }}
sublimelsp/LSP-pyright
sublimelsp/LSP@main
sublimelsp/LSP-pyright@master
- uses: SublimeText/UnitTesting/actions/run-tests@v1

Lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v4
with:
path: lsp_utils
- uses: actions/setup-python@v2
with:
python-version: '3.8'
- run: sudo apt update
- run: sudo apt install --no-install-recommends -y x11-xserver-utils
- run: pip3 install mypy==0.982 flake8==5.0.4 pyright==1.1.274 --user
- run: |
sudo apt update
sudo apt install --no-install-recommends -y x11-xserver-utils
- run: pip3 install mypy==1.6.0 flake8==5.0.4 pyright==1.1.331 --user
- run: echo "$HOME/.local/bin" >> $GITHUB_PATH
- run: cd .. && git clone https://github.com/sublimelsp/LSP.git
- run: cd .. && git clone https://github.com/SublimeText/sublime_lib.git
- run: mypy st3/lsp_utils
- run: flake8 st3/lsp_utils tests
- run: pyright st3/lsp_utils
- run: git clone https://github.com/sublimelsp/LSP.git
- run: git clone https://github.com/SublimeText/sublime_lib.git
- run: |
cd lsp_utils
mypy st3/lsp_utils
flake8 st3/lsp_utils tests
pyright st3/lsp_utils
2 changes: 1 addition & 1 deletion .github/workflows/on-push-master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
name: Deploy documentation
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- uses: actions/setup-python@v2
with:
python-version: 3.9
Expand Down
1 change: 0 additions & 1 deletion mypy.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
[mypy]
python_version = 3.11
enable_recursive_aliases = True
# ignore_missing_imports = True
# check_untyped_defs = True
disallow_untyped_defs = True
Expand Down
4 changes: 1 addition & 3 deletions st3/lsp_utils/_client_handler/abstract_plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -140,18 +140,16 @@ def on_pre_start(cls, window: sublime.Window, initiating_view: sublime.View,

@classmethod
def setup(cls) -> None:
super().setup()
register_plugin(cls)

@classmethod
def cleanup(cls) -> None:
unregister_plugin(cls)
super().cleanup()

# --- Internals ---------------------------------------------------------------------------------------------------

def __init__(self, *args: Any, **kwargs: Any) -> None:
super().__init__(*args, **kwargs)
api = ApiWrapper(ref(self))
api = ApiWrapper(ref(self)) # type: ignore
register_decorated_handlers(self, api)
self.on_ready(api)
1 change: 1 addition & 0 deletions st3/lsp_utils/_client_handler/interface.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ def get_binary_arguments(cls) -> List[str]:
...

@classmethod
@abstractmethod
def read_settings(cls) -> Tuple[sublime.Settings, str]:
...

Expand Down
4 changes: 2 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ max-line-length = 120

[testenv]
deps =
mypy==0.982
mypy==1.6.0
flake8==5.0.4
pyright==1.1.274
pyright==1.1.331
commands =
mypy st3/lsp_utils
flake8 st3/lsp_utils tests
Expand Down

0 comments on commit 2f98628

Please sign in to comment.