diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d7af4ba..8b06d80 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,11 +6,10 @@ on: pull_request: branches: [develop] - workflow_dispatch: concurrency: - group: ${{ github.head_ref || github.run_id }} - cancel-in-progress: true + group: ${{ github.head_ref || github.run_id }} + cancel-in-progress: true jobs: lint: @@ -114,4 +113,3 @@ jobs: if: steps.release.outputs.released == 'true' with: github_token: ${{ secrets.GITHUB_TOKEN }} - diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml index 77cfd5c..0fd3917 100644 --- a/.github/workflows/labels.yml +++ b/.github/workflows/labels.yml @@ -5,7 +5,6 @@ on: branches: [develop] paths: [".github/**"] - jobs: labels: runs-on: ubuntu-latest @@ -19,4 +18,3 @@ jobs: run: pip install labels - name: Sync config with Github run: labels -u ${{ github.repository_owner }} -t ${{ secrets.GITHUB_TOKEN }} sync -f .github/labels.toml - diff --git a/pypeline.yaml b/pypeline.yaml index ae21c52..af64ffe 100644 --- a/pypeline.yaml +++ b/pypeline.yaml @@ -1,13 +1,13 @@ pipeline: - install: - - step: CreateVEnv - module: pypeline.steps.create_venv - config: - bootstrap_script: .bootstrap/bootstrap.py - build: - - step: RunPreCommit - file: steps/build.py - - step: RunPytest - file: steps/build.py - - step: GenerateDocs - file: steps/build.py + install: + - step: CreateVEnv + module: pypeline.steps.create_venv + config: + bootstrap_script: .bootstrap/bootstrap.py + build: + - step: RunPreCommit + file: steps/build.py + - step: RunPytest + file: steps/build.py + - step: GenerateDocs + file: steps/build.py diff --git a/src/ihexer/_run.py b/src/ihexer/_run.py index 88b915e..b1cadbf 100644 --- a/src/ihexer/_run.py +++ b/src/ihexer/_run.py @@ -1,7 +1,7 @@ """ -Used to run ihex from the command line when run from this repository. +Used to run ihexer from the command line when run from this repository. -This is required because ihex module is not visible when running from the repository. +This is required because ihexer module is not visible when running from the repository. """ import runpy @@ -9,4 +9,4 @@ from pathlib import Path sys.path.insert(0, Path(__file__).parent.parent.absolute().as_posix()) -runpy.run_module("ihex.main", run_name="__main__") +runpy.run_module("ihexer.main", run_name="__main__") diff --git a/src/ihexer/main.py b/src/ihexer/main.py index e06bf25..327cbeb 100644 --- a/src/ihexer/main.py +++ b/src/ihexer/main.py @@ -6,10 +6,10 @@ from py_app_dev.core.exceptions import UserNotificationException from py_app_dev.core.logging import logger, setup_logger, time_it -from ihex import __version__ -from ihex.ihex import IntelHexDiff, IntelHexParser, IntelHexPrinter +from ihexer import __version__ +from ihexer.ihexer import IntelHexDiff, IntelHexParser, IntelHexPrinter -package_name = "ihex" +package_name = "ihexer" app = typer.Typer(name=package_name, help="Intel HEX utils.", no_args_is_help=True) diff --git a/tests/test_ihex.py b/tests/test_ihex.py index 4a27b40..1de279c 100644 --- a/tests/test_ihex.py +++ b/tests/test_ihex.py @@ -1,6 +1,6 @@ from pathlib import Path -from ihex.ihex import IntelHexParser, IntelHexPrinter, IntelHexSegment +from ihexer.ihexer import IntelHexParser, IntelHexPrinter, IntelHexSegment from tests.utils import get_tests_data_file