From 2b69753e3afe8c9866f6f1e23d64e07ee62ac6a1 Mon Sep 17 00:00:00 2001 From: Robert Winkler Date: Thu, 18 Jan 2024 15:23:22 +0100 Subject: [PATCH] Consolidate requirements.txt Signed-off-by: Robert Winkler --- .ci.yml | 4 ++-- .github/workflows/pipeline.yml | 2 +- docs/source/developers_guide/setup.md | 2 +- noxfile.py | 2 +- requirements.dev.txt | 6 ------ requirements.impl.txt | 2 -- requirements.txt | 11 ++++++++--- 7 files changed, 13 insertions(+), 16 deletions(-) delete mode 100644 requirements.dev.txt delete mode 100644 requirements.impl.txt diff --git a/.ci.yml b/.ci.yml index 19df72a3..111a9371 100644 --- a/.ci.yml +++ b/.ci.yml @@ -12,7 +12,7 @@ lint: - apt-get install -y --no-install-recommends python3-pip - python3 -m pip install -U pip wheel setuptools script: - - python3 -m pip install -r requirements.dev.txt + - python3 -m pip install -r requirements.txt - nox -s isort_check black_check flake8 pytest: @@ -22,7 +22,7 @@ pytest: before_script: *BeforeScript script: - apt-get install -y --no-install-recommends git python3-dev - - python3 -m pip install -r requirements.dev.txt + - python3 -m pip install nox - python3 -m pip install git+https://github.com/antmicro/tuttest - tuttest README.md | bash - - nox -s tests_with_report diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml index afff4a21..0c726eec 100644 --- a/.github/workflows/pipeline.yml +++ b/.github/workflows/pipeline.yml @@ -34,7 +34,7 @@ jobs: python3-dev \ yosys python3 -m pip install --upgrade pip wheel setuptools - python3 -m pip install -r requirements.dev.txt + python3 -m pip install nox python3 -m pip install git+https://github.com/antmicro/tuttest - name: Run lint checks diff --git a/docs/source/developers_guide/setup.md b/docs/source/developers_guide/setup.md index 40a36629..b481413d 100644 --- a/docs/source/developers_guide/setup.md +++ b/docs/source/developers_guide/setup.md @@ -1,7 +1,7 @@ # Setup It is recommended for developers to keep code style and frequently run tests. -In order to setup the developer's environment install python packages from `requirements.dev.txt`, which shall include `nox` and `pre-commit`: +In order to setup the developer's environment install python packages from `requirements.txt`, which shall include `nox` and `pre-commit`: ```bash python -m venv venv diff --git a/noxfile.py b/noxfile.py index e7fd45c8..efc3429c 100644 --- a/noxfile.py +++ b/noxfile.py @@ -6,7 +6,7 @@ @nox.session() def pre_commit(session: nox.Session) -> None: - session.install("-r", "requirements.dev.txt") + session.install("-r", "requirements.txt") session.run("pre-commit", "install") session.run("pre-commit", "run", "--all-files") diff --git a/requirements.dev.txt b/requirements.dev.txt deleted file mode 100644 index 66f264ba..00000000 --- a/requirements.dev.txt +++ /dev/null @@ -1,6 +0,0 @@ -flake8 -nox -pre-commit -pytest -pytest-cov -pytest-lazy-fixtures diff --git a/requirements.impl.txt b/requirements.impl.txt deleted file mode 100644 index f4cb0921..00000000 --- a/requirements.impl.txt +++ /dev/null @@ -1,2 +0,0 @@ -edalize==0.4.0 -fusesoc==1.12.0 diff --git a/requirements.txt b/requirements.txt index 7df50d6a..1d9ede66 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,8 @@ --e . --r requirements.dev.txt --r requirements.impl.txt +flake8 +nox +pre-commit +pytest +pytest-cov +pytest-lazy-fixtures +edalize==0.4.0 +fusesoc==1.12.0