remove support to multiple archs

Author: de1987

.github/workflows/code_coverage.yml

@@ -56,8 +56,7 @@ jobs:
       run: |
         python3 -m pip install --upgrade pip
         pip install -r requirements.txt
-        pip install -r requirements-dev.txt
-        pip install .
+        pip install .[dev]
 
     - name: Retrieve ari knowledge base from s3
       run: |

.github/workflows/pip_audit.yml

@@ -10,15 +10,15 @@ on:
       - .github/workflows/pip_audit.yml
       - ansible_ai_connect/**
       - pyproject.toml
-      - requirements*.txt
+      - requirements.txt
   pull_request:
     branches:
       - main
     paths:
       - .github/workflows/pip_audit.yml
       - ansible_ai_connect/**
       - pyproject.toml
-      - requirements*.txt
+      - requirements.txt
 permissions:
   contents: read
 

.github/workflows/pip_compile.yml

@@ -8,12 +8,6 @@ on:
       - ansible_ai_connect/**
       - requirements.in
       - requirements.txt
-      - requirements-x86_64.txt
-      - requirements-aarch64.txt
-      - requirements-dev.in
-      - requirements-dev.txt
-      - requirements-dev-x86_64.txt
-      - requirements-dev-aarch64.txt
       - Makefile
   pull_request:
     branches:
@@ -22,12 +16,6 @@ on:
       - ansible_ai_connect/**
       - requirements.in
       - requirements.txt
-      - requirements-x86_64.txt
-      - requirements-aarch64.txt
-      - requirements-dev.in
-      - requirements-dev.txt
-      - requirements-dev-x86_64.txt
-      - requirements-dev-aarch64.txt
       - Makefile
 permissions:
   contents: read
@@ -41,13 +29,9 @@ jobs:
       uses: actions/setup-python@v4
       with:
         python-version: 3.12
-    - name: Identify arch
-      run: |
-        echo "ARCH=$(uname -m)" >> "$GITHUB_ENV"
     - name: install
       run: |
         pip install --upgrade "pip<24.1"
         pip install pip-tools
-        pip-compile --quiet -o requirements-${{ env.ARCH }}.txt requirements.in
-        pip-compile --quiet -o requirements-dev-${{ env.ARCH }}.txt -c requirements-${{ env.ARCH }}.txt requirements-dev.in
-        git diff --exit-code -- requirements-${{ env.ARCH }}.txt requirements-dev-${{ env.ARCH }}.txt
+        pip-compile --quiet -o requirements.txt requirements.in
+        git diff --exit-code -- requirements.txt

.github/workflows/pre-commit.yml

@@ -35,7 +35,7 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install pre-commit
+          pip install .[dev]
 
       - name: Run pre-commit
         uses: pre-commit/action@v3.0.0

.github/workflows/security_report.yml

@@ -17,7 +17,6 @@ jobs:
         run: |
           python3 -m pip install --upgrade pip
           pip install -r requirements.txt
-          pip install -r requirements-dev.txt
           pip install .
 
       - name: Monitor project and report vulnerabilities

Makefile

@@ -99,25 +99,14 @@ update-openapi-schema:
 docker-compose-clean:
 	${COMPOSE_RUNTIME} -f ${PWD}/tools/docker-compose/compose.yaml down
 
-.PHONY: pip-compile-x86_64
-pip-compile-x86_64:
+.PHONY: pip-compile
+pip-compile:
 	${CONTAINER_RUNTIME} run --arch amd64 --os linux \
 		--volume $(PWD):/var/www/wisdom:Z \
 		--workdir /var/www/wisdom \
 		registry.access.redhat.com/ubi9/ubi:latest \
 		/var/www/wisdom/tools/scripts/pip-compile.sh
 
-.PHONY: pip-compile-aarch64
-pip-compile-aarch64:
-	${CONTAINER_RUNTIME} run --arch arm64 --os linux \
-		--volume $(PWD):/var/www/wisdom:Z \
-		--workdir /var/www/wisdom \
-		registry.access.redhat.com/ubi9/ubi:latest \
-		/var/www/wisdom/tools/scripts/pip-compile.sh
-
-.PHONY: pip-compile
-pip-compile: pip-compile-x86_64 pip-compile-aarch64
-
 # DEPRECATED: Please use create-superuser-containerized instead
 docker-create-superuser: create-superuser-containerized DEPRECATED
 

README.md

@@ -176,7 +176,7 @@ Pre-commit should be used before pushing a new PR.
 To use pre-commit, you need to first install the pre-commit package and its dependencies by running:
 
 ```bash
-pip install -r requirements-dev.txt
+pip install .
 ```
 
 To install pre-commit into your git hooks and run the checks on every commit, run the following each time you clone this
@@ -194,58 +194,26 @@ pre-commit autoupdate && pre-commit run -a
 
 ## Updating the Python dependencies
 
-We are now using pip-compile in order to manage our Python
-dependencies for the x86_64 and ARM64/AArch64 architectures.
+We are using pip-compile in order to manage our Python dependencies.
 
-In order to generate requirements.txt files for both architectures,
-you must use a multi-arch capable virtual machine emulator (like QEMU)
-and enable multi-arch support.
-
-To enable multi-arch support, run the instructions for your container
-engine and emulator from this table:
-
-<table>
-<tr>
-<td>Container Engine</td>
-<td>Emulator</td>
-<td>Instructions</td>
-</tr>
-<tr>
-<td>podman</td>
-<td>QEMU</td>
-<td>
-
-```bash
-podman machine ssh
-sudo rpm-ostree install qemu-user-static
-sudo systemctl reboot
-```
-
-</td>
-</tr>
-</table>
-
-The specification of what packages we need now live in the
-requirements.in and requirements-dev.in files. Use your preferred
-editor to make the needed changes in those files, then run
+The specification of what packages we need lives in the
+`requirements.in` file. Use your preferred editor to make the needed
+changes in that file, then run:
 
 ```bash
 make pip-compile
 ```
 
-This will spin up a container and run the equivalent of these commands
-to generate the updated files:
+This will spin up a container and run the equivalent of:
 
 ```bash
 pip-compile requirements.in
-pip-compile requirements-dev.in
 ```
 
-These commands will produce fully populated and pinned requirements.txt and
-requirements-dev.txt files, containing all of the dependencies of
-our dependencies involved. Due to differences in architecture and
-version of Python between developers' machines, we do not recommend
-running the pip-compile commands directly.
+This command will produce a fully populated and pinned `requirements.txt`
+file, containing all of the dependencies of our dependencies.
+Due to differences in architecture and version of Python between
+developers' machines, we do not recommend running pip-compile directly.
 
 ### Use of `pyproject.toml`
 
@@ -493,8 +461,7 @@ have backend services (Postgres, Prometheus and Grafana) running.
 is one handy way for that requirement.
 
 For getting the unit test code coverage,
-install the `coverage` module, which is included
-in `requirements-dev.txt` with the instructions in the
+install the `coverage` module with the instructions in the
 [Using pre-commit](#using-pre-commit) section.
 
 ### Use make

pyproject.toml

@@ -61,6 +61,20 @@ classifiers = [
     "Programming Language :: Python :: 3",
 ]
 
+[project.optional-dependencies]
+dev = [
+  'black~=24.3.0',
+  'coverage~=7.2.1',
+  'flake8~=6.0.0',
+  'grpcio-tools~=1.68.1',
+  'isort~=5.10.1',
+  'pip-tools',
+  'pre-commit',
+  'responses~=0.24.1',
+  'torch-model-archiver',
+  'virtualenv>=20.28.0',
+]
+
 [project.urls]
 Homepage = "https://github.com/ansible/ansible-ai-connect-service"