Skip to content

Commit

Permalink
253 switch pylama black and isort to ruff (#269)
Browse files Browse the repository at this point in the history
* Swapped Pylama, isort, and black for ruff

* Updated workflow and readme

* Suppress ruff on new_scale_move script
  • Loading branch information
kjy5 authored Dec 11, 2023
1 parent 82d72ef commit 6183ef4
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 13 deletions.
7 changes: 2 additions & 5 deletions .github/workflows/autoformat-and-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,8 @@ jobs:
- name: 📦 Install dependencies
run: pip install .[dev]

- name: 🔃 Sort Imports
run: isort .

- name: 📝 Format Code
run: black .
run: ruff format .

- name: ✅ Commit code format changes
if: github.event.pull_request.user.login != 'dependabot[bot]'
Expand All @@ -47,4 +44,4 @@ jobs:
commit_message: "Autoformat code"

- name: 🔍 Lint
run: pylama
run: ruff check .
3 changes: 1 addition & 2 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/ruff.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
[![PyPI version](https://badge.fury.io/py/ephys-link.svg)](https://badge.fury.io/py/ephys-link)
[![CodeQL](https://github.com/VirtualBrainLab/ephys-link/actions/workflows/codeql-analysis.yml/badge.svg)](https://github.com/VirtualBrainLab/ephys-link/actions/workflows/codeql-analysis.yml)
[![Dependency Review](https://github.com/VirtualBrainLab/ephys-link/actions/workflows/dependency-review.yml/badge.svg)](https://github.com/VirtualBrainLab/ephys-link/actions/workflows/dependency-review.yml)
[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
[![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)

<img width="100%" src="https://github.com/VirtualBrainLab/ephys-link/assets/82800265/c89e433c-2ce0-4f27-aa9d-66f89c59c979" alt="Manipulator and probe in pinpoint moving in sync">

Expand Down
4 changes: 1 addition & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,8 @@ dependencies = [

[project.optional-dependencies]
dev = [
"black",
"build",
"isort",
"pylama[all]",
"ruff",
"twine",
"setuptools",
]
Expand Down
2 changes: 1 addition & 1 deletion scripts/new_scale_move.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# pylama:ignore=E402
# ruff: noqa: E402
from pythonnet import load

load("netfx")
Expand Down
2 changes: 1 addition & 1 deletion src/ephys_link/gui.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import socket
from argparse import Namespace
from threading import Event, Thread
from tkinter import *
from tkinter import IntVar, StringVar, Tk, E, CENTER, RIGHT
from tkinter import ttk

# GUI Variables
Expand Down

0 comments on commit 6183ef4

Please sign in to comment.