Skip to content

Commit

Permalink
Remove old linter
Browse files Browse the repository at this point in the history
  • Loading branch information
dimaqq committed Nov 13, 2024
1 parent 5492c30 commit 95ec6c5
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 90 deletions.
25 changes: 1 addition & 24 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,28 +7,6 @@ concurrency:
cancel-in-progress: true

jobs:
lint:
name: Linter
runs-on: ubuntu-latest
strategy:
matrix:
python:
- "3.9"
- "3.10"
steps:
- name: Check out code
uses: actions/checkout@v4
- name: Setup Python
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python }}
- name: Install dependencies
run: pip install tox
- name: Run linter
run: |
tox -e lint
./scripts/copyright.sh
build-test:
name: Build test
runs-on: ubuntu-latest
Expand Down Expand Up @@ -67,7 +45,6 @@ jobs:
run: tox -e validate

unit-tests:
needs: lint
name: Unit tests
runs-on: ubuntu-latest
strategy:
Expand Down Expand Up @@ -161,7 +138,7 @@ jobs:

integration-quarantine:
name: Quarantined Integration Tests
needs: [lint, unit-tests]
needs: [unit-tests]
timeout-minutes: 150
runs-on: ubuntu-latest
strategy:
Expand Down
12 changes: 3 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,27 +16,21 @@ clean:

.PHONY: client
client:
tox -r --notest -e lint,py3
tox -r --notest -e py3
$(PY) -m juju.client.facade -s "juju/client/schemas*" -o juju/client/
pre-commit run --files $(shell echo juju/client/_[cd]*.py)

.PHONY: run-unit-tests
run-unit-tests: .tox lint
run-unit-tests: .tox
tox -e py3

.PHONY: run-integration-tests
run-integration-tests: .tox lint
run-integration-tests: .tox
tox -e integration

.PHONY: run-all-tests
test: run-unit-tests run-integration-tests

.PHONY: lint
lint:
@./scripts/copyright.sh
@echo "==> Running flake8 linter"
tox -e lint

.PHONY: docs
docs:
tox -e docs
Expand Down
50 changes: 0 additions & 50 deletions scripts/copyright.sh

This file was deleted.

8 changes: 1 addition & 7 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# and then run "tox" from this directory.

[tox]
envlist = lint,py3,py38,py39,py310,py311,docs
envlist = py3,py38,py39,py310,py311,docs
skipsdist=True

[pytest]
Expand Down Expand Up @@ -53,12 +53,6 @@ commands =
rm -rf docs/_build/
sphinx-build -b html docs/ docs/_build/

[testenv:lint]
commands =
flake8 {posargs} juju tests examples
deps =
flake8

[testenv:integration]
envdir = {toxworkdir}/py3
commands =
Expand Down

0 comments on commit 95ec6c5

Please sign in to comment.