diff --git a/.github/workflows/black.yml b/.github/workflows/black.yml deleted file mode 100644 index b55f801..0000000 --- a/.github/workflows/black.yml +++ /dev/null @@ -1,46 +0,0 @@ ---- -name: Lint Code Base - -defaults: - run: - # To load bashrc - shell: bash -ieo pipefail {0} - -on: - pull_request: - branches: [master, dev] - schedule: - # run CI every day even if no PRs/merges occur - - cron: '0 12 * * *' - -jobs: - build: - name: Lint Code Base - runs-on: ubuntu-latest - - steps: - - name: Checkout Code - uses: actions/checkout@v4 - - - name: Set up Python 3.8 - uses: actions/setup-python@v5 - with: - python-version: 3.8 - - - name: Install dependencies - run: | - mkdir -p .github/linters - cp pyproject.toml .github/linters - - - name: Black - uses: github/super-linter/slim@v4.9.2 - if: always() - env: - # run linter on everything to catch preexisting problems - VALIDATE_ALL_CODEBASE: true - DEFAULT_BRANCH: master - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # Run only black - VALIDATE_PYTHON_BLACK: true - PYTHON_BLACK_CONFIG_FILE: pyproject.toml - FILTER_REGEX_EXCLUDE: .*tests/.*.(json|zip|sol) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml new file mode 100644 index 0000000..80fb5bc --- /dev/null +++ b/.github/workflows/lint.yml @@ -0,0 +1,92 @@ +--- +name: Lint Code Base + +defaults: + run: + # To load bashrc + shell: bash -ieo pipefail {0} + +on: + pull_request: + branches: [master, dev] + schedule: + # run CI every day even if no PRs/merges occur + - cron: '0 12 * * *' + +permissions: + contents: read + packages: read + # To report GitHub Actions status checks + statuses: write + +jobs: + pylint: + name: Lint Code Base (pylint) + runs-on: ubuntu-latest + + steps: + - name: Checkout Code + uses: actions/checkout@v4 + with: + # super-linter needs the full git history to get the + # list of files that changed across commits + fetch-depth: 0 + + - name: Set up Python 3.8 + uses: actions/setup-python@v5 + with: + python-version: 3.8 + + - name: Install dependencies + run: | + mkdir -p .github/linters + cp pyproject.toml .github/linters + + - name: Pylint + uses: super-linter/super-linter/slim@v7.2.1 + if: always() + env: + # run linter on everything to catch preexisting problems + VALIDATE_ALL_CODEBASE: true + DEFAULT_BRANCH: master + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # Run only pylint + VALIDATE_PYTHON: true + VALIDATE_PYTHON_PYLINT: true + PYTHON_PYLINT_CONFIG_FILE: pyproject.toml + FILTER_REGEX_EXCLUDE: .*tests/.*.(json|zip|sol) + + black: + name: Lint Code Base (black) + runs-on: ubuntu-latest + + steps: + - name: Checkout Code + uses: actions/checkout@v4 + with: + # super-linter needs the full git history to get the + # list of files that changed across commits + fetch-depth: 0 + + - name: Set up Python 3.8 + uses: actions/setup-python@v5 + with: + python-version: 3.8 + + - name: Install dependencies + run: | + mkdir -p .github/linters + cp pyproject.toml .github/linters + + - name: Black + uses: super-linter/super-linter/slim@v7.2.1 + if: always() + env: + # run linter on everything to catch preexisting problems + VALIDATE_ALL_CODEBASE: true + DEFAULT_BRANCH: master + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # Run only black + VALIDATE_PYTHON_BLACK: true + PYTHON_BLACK_CONFIG_FILE: pyproject.toml + FILTER_REGEX_EXCLUDE: .*tests/.*.(json|zip|sol) diff --git a/.github/workflows/pylint.yml b/.github/workflows/pylint.yml deleted file mode 100644 index 8485d49..0000000 --- a/.github/workflows/pylint.yml +++ /dev/null @@ -1,47 +0,0 @@ ---- -name: Lint Code Base - -defaults: - run: - # To load bashrc - shell: bash -ieo pipefail {0} - -on: - pull_request: - branches: [master, dev] - schedule: - # run CI every day even if no PRs/merges occur - - cron: '0 12 * * *' - -jobs: - build: - name: Lint Code Base - runs-on: ubuntu-latest - - steps: - - name: Checkout Code - uses: actions/checkout@v4 - - - name: Set up Python 3.8 - uses: actions/setup-python@v5 - with: - python-version: 3.8 - - - name: Install dependencies - run: | - mkdir -p .github/linters - cp pyproject.toml .github/linters - - - name: Pylint - uses: github/super-linter/slim@v4.9.2 - if: always() - env: - # run linter on everything to catch preexisting problems - VALIDATE_ALL_CODEBASE: true - DEFAULT_BRANCH: master - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # Run only pylint - VALIDATE_PYTHON: true - VALIDATE_PYTHON_PYLINT: true - PYTHON_PYLINT_CONFIG_FILE: pyproject.toml - FILTER_REGEX_EXCLUDE: .*tests/.*.(json|zip|sol) diff --git a/pyproject.toml b/pyproject.toml index a5222fe..e430d08 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [tool.black] -target-version = ["py36"] +target-version = ["py38"] line-length = 100 [tool.pylint.messages_control] disable = """ @@ -7,7 +7,6 @@ missing-module-docstring, missing-class-docstring, missing-function-docstring, unnecessary-lambda, -bad-continuation, cyclic-import, line-too-long, invalid-name, diff --git a/solc_select/__main__.py b/solc_select/__main__.py index 6193015..9025920 100644 --- a/solc_select/__main__.py +++ b/solc_select/__main__.py @@ -66,6 +66,7 @@ def solc_select() -> None: elif args.get(SHOW_VERSIONS) is not None: versions_installed = installed_versions() if versions_installed: + (current_ver, source) = (None, None) res = current_version() if res: (current_ver, source) = res