Drop references to system_setup from the subiquity tree

Signed-off-by: Olivier Gayot <[email protected]>

.github/workflows/ci.yaml

@@ -43,17 +43,15 @@ jobs:
       - uses: psf/black@stable
         with:
           version: "~= 23.0"
-          src: "console_conf subiquity subiquitycore system_setup"
-
+          src: "console_conf subiquity subiquitycore"
   format-isort:
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v4
       - uses: isort/isort-action@v1
         with:
           isort-version: "5.12.0"
-          sort-paths: "console_conf subiquity subiquitycore system_setup"
-
+          sort-paths: "console_conf subiquity subiquitycore"
   static-typing:
     # In this job, we compare the output of mypy before and after the PR.
     if: github.event_name == 'pull_request'
@@ -74,7 +72,7 @@ jobs:
           # If it does not work, we can set fetch-depth: 0
           fetch-depth: $(( ${{ github.event.pull_request.commits }} + 1 ))
       - name: Run mypy on pull request branch
-        run: python3 -m mypy --ignore-missing-imports --check-untyped-defs subiquity subiquitycore system_setup console_conf scripts/replay-curtin-log.py | tee /tmp/mypy-head.out
+        run: python3 -m mypy --ignore-missing-imports --check-untyped-defs subiquity subiquitycore console_conf scripts/replay-curtin-log.py | tee /tmp/mypy-head.out
       - name: Determine base commit (most recent common ancestor)
         id: determine_base_commit
         run: |
@@ -88,7 +86,7 @@ jobs:
           ref: ${{ steps.determine_base_commit.outputs.base_commit }}
       - run: git show
       - name: Run mypy on base commit
-        run: python3 -m mypy --ignore-missing-imports --check-untyped-defs subiquity subiquitycore system_setup console_conf scripts/replay-curtin-log.py | tee /tmp/mypy-base.out
+        run: python3 -m mypy --ignore-missing-imports --check-untyped-defs subiquity subiquitycore console_conf scripts/replay-curtin-log.py | tee /tmp/mypy-base.out
       - name: Produce the diff between the two mypy runs
         run: diff --color=always --unified=0 /tmp/mypy-base.out /tmp/mypy-head.out
         continue-on-error: true

.pre-commit-config.yaml

@@ -1,16 +1,16 @@
-files: "(console_conf|subiquity|subiquitycore|system_setup|doc)"
+files: "(console_conf|subiquity|subiquitycore|doc)"
 repos:
   - repo: https://github.com/psf/black
     rev: 23.7.0
     hooks:
       - id: black
-        files: "(console_conf|subiquity|subiquitycore|system_setup)"
+        files: "(console_conf|subiquity|subiquitycore)"
   - repo: https://github.com/pycqa/isort
     rev: 5.12.0
     hooks:
       - id: isort
         name: isort
-        files: "(console_conf|subiquity|subiquitycore|system_setup)"
+        files: "(console_conf|subiquity|subiquitycore)"
   - repo: local
     hooks:
       - id: doc-spelling

Makefile

@@ -9,11 +9,10 @@ PROBERT_REPO=https://github.com/canonical/probert
 DRYRUN?=--dry-run --bootloader uefi --machine-config examples/machines/simple.json \
 	--source-catalog examples/sources/install.yaml \
 	--postinst-hooks-dir examples/postinst.d/
-SYSTEM_SETUP_DRYRUN?=--dry-run
 export PYTHONPATH
 CWD := $(shell pwd)
 
-CHECK_DIRS := console_conf subiquity subiquitycore system_setup
+CHECK_DIRS := console_conf subiquity subiquitycore
 PYTHON := python3
 
 ifneq (,$(MACHINE))
@@ -52,22 +51,6 @@ dryrun-serial ui-view-serial:
 dryrun-server:
 	$(PYTHON) -m subiquity.cmd.server $(DRYRUN)
 
-.PHONY: dryrun-system-setup
-dryrun-system-setup:
-	$(PYTHON) -m system_setup.cmd.tui $(SYSTEM_SETUP_DRYRUN)
-
-.PHONY: dryrun-system-setup-server
-dryrun-system-setup-server:
-	$(PYTHON) -m system_setup.cmd.server $(SYSTEM_SETUP_DRYRUN)
-
-.PHONY: dryrun-system-setup-recon
-dryrun-system-setup-recon:
-	DRYRUN_RECONFIG=true $(PYTHON) -m system_setup.cmd.tui $(SYSTEM_SETUP_DRYRUN)
-
-.PHONY: dryrun-system-setup-server-recon
-dryrun-system-setup-server-recon:
-	DRYRUN_RECONFIG=true $(PYTHON) -m system_setup.cmd.server $(SYSTEM_SETUP_DRYRUN)
-
 .PHONY: lint
 lint: flake8
 
@@ -106,7 +89,6 @@ gitdeps: curtin probert
 .PHONY: schema
 schema: gitdeps
 	@$(PYTHON) -m subiquity.cmd.schema > autoinstall-schema.json
-	@$(PYTHON) -m system_setup.cmd.schema > autoinstall-system-setup-schema.json
 
 .PHONY: format black isort
 format:

scripts/run-mypy.py

@@ -13,7 +13,7 @@ def run_mypy(cwd: str | None, stdout: TextIO | None) -> None:
     mypy_cmd = [
         'python3', '-m', 'mypy',
         '--ignore-missing-imports', '--check-untyped-defs',
-        'subiquity', 'subiquitycore', 'system_setup', 'console_conf',
+        'subiquity', 'subiquitycore', 'console_conf',
         'scripts/replay-curtin-log.py',
     ]