From cc7646665c5f88537acc0dc09510531af97177ad Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Sat, 1 Jul 2023 18:16:23 +0200 Subject: [PATCH 1/1] remove GeoAlchemy as dependency --- .github/actions/build-nominatim/action.yml | 4 ++-- docs/admin/Installation.md | 1 - vagrant/Install-on-Ubuntu-20.sh | 2 +- vagrant/Install-on-Ubuntu-22.sh | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/actions/build-nominatim/action.yml b/.github/actions/build-nominatim/action.yml index eaab5ae0..724de3de 100644 --- a/.github/actions/build-nominatim/action.yml +++ b/.github/actions/build-nominatim/action.yml @@ -27,10 +27,10 @@ runs: run: | sudo apt-get install -y -qq libboost-system-dev libboost-filesystem-dev libexpat1-dev zlib1g-dev libbz2-dev libpq-dev libproj-dev libicu-dev liblua${LUA_VERSION}-dev lua${LUA_VERSION} lua-dkjson if [ "$FLAVOUR" == "oldstuff" ]; then - pip3 install MarkupSafe==2.0.1 python-dotenv psycopg2==2.7.7 jinja2==2.8 psutil==5.4.2 pyicu==2.9 osmium PyYAML==5.1 sqlalchemy==1.4 GeoAlchemy2==0.10.0 datrie asyncpg + pip3 install MarkupSafe==2.0.1 python-dotenv psycopg2==2.7.7 jinja2==2.8 psutil==5.4.2 pyicu==2.9 osmium PyYAML==5.1 sqlalchemy==1.4 datrie asyncpg else sudo apt-get install -y -qq python3-icu python3-datrie python3-pyosmium python3-jinja2 python3-psutil python3-psycopg2 python3-dotenv python3-yaml - pip3 install sqlalchemy GeoAlchemy2 psycopg + pip3 install sqlalchemy psycopg fi shell: bash env: diff --git a/docs/admin/Installation.md b/docs/admin/Installation.md index 61fc1bce..11442eed 100644 --- a/docs/admin/Installation.md +++ b/docs/admin/Installation.md @@ -49,7 +49,6 @@ For running Nominatim: * [psutil](https://github.com/giampaolo/psutil) * [Jinja2](https://palletsprojects.com/p/jinja/) * [SQLAlchemy](https://www.sqlalchemy.org/) (1.4+ with greenlet support) - * [GeoAlchemy2](https://geoalchemy-2.readthedocs.io/) (0.10+) * [asyncpg](https://magicstack.github.io/asyncpg) (0.8+) * [PyICU](https://pypi.org/project/PyICU/) * [PyYaml](https://pyyaml.org/) (5.1+) diff --git a/vagrant/Install-on-Ubuntu-20.sh b/vagrant/Install-on-Ubuntu-20.sh index ef776579..e52bdee7 100755 --- a/vagrant/Install-on-Ubuntu-20.sh +++ b/vagrant/Install-on-Ubuntu-20.sh @@ -33,7 +33,7 @@ export DEBIAN_FRONTEND=noninteractive #DOCS: # Some of the Python packages that come with Ubuntu 20.04 are too old, so # install the latest version from pip: - pip3 install --user sqlalchemy GeoAlchemy2 asyncpg + pip3 install --user sqlalchemy asyncpg # diff --git a/vagrant/Install-on-Ubuntu-22.sh b/vagrant/Install-on-Ubuntu-22.sh index c44cf87d..fdb38203 100755 --- a/vagrant/Install-on-Ubuntu-22.sh +++ b/vagrant/Install-on-Ubuntu-22.sh @@ -29,7 +29,7 @@ export DEBIAN_FRONTEND=noninteractive #DOCS: php-cli php-pgsql php-intl libicu-dev python3-dotenv \ python3-psycopg2 python3-psutil python3-jinja2 \ python3-icu python3-datrie python3-sqlalchemy \ - python3-geoalchemy2 python3-asyncpg git + python3-asyncpg git # # System Configuration -- 2.39.5