Skip to content

Commit

Permalink
Merge branch 'main' into refactor/secureli-000-modular-refactor
Browse files Browse the repository at this point in the history
  • Loading branch information
Jordan Heffernan committed Mar 25, 2024
2 parents 9c43ac7 + 0d0ef85 commit f7708ef
Show file tree
Hide file tree
Showing 7 changed files with 97 additions and 92 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:
poetry install
- name: Install BATS for e2e tests
uses: bats-core/[email protected].5
uses: bats-core/[email protected].6
with:
support-path: ${{ github.workspace }}/bats-core/bats-support
assert-path: ${{ github.workspace }}/bats-core/bats-assert
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:

- name: Python Semantic Release
id: release
uses: python-semantic-release/python-semantic-release@v9.1.1
uses: python-semantic-release/python-semantic-release@v9.3.1
with:
github_token: ${{ steps.app_token.outputs.token }}

Expand Down
1 change: 1 addition & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"version": "0.2.0",
"configurations": [

{
"name": "Python: secureli --version",
"type": "debugpy",
Expand Down
178 changes: 89 additions & 89 deletions poetry.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"

[tool.poetry]
name = "secureli"
version = "0.31.0"
version = "0.32.0"
description = "Secure Project Manager"
authors = ["Caleb Tonn <[email protected]>"] # disable-pii-scan
license = "Apache-2.0"
Expand Down
2 changes: 2 additions & 0 deletions secureli/actions/scan.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ class ScanAction(action.Action):
halting_outcomes = [
VerifyOutcome.INSTALL_FAILED,
VerifyOutcome.INSTALL_CANCELED,
VerifyOutcome.UPDATE_FAILED,
VerifyOutcome.UPDATE_CANCELED,
]

def __init__(
Expand Down
2 changes: 2 additions & 0 deletions tests/modules/language_analyzer/test_language_support.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@

test_folder_path = Path("does-not-matter")

test_folder_path = Path("does-not-matter")


@pytest.fixture()
def mock_open_config(mocker: MockerFixture):
Expand Down

0 comments on commit f7708ef

Please sign in to comment.