diff --git a/.github/workflows/format_and_lint.yaml b/.github/workflows/format_and_lint.yaml index 7c1afc43a..7bb102df3 100644 --- a/.github/workflows/format_and_lint.yaml +++ b/.github/workflows/format_and_lint.yaml @@ -1,11 +1,11 @@ -name: Code Formatting and Linting +name: Black Code Formatter on: push: pull_request: jobs: - format_and_lint: + format: runs-on: ubuntu-latest steps: @@ -17,34 +17,20 @@ jobs: with: python-version: '3.x' - - name: Install Black and Flake8 + - name: Install Black run: | python -m pip install --upgrade pip - pip install black flake8 + pip install black - name: Run Black - run: black -S . + run: black --check . - - name: Check for changes - id: git_status + - name: Commit changes if any run: | git config --global user.name 'github-actions[bot]' git config --global user.email '41898282+github-actions[bot]@users.noreply.github.com' - git add . - if git diff-index --quiet HEAD --; then - echo "No changes to commit" > /tmp/git_status_output - else + if ! git diff --exit-code; then + git add . git commit -m "Format code with Black" - echo "Changes committed" > /tmp/git_status_output + git push fi - continue-on-error: true - - - name: Read git status output - id: read_git_status - run: cat /tmp/git_status_output - - - name: Push changes - if: steps.read_git_status.outputs.result != 'No changes to commit' - uses: ad-m/github-push-action@v0.6.0 - with: - github_token: ${{ secrets.GITHUB_TOKEN }} diff --git a/pelicun/file_io.py b/pelicun/file_io.py index 403e70298..ccc6ba4ec 100644 --- a/pelicun/file_io.py +++ b/pelicun/file_io.py @@ -509,6 +509,9 @@ def load_from_file(filepath: str, log: base.Logger | None = None) -> pd.DataFram encoding_errors='replace', ) + + + if log: log.msg('File successfully opened.', prepend_timestamp=False)