From e9625719c75f454b6e08ec021bec1a00c453297e Mon Sep 17 00:00:00 2001 From: Zach Kurtz Date: Thu, 14 Nov 2024 14:48:17 -0500 Subject: [PATCH] ruff not black --- .github/workflows/ci.yml | 9 ++--- .pre-commit-config.yaml | 26 ++++++------- README.md | 39 +++++++++---------- poetry.lock | 84 +--------------------------------------- pyproject.toml | 6 +-- 5 files changed, 37 insertions(+), 127 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index eb1ba02..fcf09ec 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,14 +26,11 @@ jobs: poetry config virtualenvs.create false poetry install --no-interaction --no-ansi - - name: Run unit tests with pytest - run: pytest - - - name: Check code formatting with Black - run: black --check . - - name: Check code quality with Ruff run: ruff check . - name: Check type hints with pyright run: pyright + + - name: Run unit tests with pytest + run: pytest diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 7a3c3fd..1c85b06 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -6,22 +6,22 @@ repos: - id: end-of-file-fixer - id: check-yaml - id: check-added-large-files - -- repo: https://github.com/charliermarsh/ruff-pre-commit - rev: v0.6.3 - hooks: - - id: ruff - args: [ "--fix" ] - -- repo: https://github.com/psf/black - rev: 24.8.0 - hooks: - - id: black - - repo: local hooks: - id: pyright - name: pyright + name: type checking (pyright) entry: pyright language: system types: [python] + - id: ruff-format + name: formatting (ruff) + entry: ruff + language: system + types: [python] + args: ['format'] + - id: ruff-lint + name: linting (ruff) + entry: ruff + language: system + types: [python] + args: ['check', '--fix', '--force-exclude'] diff --git a/README.md b/README.md index 8a8ba52..320a33f 100644 --- a/README.md +++ b/README.md @@ -49,25 +49,24 @@ We're [on pypi](https://pypi.org/project/dummio/) so you can just `pip install d ## Development -Install poetry: +1. Install poetry: `curl -sSL https://install.python-poetry.org | python3 -` +1. Install [pyenv and its virtualenv plugin](https://github.com/pyenv/pyenv-virtualenv). +1. Create a dev ops virtual environment: ``` -curl -sSL https://install.python-poetry.org | python3 - -``` - -Install [pyenv and its virtualenv plugin](https://github.com/pyenv/pyenv-virtualenv). Then: -``` -pyenv install 3.12.2 -pyenv global 3.12.2 -pyenv virtualenv 3.12.2 dummio -pyenv activate dummio -``` - -Install this package and its dependencies in your virtual env: -``` -poetry install --with extras --with dev -``` - -Set up git hooks: -``` -pre-commit install +PYTHON_VERSION=3.12.2 +function makenv { + # clean up any existing env + source deactivate + pyenv uninstall --force $1 + + # build new venv + pyenv install $PYTHON_VERSION --skip-existing + pyenv global $PYTHON_VERSION + pyenv virtualenv $PYTHON_VERSION $1 + pyenv activate $1 + poetry install --with extras --with dev + pre-commit install + poetry lock --no-update +} +makenv dummio ``` diff --git a/poetry.lock b/poetry.lock index f1c4db1..571b151 100644 --- a/poetry.lock +++ b/poetry.lock @@ -15,52 +15,6 @@ files = [ docs = ["furo", "jaraco.packaging (>=9.3)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-lint"] testing = ["jaraco.test", "pytest (!=8.0.*)", "pytest (>=6,!=8.1.*)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)"] -[[package]] -name = "black" -version = "24.10.0" -description = "The uncompromising code formatter." -optional = false -python-versions = ">=3.9" -files = [ - {file = "black-24.10.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:e6668650ea4b685440857138e5fe40cde4d652633b1bdffc62933d0db4ed9812"}, - {file = "black-24.10.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:1c536fcf674217e87b8cc3657b81809d3c085d7bf3ef262ead700da345bfa6ea"}, - {file = "black-24.10.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:649fff99a20bd06c6f727d2a27f401331dc0cc861fb69cde910fe95b01b5928f"}, - {file = "black-24.10.0-cp310-cp310-win_amd64.whl", hash = "sha256:fe4d6476887de70546212c99ac9bd803d90b42fc4767f058a0baa895013fbb3e"}, - {file = "black-24.10.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:5a2221696a8224e335c28816a9d331a6c2ae15a2ee34ec857dcf3e45dbfa99ad"}, - {file = "black-24.10.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:f9da3333530dbcecc1be13e69c250ed8dfa67f43c4005fb537bb426e19200d50"}, - {file = "black-24.10.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:4007b1393d902b48b36958a216c20c4482f601569d19ed1df294a496eb366392"}, - {file = "black-24.10.0-cp311-cp311-win_amd64.whl", hash = "sha256:394d4ddc64782e51153eadcaaca95144ac4c35e27ef9b0a42e121ae7e57a9175"}, - {file = "black-24.10.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:b5e39e0fae001df40f95bd8cc36b9165c5e2ea88900167bddf258bacef9bbdc3"}, - {file = "black-24.10.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:d37d422772111794b26757c5b55a3eade028aa3fde43121ab7b673d050949d65"}, - {file = "black-24.10.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:14b3502784f09ce2443830e3133dacf2c0110d45191ed470ecb04d0f5f6fcb0f"}, - {file = "black-24.10.0-cp312-cp312-win_amd64.whl", hash = "sha256:30d2c30dc5139211dda799758559d1b049f7f14c580c409d6ad925b74a4208a8"}, - {file = "black-24.10.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:1cbacacb19e922a1d75ef2b6ccaefcd6e93a2c05ede32f06a21386a04cedb981"}, - {file = "black-24.10.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:1f93102e0c5bb3907451063e08b9876dbeac810e7da5a8bfb7aeb5a9ef89066b"}, - {file = "black-24.10.0-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:ddacb691cdcdf77b96f549cf9591701d8db36b2f19519373d60d31746068dbf2"}, - {file = "black-24.10.0-cp313-cp313-win_amd64.whl", hash = "sha256:680359d932801c76d2e9c9068d05c6b107f2584b2a5b88831c83962eb9984c1b"}, - {file = "black-24.10.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:17374989640fbca88b6a448129cd1745c5eb8d9547b464f281b251dd00155ccd"}, - {file = "black-24.10.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:63f626344343083322233f175aaf372d326de8436f5928c042639a4afbbf1d3f"}, - {file = "black-24.10.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:ccfa1d0cb6200857f1923b602f978386a3a2758a65b52e0950299ea014be6800"}, - {file = "black-24.10.0-cp39-cp39-win_amd64.whl", hash = "sha256:2cd9c95431d94adc56600710f8813ee27eea544dd118d45896bb734e9d7a0dc7"}, - {file = "black-24.10.0-py3-none-any.whl", hash = "sha256:3bb2b7a1f7b685f85b11fed1ef10f8a9148bceb49853e47a294a3dd963c1dd7d"}, - {file = "black-24.10.0.tar.gz", hash = "sha256:846ea64c97afe3bc677b761787993be4991810ecc7a4a937816dd6bddedc4875"}, -] - -[package.dependencies] -click = ">=8.0.0" -mypy-extensions = ">=0.4.3" -packaging = ">=22.0" -pathspec = ">=0.9.0" -platformdirs = ">=2" -tomli = {version = ">=1.1.0", markers = "python_version < \"3.11\""} -typing-extensions = {version = ">=4.0.1", markers = "python_version < \"3.11\""} - -[package.extras] -colorama = ["colorama (>=0.4.3)"] -d = ["aiohttp (>=3.10)"] -jupyter = ["ipython (>=7.8.0)", "tokenize-rt (>=3.2.0)"] -uvloop = ["uvloop (>=0.15.2)"] - [[package]] name = "build" version = "1.2.2.post1" @@ -301,20 +255,6 @@ files = [ {file = "charset_normalizer-3.4.0.tar.gz", hash = "sha256:223217c3d4f82c3ac5e29032b3f1c2eb0fb591b72161f86d93f5719079dae93e"}, ] -[[package]] -name = "click" -version = "8.1.7" -description = "Composable command line interface toolkit" -optional = false -python-versions = ">=3.7" -files = [ - {file = "click-8.1.7-py3-none-any.whl", hash = "sha256:ae74fb96c20a0277a1d615f1e4d73c8414f5a98db8b799a7931d1582f3390c28"}, - {file = "click-8.1.7.tar.gz", hash = "sha256:ca9853ad459e787e2192211578cc907e7594e294c7ccc834310722b41b9ca6de"}, -] - -[package.dependencies] -colorama = {version = "*", markers = "platform_system == \"Windows\""} - [[package]] name = "colorama" version = "0.4.6" @@ -637,17 +577,6 @@ files = [ {file = "more_itertools-10.5.0-py3-none-any.whl", hash = "sha256:037b0d3203ce90cca8ab1defbbdac29d5f993fc20131f3664dc8d6acfa872aef"}, ] -[[package]] -name = "mypy-extensions" -version = "1.0.0" -description = "Type system extensions for programs checked with the mypy type checker." -optional = false -python-versions = ">=3.5" -files = [ - {file = "mypy_extensions-1.0.0-py3-none-any.whl", hash = "sha256:4392f6c0eb8a5668a69e23d168ffa70f0be9ccfd32b5cc2d26a34ae5b844552d"}, - {file = "mypy_extensions-1.0.0.tar.gz", hash = "sha256:75dbf8955dc00442a438fc4d0666508a9a97b6bd41aa2f0ffe9d2f2725af0782"}, -] - [[package]] name = "nh3" version = "0.2.18" @@ -695,17 +624,6 @@ files = [ {file = "packaging-24.1.tar.gz", hash = "sha256:026ed72c8ed3fcce5bf8950572258698927fd1dbda10a5e981cdf0ac37f4f002"}, ] -[[package]] -name = "pathspec" -version = "0.12.1" -description = "Utility library for gitignore style pattern matching of file paths." -optional = false -python-versions = ">=3.8" -files = [ - {file = "pathspec-0.12.1-py3-none-any.whl", hash = "sha256:a0d503e138a4c123b27490a4f7beda6a01c6f288df0e4a8b79c7eb0dc7b4cc08"}, - {file = "pathspec-0.12.1.tar.gz", hash = "sha256:a482d51503a1ab33b1c67a6c3813a26953dbdc71c31dacaef9a838c4e29f5712"}, -] - [[package]] name = "pkginfo" version = "1.10.0" @@ -1152,4 +1070,4 @@ type = ["pytest-mypy"] [metadata] lock-version = "2.0" python-versions = "^3.10" -content-hash = "ef90f1fc9df030f2f22ae56aa7c1e81958d76a484d0c5547056b4eedbdb9ec98" +content-hash = "54033907fa8143d07988751470e7bb6cad1619d7e7acd561684ba40cbe6e2d7e" diff --git a/pyproject.toml b/pyproject.toml index 6a3b02d..8991974 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "dummio" -version = "0.0.2" +version = "0.0.3" description = "Easiest-possible IO for basic file types." authors = ["Zach Kurtz "] readme = "README.md" @@ -21,7 +21,6 @@ ruff = "^0.6.3" pyright = "^1.1.378" pytest = "^8.3.2" pre-commit = "^3.8.0" -black = "^24.8.0" build = "^1.2.1" twine = "^5.1.1" @@ -40,6 +39,3 @@ include = ["dummio"] [tool.pytest.ini_options] testpaths = ["tests"] - -[tool.black] -line-length = 120