Skip to content

Commit

Permalink
Merge pull request #3506 from mtmail/development-environment-more-dep…
Browse files Browse the repository at this point in the history
…endencies

Development environment: add missing dependencies
  • Loading branch information
lonvia authored Aug 9, 2024
2 parents f6e792f + 0ba3d01 commit a14ab1c
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 6 deletions.
8 changes: 4 additions & 4 deletions Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
7 changes: 6 additions & 1 deletion docs/develop/Development-Environment.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down
3 changes: 2 additions & 1 deletion src/nominatim_db/tools/collect_os_info.py
Original file line number Diff line number Diff line change
Expand Up @@ -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: **
```
Expand Down

0 comments on commit a14ab1c

Please sign in to comment.