diff --git a/.github/workflows/isort.yml b/.github/workflows/style.yml similarity index 67% rename from .github/workflows/isort.yml rename to .github/workflows/style.yml index df3249a..ac540ae 100644 --- a/.github/workflows/isort.yml +++ b/.github/workflows/style.yml @@ -1,4 +1,4 @@ -name: Formatter-CI Workflow +name: Style Checker Workflow on: pull_request: @@ -11,7 +11,7 @@ jobs: strategy: max-parallel: 4 matrix: - python-version: [ 3.11 ] + python-version: [ 3.12 ] steps: - uses: actions/checkout@v4 @@ -22,8 +22,9 @@ jobs: - name: Install Dependencies run: | python -m pip install --upgrade pip - pip install poetry - poetry install --no-root - - name: Run Formatter check + pip install uv + uv sync --extra dev + - name: Run Style checker run: | - poetry run isort ./ --check \ No newline at end of file + uv run isort ./ --check + uv run black ./ --check diff --git a/.github/workflows/black.yml b/.github/workflows/test.yml similarity index 70% rename from .github/workflows/black.yml rename to .github/workflows/test.yml index 3b31e88..9ece25b 100644 --- a/.github/workflows/black.yml +++ b/.github/workflows/test.yml @@ -1,4 +1,4 @@ -name: Formatter-CI Workflow +name: Test Workflow on: pull_request: @@ -11,7 +11,7 @@ jobs: strategy: max-parallel: 4 matrix: - python-version: [ 3.11 ] + python-version: [ 3.12 ] steps: - uses: actions/checkout@v4 @@ -22,8 +22,8 @@ jobs: - name: Install Dependencies run: | python -m pip install --upgrade pip - pip install poetry - poetry install --no-root - - name: Run Formatter check + pip install uv + uv sync --extra dev + - name: Run Test run: | - poetry run black ./ --check \ No newline at end of file + uv run pytest diff --git a/.gitignore b/.gitignore index 1aeea64..dfa105c 100644 --- a/.gitignore +++ b/.gitignore @@ -169,7 +169,7 @@ cython_debug/ # be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore # and can be added to the global gitignore or merged into this file. For a more nuclear # option (not recommended) you can uncomment the following to ignore the entire idea folder. -#.idea/ +.idea/ ### PyCharm+all ### # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider diff --git a/.idea/runConfigurations/Jusicool_Server.xml b/.idea/runConfigurations/Jusicool_Server.xml index a946245..283b926 100644 --- a/.idea/runConfigurations/Jusicool_Server.xml +++ b/.idea/runConfigurations/Jusicool_Server.xml @@ -5,7 +5,6 @@