Skip to content

Commit

Permalink
Merge branch 'main' into renovate/dev/major-3-eslint
Browse files Browse the repository at this point in the history
  • Loading branch information
mwaddell authored Aug 2, 2024
2 parents 45e2694 + 1407952 commit ad5a9f5
Show file tree
Hide file tree
Showing 8 changed files with 1,840 additions and 1,045 deletions.
2 changes: 1 addition & 1 deletion .github/renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
"extends": ["github>pangaeatech/.github"],
"baseBranches": ["main"],
"branchPrefix": "renovate/",
"enabledManagers": ["pip_requirements", "npm", "nvm", "poetry"]
"enabledManagers": ["npm", "nvm", "poetry"]
}
20 changes: 17 additions & 3 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,25 @@ jobs:
python-version-file: "pyproject.toml"
cache: "pip"

- run: pip install -r requirements.txt
- name: Install poetry
uses: abatilo/actions-poetry@v2

- run: black --check .
- name: Set up local venv
run: |
poetry config virtualenvs.create true --local
poetry config virtualenvs.in-project true --local
- run: pylint salt2type
- name: Cache venv
uses: actions/cache@v3
with:
path: ./.venv
key: venv-${{ hashFiles('poetry.lock') }}

- run: poetry install

- run: poetry run black --check .

- run: poetry run pylint salt2type

- name: Set up Node
uses: actions/setup-node@v3
Expand Down
185 changes: 185 additions & 0 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 14 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,20 @@
[tool.poetry]
name = "salt2type"
version = "0.2.0"
description = "Saltarelle to TypeScript Migration Tool"
authors = ["Pangaea Information Technologies, Ltd."]
readme = "README.md"
repository = "https://github.com/pangaeatech/salt2type"

[tool.black]
line-length = 150
target-version = ['py38']
include = 'salt2type|\.pyi?$'

[tool.poetry.dependencies]
python = "3.12"
python = "~3.12"
black = "24.4.2"
pylint = "3.2.6"
typing-extensions = "4.12.2"
tomli = "2.0.1"
dill = "0.3.8"
2 changes: 0 additions & 2 deletions requirements.txt

This file was deleted.

2 changes: 1 addition & 1 deletion tpl/.nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20.12
20.16
Loading

0 comments on commit ad5a9f5

Please sign in to comment.