diff --git a/.github/workflows/subscript.yml b/.github/workflows/subscript.yml index d8297a6f8..a7323440e 100644 --- a/.github/workflows/subscript.yml +++ b/.github/workflows/subscript.yml @@ -66,7 +66,7 @@ jobs: - name: Lint with black if: ${{ always() }} - run: black --check *.py src tests + run: black --check src tests - name: Lint with flake8 if: ${{ always() }} @@ -78,11 +78,7 @@ jobs: - name: Run tests if: ${{ always() }} - run: | - pytest -n auto tests - # Check that repository is untainted by test code: - git status --porcelain - test -z "$(git status --porcelain)" + run: pytest -n auto tests - name: Syntax check documentation if: ${{ always() }} diff --git a/pyproject.toml b/pyproject.toml index bb7e60a8a..eef52a957 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -125,6 +125,16 @@ CsvStack = "subscript.csv_stack.csv_stack" FmuObs = "subscript.fmuobs.fmuobs" Params2Csv = "subscript.params2csv.params2csv" +[tool.setuptools] +script-files = [ + "src/subscript/legacy/duf", + "src/subscript/legacy/eclmanual", + "src/subscript/legacy/ertwatch", + "src/subscript/legacy/list_rms_usage", + "src/subscript/legacy/nosim", + "src/subscript/legacy/runeclipse", +] + [tool.black] line-length = 88 diff --git a/setup.py b/setup.py deleted file mode 100755 index 67bac20b3..000000000 --- a/setup.py +++ /dev/null @@ -1,15 +0,0 @@ -#!/usr/bin/env python3 - -from setuptools import setup - -LEGACY_SCRIPTS = [ - "duf", - "eclmanual", - "ertwatch", - "list_rms_usage", - "nosim", - "runeclipse", -] -# pyproject.toml deprecates this scripts functionality entirely for -# entry_points (which is simply called "scripts" within it) -setup(scripts=[f"src/subscript/legacy/{script}" for script in LEGACY_SCRIPTS])