Merge pull request #3506 from mtmail/development-environment-more-dependencies

Development environment: add missing dependencies
This commit is contained in:
Sarah Hoffmann 2024-08-09 19:24:56 +02:00 committed by GitHub
commit a14ab1c08c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 12 additions and 6 deletions

8
Vagrantfile vendored
View File

@ -52,10 +52,6 @@ Vagrant.configure("2") do |config|
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
@ -83,6 +79,10 @@ Vagrant.configure("2") do |config|
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

View File

@ -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.
```sh
sudo apt install libsqlite3-mod-spatialite php-cli
```
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 \
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:

View File

@ -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)}
- 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: **
```