Development environment: add missing dependencies

diff --git a/Vagrantfile b/Vagrantfile
index 03cd0629ad1ce70da0d3a1eb95a170e65dcd3b0a..99aa84491159c81b0f3a588267652caa4ccc8d6d 100644 (file)
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -52,10 +52,6 @@ Vagrant.configure("2") do |config|
 
   config.vm.define "ubuntu22", primary: true do |sub|
       sub.vm.box = "generic/ubuntu2204"
 
   config.vm.define "ubuntu22", primary: true do |sub|
       sub.vm.box = "generic/ubuntu2204"

-      if RUBY_PLATFORM.include?('darwin') && RUBY_PLATFORM.include?('arm64')
-        # Apple M processor
-        sub.vm.box = 'luminositylabsllc/ubuntu-22.04-arm64'
-      end

       sub.vm.provision :shell do |s|
         s.path = "vagrant/Install-on-Ubuntu-22.sh"
         s.privileged = false
       sub.vm.provision :shell do |s|
         s.path = "vagrant/Install-on-Ubuntu-22.sh"
         s.privileged = false


@@ -83,6 +79,10 @@ Vagrant.configure("2") do |config|
 
   config.vm.define "ubuntu24" do |sub|
       sub.vm.box = "bento/ubuntu-24.04"
 
   config.vm.define "ubuntu24" do |sub|
       sub.vm.box = "bento/ubuntu-24.04"

+      if RUBY_PLATFORM.include?('darwin') && RUBY_PLATFORM.include?('arm64')
+        # Apple M processor
+        sub.vm.box = 'gutehall/ubuntu24-04'
+      end

       sub.vm.provision :shell do |s|
         s.path = "vagrant/Install-on-Ubuntu-24.sh"
         s.privileged = false
       sub.vm.provision :shell do |s|
         s.path = "vagrant/Install-on-Ubuntu-24.sh"
         s.privileged = false

diff --git a/docs/develop/Development-Environment.md b/docs/develop/Development-Environment.md
index 1db32a6e3acda0dde831c5bf60e86a844fd8f4ab..fd7820c6abef5a0be686c6477572a51db22b7ec5 100644 (file)
--- a/docs/develop/Development-Environment.md
+++ b/docs/develop/Development-Environment.md
@@ -62,6 +62,10 @@ In particular, pylint tends to have a lot of breaking changes between versions.
 The easiest way, to handle these Python dependencies is to run your
 development from within a virtual environment.
 
 The easiest way, to handle these Python dependencies is to run your
 development from within a virtual environment.
 

+```sh
+sudo apt install libsqlite3-mod-spatialite php-cli
+```
+

 To set up the virtual environment with all necessary packages run:
 
 ```sh
 To set up the virtual environment with all necessary packages run:
 
 ```sh


@@ -72,7 +76,8 @@ virtualenv ~/nominatim-dev-venv
     mkdocs mkdocstrings mkdocs-gen-files pytest pytest-asyncio pylint \
     types-jinja2 types-markupsafe types-psutil types-psycopg2 \
     types-pygments types-pyyaml types-requests types-ujson \
     mkdocs mkdocstrings mkdocs-gen-files pytest pytest-asyncio pylint \
     types-jinja2 types-markupsafe types-psutil types-psycopg2 \
     types-pygments types-pyyaml types-requests types-ujson \

-    types-urllib3 typing-extensions unicorn falcon
+    types-urllib3 typing-extensions unicorn falcon starlette \
+    uvicorn mypy osmium aiosqlite

 ```
 
 Now enter the virtual environment whenever you want to develop:
 ```
 
 Now enter the virtual environment whenever you want to develop:

diff --git a/src/nominatim_db/tools/collect_os_info.py b/src/nominatim_db/tools/collect_os_info.py
index d054ef006741729e0bf5f541b977e083f695bad5..c5616c67c59f9d1d25b7215cabbadac5f3753eb5 100644 (file)
--- a/src/nominatim_db/tools/collect_os_info.py
+++ b/src/nominatim_db/tools/collect_os_info.py
@@ -137,7 +137,8 @@ def report_system_information(config: Configuration) -> None:
     **Hardware Configuration:**
     - RAM: {friendly_memory_string(psutil.virtual_memory().total)}
     - number of CPUs: {psutil.cpu_count(logical=False)}
     **Hardware Configuration:**
     - RAM: {friendly_memory_string(psutil.virtual_memory().total)}
     - number of CPUs: {psutil.cpu_count(logical=False)}

-    - bare metal/AWS/other cloud service (per systemd-detect-virt(1)): {run_command("systemd-detect-virt")} 
+    - bare metal/AWS/other cloud service (per systemd-detect-virt(1)):
+        {run_command("systemd-detect-virt")}

     - type and size of disks:
     **`df -h` - df - report file system disk space usage: **
     ```
     - type and size of disks:
     **`df -h` - df - report file system disk space usage: **
     ```