requirements/setup/github: drop requirements/setup.{py,cfg}, switch t…

…o pyproject.toml Signed-off-by: Bastian Krause <[email protected]>
Emantor · Nov 3, 2022 · cb1039f · cb1039f
1 parent 45e4a7d
commit cb1039f
Show file tree

Hide file tree

Showing 25 changed files with 12 additions and 173 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -12,7 +12,7 @@ jobs:
  - name: Install system dependencies
  run: |
  sudo apt install -yq python3-pip
- python3 -m pip install --upgrade pip setuptools wheel
+ python3 -m pip install setuptools_scm
  - name: Login to DockerHub
  uses: docker/login-action@v2
  with:

diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -20,7 +20,7 @@ jobs:
  - uses: actions/cache@v3
  with:
  path: ~/.cache/pip
- key: ${{ runner.os }}-pip-${{ hashFiles('*requirements.txt') }}
+ key: ${{ runner.os }}-pip-${{ hashFiles('pyproject.toml') }}
  restore-keys: |
  ${{ runner.os }}-pip-
  - name: Install system dependencies
@@ -37,12 +37,10 @@ jobs:
  ssh -o StrictHostKeyChecking=no localhost echo OK
  - name: Install python dependencies
  run: |
- python -m pip install --upgrade pip setuptools wheel
- python -m pip install flake8 pytest
- pip install -r ci-requirements.txt
+ python -m pip install --upgrade pip codecov coveralls
  - name: Install labgrid
  run: |
- pip install -e .
+ pip install -e ".[dev]"
  - name: Lint with pylint
  run: |
  pylint --list-msgs-enabled
@@ -66,7 +64,7 @@ jobs:
  - name: Install system dependencies
  run: |
  sudo apt install -yq python3-pip
- python3 -m pip install --upgrade pip setuptools wheel
+ python3 -m pip install setuptools_scm
  - name: Build docker images
  run: |
  ./dockerfiles/build.sh

diff --git a/ci-requirements.txt b/ci-requirements.txt
diff --git a/crossbar-requirements.txt b/crossbar-requirements.txt
diff --git a/deb-requirements.txt b/deb-requirements.txt
diff --git a/debian/rules b/debian/rules
@@ -11,6 +11,6 @@ override_dh_virtualenv:
  --python /usr/bin/python3 \
  --builtin-venv \
  --preinstall 'setuptools>=38.0.0' \
- --requirements deb-requirements.txt \
+ --extras deb \
  --extra-pip-arg='--no-binary' \
  --extra-pip-arg='cffi,numpy'
diff --git a/dev-requirements.txt b/dev-requirements.txt
diff --git a/doc-requirements.txt b/doc-requirements.txt
diff --git a/doc/RELEASE.rst b/doc/RELEASE.rst
@@ -18,7 +18,7 @@ Check your commit mail and name:
 1. Freeze Dependencies
 ======================
 
-Freeze the dependencies into the `requirements.txt` file and update the separate
+Freeze the dependencies into the `pyproject.toml` file and update the separate
 feature requirements files.
 This ensures that known good dependencies are available for every release.
 

diff --git a/docker-requirements.txt b/docker-requirements.txt
diff --git a/dockerfiles/Dockerfile b/dockerfiles/Dockerfile
@@ -8,7 +8,7 @@ COPY ./ /opt/labgrid/
 
 RUN set -e ;\
  apt update -q=2 ;\
- apt install -q=2 --yes --no-install-recommends python3 python3-dev python3-pip python3-setuptools python3-wheel git build-essential libsnappy-dev ;\
+ apt install -q=2 --yes --no-install-recommends python3 python3-dev python3-pip python3-setuptools git build-essential libsnappy-dev ;\
  pip3 install -U pip;\
  apt clean ;\
  rm -rf /var/lib/apt/lists/* ;\
@@ -23,8 +23,7 @@ ARG VERSION
 RUN set -e ;\
  cd /opt/labgrid ;\
  pip3 install yq ;\
- pip3 install --no-cache-dir -r requirements.txt ;\
- SETUPTOOLS_SCM_PRETEND_VERSION="$VERSION" python3 setup.py install ;\
+ SETUPTOOLS_SCM_PRETEND_VERSION="$VERSION" pip3 install --no-cache-dir . ;\
  apt update -q=2 ;\
  apt install -q=2 --yes --no-install-recommends microcom openssh-client rsync jq qemu-system qemu-utils ;\
  apt clean ;\
@@ -42,8 +41,7 @@ ENV CROSSBAR_DIR=/opt/crossbar
 
 RUN set -e ;\
  cd /opt/labgrid ;\
- pip3 install --no-cache-dir -r crossbar-requirements.txt ;\
- SETUPTOOLS_SCM_PRETEND_VERSION="$VERSION" python3 setup.py install
+ SETUPTOOLS_SCM_PRETEND_VERSION="$VERSION" pip3 install --no-cache-dir ".[crossbar]"
 
 VOLUME /opt/crossbar
 
@@ -109,8 +107,7 @@ COPY dockerfiles/exporter/entrypoint.sh /entrypoint.sh
 
 RUN set -e ;\
  cd /opt/labgrid ;\
- pip3 install --no-cache-dir -r requirements.txt ;\
- SETUPTOOLS_SCM_PRETEND_VERSION="$VERSION" python3 setup.py install ;\
+ SETUPTOOLS_SCM_PRETEND_VERSION="$VERSION" pip3 install --no-cache-dir . ;\
  apt update -q=2 ;\
  apt install -q=2 --yes --no-install-recommends \
  libyaml-0-2 \

diff --git a/dockerfiles/build.sh b/dockerfiles/build.sh
@@ -9,7 +9,7 @@ if [ -z ${DOCKER} ]; then
 fi
 export DOCKER_BUILDKIT=1
 
-VERSION="$(./setup.py --version | tail -1)"
+VERSION="$(python -m setuptools_scm)"
 
 for t in client exporter coordinator; do
  ${DOCKER} build --build-arg VERSION="$VERSION" \

diff --git a/graph-requirements.txt b/graph-requirements.txt
diff --git a/kasa-requirements.txt b/kasa-requirements.txt
diff --git a/modbus-requirements.txt b/modbus-requirements.txt
diff --git a/modbusrtu-requirements.txt b/modbusrtu-requirements.txt
diff --git a/mqtt-requirements.txt b/mqtt-requirements.txt
diff --git a/onewire-requirements.txt b/onewire-requirements.txt
diff --git a/pyvisa-requirements.txt b/pyvisa-requirements.txt
diff --git a/requirements.txt b/requirements.txt
diff --git a/setup.cfg b/setup.cfg
diff --git a/setup.py b/setup.py
diff --git a/snmp-requirements.txt b/snmp-requirements.txt
diff --git a/vxi11-requirements.txt b/vxi11-requirements.txt
diff --git a/xena-requirements.txt b/xena-requirements.txt