From f7471c505b807b814d14b04e72ea0d48a6895ad7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Ram=C3=ADrez?= Date: Wed, 10 Apr 2024 05:14:04 -0500 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A7=20Tweak=20development=20scripts=20?= =?UTF-8?q?and=20configs=20after=20migration=20to=20PDM,=20Ruff,=20etc.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pyproject.toml | 9 --------- requirements-tests.txt | 2 +- requirements.txt | 2 +- scripts/format-imports.sh | 6 ------ scripts/format.sh | 2 +- scripts/lint.sh | 2 +- scripts/publish.sh | 5 ----- scripts/zip-docs.sh | 11 ----------- 8 files changed, 4 insertions(+), 35 deletions(-) delete mode 100755 scripts/format-imports.sh delete mode 100755 scripts/publish.sh delete mode 100644 scripts/zip-docs.sh diff --git a/pyproject.toml b/pyproject.toml index b648d38ad4..c9e793e1ed 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -102,15 +102,6 @@ excludes = ["typer", "tests", "pdm_build.py"] # doesn't override it during the build. source-includes = [""] -[tool.isort] -profile = "black" -known_third_party = ["typer", "click"] -skip_glob = [ - "docs_src/subcommands/tutorial001/main.py", - "docs_src/subcommands/tutorial003/lands.py", - "docs_src/subcommands/tutorial003/main.py", - ] - [tool.pytest.ini_options] addopts = [ "--strict-config", diff --git a/requirements-tests.txt b/requirements-tests.txt index f89c88eebe..45f1904d16 100644 --- a/requirements-tests.txt +++ b/requirements-tests.txt @@ -1,4 +1,4 @@ --e .[all] +-e . pytest >=4.4.0,<8.0.0 pytest-cov >=2.10.0,<5.0.0 diff --git a/requirements.txt b/requirements.txt index d84d26a8da..1e21c5d2f3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ --e .[all] +-e . -r requirements-tests.txt -r requirements-docs.txt diff --git a/scripts/format-imports.sh b/scripts/format-imports.sh deleted file mode 100755 index fa036a9291..0000000000 --- a/scripts/format-imports.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -e -set -x - -# Sort imports one per line, so autoflake can remove unused imports -isort --force-single-line-imports typer tests docs_src -sh ./scripts/format.sh diff --git a/scripts/format.sh b/scripts/format.sh index 63b434e0b4..6131b020d0 100755 --- a/scripts/format.sh +++ b/scripts/format.sh @@ -2,5 +2,5 @@ set -x set -e -ruff typer tests docs_src scripts --fix +ruff check typer tests docs_src scripts --fix ruff format typer tests docs_src scripts diff --git a/scripts/lint.sh b/scripts/lint.sh index a32cf3afca..75761f1b6a 100755 --- a/scripts/lint.sh +++ b/scripts/lint.sh @@ -4,5 +4,5 @@ set -e set -x mypy typer -ruff typer tests docs_src +ruff check typer tests docs_src ruff format typer tests docs_src --check diff --git a/scripts/publish.sh b/scripts/publish.sh deleted file mode 100755 index 122728a604..0000000000 --- a/scripts/publish.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash - -set -e - -flit publish diff --git a/scripts/zip-docs.sh b/scripts/zip-docs.sh deleted file mode 100644 index 69315f5ddd..0000000000 --- a/scripts/zip-docs.sh +++ /dev/null @@ -1,11 +0,0 @@ -#! /usr/bin/env bash - -set -x -set -e - -cd ./site - -if [ -f docs.zip ]; then - rm -rf docs.zip -fi -zip -r docs.zip ./