Skip to content

Commit a14ab1c

Browse files
authored
Merge pull request #3506 from mtmail/development-environment-more-dependencies
Development environment: add missing dependencies
2 parents f6e792f + 0ba3d01 commit a14ab1c

File tree

3 files changed

+12
-6
lines changed

3 files changed

+12
-6
lines changed

Vagrantfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,6 @@ Vagrant.configure("2") do |config|
5252

5353
config.vm.define "ubuntu22", primary: true do |sub|
5454
sub.vm.box = "generic/ubuntu2204"
55-
if RUBY_PLATFORM.include?('darwin') && RUBY_PLATFORM.include?('arm64')
56-
# Apple M processor
57-
sub.vm.box = 'luminositylabsllc/ubuntu-22.04-arm64'
58-
end
5955
sub.vm.provision :shell do |s|
6056
s.path = "vagrant/Install-on-Ubuntu-22.sh"
6157
s.privileged = false
@@ -83,6 +79,10 @@ Vagrant.configure("2") do |config|
8379

8480
config.vm.define "ubuntu24" do |sub|
8581
sub.vm.box = "bento/ubuntu-24.04"
82+
if RUBY_PLATFORM.include?('darwin') && RUBY_PLATFORM.include?('arm64')
83+
# Apple M processor
84+
sub.vm.box = 'gutehall/ubuntu24-04'
85+
end
8686
sub.vm.provision :shell do |s|
8787
s.path = "vagrant/Install-on-Ubuntu-24.sh"
8888
s.privileged = false

docs/develop/Development-Environment.md

+6-1
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,10 @@ In particular, pylint tends to have a lot of breaking changes between versions.
6262
The easiest way, to handle these Python dependencies is to run your
6363
development from within a virtual environment.
6464

65+
```sh
66+
sudo apt install libsqlite3-mod-spatialite php-cli
67+
```
68+
6569
To set up the virtual environment with all necessary packages run:
6670

6771
```sh
@@ -72,7 +76,8 @@ virtualenv ~/nominatim-dev-venv
7276
mkdocs mkdocstrings mkdocs-gen-files pytest pytest-asyncio pylint \
7377
types-jinja2 types-markupsafe types-psutil types-psycopg2 \
7478
types-pygments types-pyyaml types-requests types-ujson \
75-
types-urllib3 typing-extensions unicorn falcon
79+
types-urllib3 typing-extensions unicorn falcon starlette \
80+
uvicorn mypy osmium aiosqlite
7681
```
7782

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

src/nominatim_db/tools/collect_os_info.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,8 @@ def report_system_information(config: Configuration) -> None:
137137
**Hardware Configuration:**
138138
- RAM: {friendly_memory_string(psutil.virtual_memory().total)}
139139
- number of CPUs: {psutil.cpu_count(logical=False)}
140-
- bare metal/AWS/other cloud service (per systemd-detect-virt(1)): {run_command("systemd-detect-virt")}
140+
- bare metal/AWS/other cloud service (per systemd-detect-virt(1)):
141+
{run_command("systemd-detect-virt")}
141142
- type and size of disks:
142143
**`df -h` - df - report file system disk space usage: **
143144
```

0 commit comments

Comments
 (0)