From a2156c607136e41b2f3d3bd9dbb177ae5fd22a84 Mon Sep 17 00:00:00 2001 From: val-ismaili Date: Thu, 30 Mar 2023 15:05:14 +0100 Subject: [PATCH 01/36] v0.2.0 changelog and versioning --- CHANGELOG.md | 10 ++++++++++ osmox/__init__.py | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..093cb04 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,10 @@ +# [v0.2.0] + +## What's Changed +Python 3.11 support by @val-ismaili in https://github.com/arup-group/osmox/pull/35 + +# [v0.1.0] + +# Initial release + +This is the first release and support Python 3.7, please check documentation/wiki for the usage guide \ No newline at end of file diff --git a/osmox/__init__.py b/osmox/__init__.py index 6c8e6b9..d3ec452 100644 --- a/osmox/__init__.py +++ b/osmox/__init__.py @@ -1 +1 @@ -__version__ = "0.0.0" +__version__ = "0.2.0" From 7719775ba610622c737429cab9e4c96f3e63d875 Mon Sep 17 00:00:00 2001 From: val-ismaili Date: Thu, 30 Mar 2023 15:19:27 +0100 Subject: [PATCH 02/36] v0.2.0 python_requires --- .github/workflows/build_pipeline.yml | 2 +- setup.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build_pipeline.yml b/.github/workflows/build_pipeline.yml index 7488e6e..1833806 100644 --- a/.github/workflows/build_pipeline.yml +++ b/.github/workflows/build_pipeline.yml @@ -10,7 +10,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-python@v1 with: - python-version: 3.7 + python-version: 3.11 - uses: actions/cache@v1 with: path: ~/.cache/pip diff --git a/setup.py b/setup.py index 1652814..5634a44 100644 --- a/setup.py +++ b/setup.py @@ -14,5 +14,6 @@ description="A command line tool for processing osmfs into facility locations.", packages=find_packages(), install_requires=required, + python_requires='>=3.11', entry_points={"console_scripts": ["osmox = osmox.main:osmox"]}, ) From 3d687113fa540dd57b116ea409eef09ef6d03f1a Mon Sep 17 00:00:00 2001 From: val-ismaili Date: Thu, 30 Mar 2023 15:36:54 +0100 Subject: [PATCH 03/36] setup-tools pinned --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 89180f7..ecc8462 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,5 +8,5 @@ pytest==6.2.4 pytest-cov==2.8.1 pytest-mock==3.1.0 Rtree>=0.9.3 -setuptools>=42.0.1 +setuptools>=42.0.1,<58.0.0 Shapely==1.8.0 From 077c0f3900ddb5f1a0a3ef51ee4689538145e479 Mon Sep 17 00:00:00 2001 From: val-ismaili Date: Thu, 30 Mar 2023 15:55:51 +0100 Subject: [PATCH 04/36] setuptools pin --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index ecc8462..cab6367 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,5 +8,5 @@ pytest==6.2.4 pytest-cov==2.8.1 pytest-mock==3.1.0 Rtree>=0.9.3 -setuptools>=42.0.1,<58.0.0 +setuptools>=42.0.1,<58.0.2 Shapely==1.8.0 From c6536c3056d257debf28677c3a34df07d73059ac Mon Sep 17 00:00:00 2001 From: val-ismaili Date: Thu, 30 Mar 2023 16:10:51 +0100 Subject: [PATCH 05/36] setuptools buildpipeline --- .github/workflows/build_pipeline.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build_pipeline.yml b/.github/workflows/build_pipeline.yml index 1833806..7cc718f 100644 --- a/.github/workflows/build_pipeline.yml +++ b/.github/workflows/build_pipeline.yml @@ -24,6 +24,7 @@ jobs: python -m pip install --upgrade pip sudo apt-get install -y python3-pip libgdal-dev locales sudo apt-get install -y libspatialindex-dev + python3 -m pip install --upgrade --no-cache-dir setuptools==58.0.2 export CPLUS_INCLUDE_PATH=/usr/include/gdal export C_INCLUDE_PATH=/usr/include/gdal sudo apt-get install ca-certificates From 7429b736b8babfbf3fd23dea1146094dfbf0b8a2 Mon Sep 17 00:00:00 2001 From: val-ismaili Date: Thu, 30 Mar 2023 16:15:40 +0100 Subject: [PATCH 06/36] setuptools pin --- .github/workflows/build_pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_pipeline.yml b/.github/workflows/build_pipeline.yml index 7cc718f..04b5994 100644 --- a/.github/workflows/build_pipeline.yml +++ b/.github/workflows/build_pipeline.yml @@ -24,7 +24,7 @@ jobs: python -m pip install --upgrade pip sudo apt-get install -y python3-pip libgdal-dev locales sudo apt-get install -y libspatialindex-dev - python3 -m pip install --upgrade --no-cache-dir setuptools==58.0.2 + python3 -m pip install --upgrade --no-cache-dir setuptools<58.0.0 export CPLUS_INCLUDE_PATH=/usr/include/gdal export C_INCLUDE_PATH=/usr/include/gdal sudo apt-get install ca-certificates From 8eda76b809cf1d19515621968018270755dab72d Mon Sep 17 00:00:00 2001 From: val-ismaili Date: Thu, 30 Mar 2023 16:20:55 +0100 Subject: [PATCH 07/36] setuptools==57.5.0 --- .github/workflows/build_pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_pipeline.yml b/.github/workflows/build_pipeline.yml index 04b5994..9da2f55 100644 --- a/.github/workflows/build_pipeline.yml +++ b/.github/workflows/build_pipeline.yml @@ -24,7 +24,7 @@ jobs: python -m pip install --upgrade pip sudo apt-get install -y python3-pip libgdal-dev locales sudo apt-get install -y libspatialindex-dev - python3 -m pip install --upgrade --no-cache-dir setuptools<58.0.0 + python3 -m pip install --upgrade --no-cache-dir setuptools==57.5.0 export CPLUS_INCLUDE_PATH=/usr/include/gdal export C_INCLUDE_PATH=/usr/include/gdal sudo apt-get install ca-certificates From a4c9a499604b10ba910c500ae690ee76e971e943 Mon Sep 17 00:00:00 2001 From: val-ismaili Date: Thu, 30 Mar 2023 16:34:54 +0100 Subject: [PATCH 08/36] gdal pin --- .github/workflows/build_pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_pipeline.yml b/.github/workflows/build_pipeline.yml index 9da2f55..81fd44d 100644 --- a/.github/workflows/build_pipeline.yml +++ b/.github/workflows/build_pipeline.yml @@ -29,7 +29,7 @@ jobs: export C_INCLUDE_PATH=/usr/include/gdal sudo apt-get install ca-certificates export CURL_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt - pip install GDAL==3.0.2 + pip install GDAL==3.0.4 pip install -e . - name: Lint with flake8 run: | From bad0635026ca928b659939b72d21ea78c55c76c9 Mon Sep 17 00:00:00 2001 From: val-ismaili Date: Thu, 30 Mar 2023 16:38:52 +0100 Subject: [PATCH 09/36] setuptools pin 58.0.0 --- .github/workflows/build_pipeline.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_pipeline.yml b/.github/workflows/build_pipeline.yml index 81fd44d..56268ad 100644 --- a/.github/workflows/build_pipeline.yml +++ b/.github/workflows/build_pipeline.yml @@ -24,12 +24,12 @@ jobs: python -m pip install --upgrade pip sudo apt-get install -y python3-pip libgdal-dev locales sudo apt-get install -y libspatialindex-dev - python3 -m pip install --upgrade --no-cache-dir setuptools==57.5.0 + python3 -m pip install --upgrade --no-cache-dir setuptools==58.0.0 export CPLUS_INCLUDE_PATH=/usr/include/gdal export C_INCLUDE_PATH=/usr/include/gdal sudo apt-get install ca-certificates export CURL_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt - pip install GDAL==3.0.4 + pip install GDAL==3.0.2 pip install -e . - name: Lint with flake8 run: | From 73a8022adb061c13dd51610757108e971e84175c Mon Sep 17 00:00:00 2001 From: val-ismaili Date: Thu, 30 Mar 2023 16:55:41 +0100 Subject: [PATCH 10/36] gdal upgrade build_pipeline --- .github/workflows/build_pipeline.yml | 3 +-- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_pipeline.yml b/.github/workflows/build_pipeline.yml index 56268ad..10d86a4 100644 --- a/.github/workflows/build_pipeline.yml +++ b/.github/workflows/build_pipeline.yml @@ -24,12 +24,11 @@ jobs: python -m pip install --upgrade pip sudo apt-get install -y python3-pip libgdal-dev locales sudo apt-get install -y libspatialindex-dev - python3 -m pip install --upgrade --no-cache-dir setuptools==58.0.0 export CPLUS_INCLUDE_PATH=/usr/include/gdal export C_INCLUDE_PATH=/usr/include/gdal sudo apt-get install ca-certificates export CURL_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt - pip install GDAL==3.0.2 + pip install GDAL==3.5.2 pip install -e . - name: Lint with flake8 run: | diff --git a/requirements.txt b/requirements.txt index cab6367..89180f7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,5 +8,5 @@ pytest==6.2.4 pytest-cov==2.8.1 pytest-mock==3.1.0 Rtree>=0.9.3 -setuptools>=42.0.1,<58.0.2 +setuptools>=42.0.1 Shapely==1.8.0 From 0cfe6d770398390181f1db9fa66af7a819635680 Mon Sep 17 00:00:00 2001 From: val-ismaili Date: Thu, 30 Mar 2023 17:03:08 +0100 Subject: [PATCH 11/36] setuptools pin --- .github/workflows/build_pipeline.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build_pipeline.yml b/.github/workflows/build_pipeline.yml index 10d86a4..027a315 100644 --- a/.github/workflows/build_pipeline.yml +++ b/.github/workflows/build_pipeline.yml @@ -24,6 +24,7 @@ jobs: python -m pip install --upgrade pip sudo apt-get install -y python3-pip libgdal-dev locales sudo apt-get install -y libspatialindex-dev + python3 -m pip install --upgrade --no-cache-dir setuptools==58.2.0 export CPLUS_INCLUDE_PATH=/usr/include/gdal export C_INCLUDE_PATH=/usr/include/gdal sudo apt-get install ca-certificates From 6986afb12ea95246fcc6fc7d1d745b0f34772d88 Mon Sep 17 00:00:00 2001 From: val-ismaili Date: Thu, 30 Mar 2023 17:11:58 +0100 Subject: [PATCH 12/36] python3-dev --- .github/workflows/build_pipeline.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build_pipeline.yml b/.github/workflows/build_pipeline.yml index 027a315..14b5b46 100644 --- a/.github/workflows/build_pipeline.yml +++ b/.github/workflows/build_pipeline.yml @@ -24,6 +24,7 @@ jobs: python -m pip install --upgrade pip sudo apt-get install -y python3-pip libgdal-dev locales sudo apt-get install -y libspatialindex-dev + sudo apt-get install python3-dev python3 -m pip install --upgrade --no-cache-dir setuptools==58.2.0 export CPLUS_INCLUDE_PATH=/usr/include/gdal export C_INCLUDE_PATH=/usr/include/gdal From 701e2a242e7e41dce261196b8752a594c7fc4fc9 Mon Sep 17 00:00:00 2001 From: val-ismaili Date: Thu, 30 Mar 2023 17:17:17 +0100 Subject: [PATCH 13/36] python3-dev --- .github/workflows/build_pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_pipeline.yml b/.github/workflows/build_pipeline.yml index 14b5b46..d92190d 100644 --- a/.github/workflows/build_pipeline.yml +++ b/.github/workflows/build_pipeline.yml @@ -24,7 +24,7 @@ jobs: python -m pip install --upgrade pip sudo apt-get install -y python3-pip libgdal-dev locales sudo apt-get install -y libspatialindex-dev - sudo apt-get install python3-dev + sudo apt-get install -y python3-dev python3 -m pip install --upgrade --no-cache-dir setuptools==58.2.0 export CPLUS_INCLUDE_PATH=/usr/include/gdal export C_INCLUDE_PATH=/usr/include/gdal From 5cb8a53abf82001256544ade14d2550197cd5796 Mon Sep 17 00:00:00 2001 From: val-ismaili Date: Thu, 30 Mar 2023 17:29:23 +0100 Subject: [PATCH 14/36] gdal 3.2.0 --- .github/workflows/build_pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_pipeline.yml b/.github/workflows/build_pipeline.yml index d92190d..9f01636 100644 --- a/.github/workflows/build_pipeline.yml +++ b/.github/workflows/build_pipeline.yml @@ -30,7 +30,7 @@ jobs: export C_INCLUDE_PATH=/usr/include/gdal sudo apt-get install ca-certificates export CURL_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt - pip install GDAL==3.5.2 + pip install GDAL==3.2.0 pip install -e . - name: Lint with flake8 run: | From c4811d56fbcee5bf42b9887e0a76c2447d0b74bc Mon Sep 17 00:00:00 2001 From: val-ismaili Date: Thu, 30 Mar 2023 17:38:15 +0100 Subject: [PATCH 15/36] gdal upgrade --- .github/workflows/build_pipeline.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/build_pipeline.yml b/.github/workflows/build_pipeline.yml index 9f01636..ad0ab6d 100644 --- a/.github/workflows/build_pipeline.yml +++ b/.github/workflows/build_pipeline.yml @@ -24,13 +24,11 @@ jobs: python -m pip install --upgrade pip sudo apt-get install -y python3-pip libgdal-dev locales sudo apt-get install -y libspatialindex-dev - sudo apt-get install -y python3-dev - python3 -m pip install --upgrade --no-cache-dir setuptools==58.2.0 export CPLUS_INCLUDE_PATH=/usr/include/gdal export C_INCLUDE_PATH=/usr/include/gdal sudo apt-get install ca-certificates export CURL_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt - pip install GDAL==3.2.0 + pip install GDAL==3.6.3 pip install -e . - name: Lint with flake8 run: | From 3a22ed0b5d89ce7f8bcd93f3cf77985e3dea0135 Mon Sep 17 00:00:00 2001 From: val-ismaili Date: Thu, 30 Mar 2023 17:44:14 +0100 Subject: [PATCH 16/36] wheel install --- .github/workflows/build_pipeline.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build_pipeline.yml b/.github/workflows/build_pipeline.yml index ad0ab6d..0552f65 100644 --- a/.github/workflows/build_pipeline.yml +++ b/.github/workflows/build_pipeline.yml @@ -28,6 +28,7 @@ jobs: export C_INCLUDE_PATH=/usr/include/gdal sudo apt-get install ca-certificates export CURL_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt + pip install wheel pip install GDAL==3.6.3 pip install -e . - name: Lint with flake8 From f3b1517b25fe32271df4ea391f39154a90de07e6 Mon Sep 17 00:00:00 2001 From: val-ismaili Date: Thu, 30 Mar 2023 17:48:54 +0100 Subject: [PATCH 17/36] cmake --- .github/workflows/build_pipeline.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build_pipeline.yml b/.github/workflows/build_pipeline.yml index 0552f65..6864954 100644 --- a/.github/workflows/build_pipeline.yml +++ b/.github/workflows/build_pipeline.yml @@ -29,6 +29,7 @@ jobs: sudo apt-get install ca-certificates export CURL_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt pip install wheel + pip install cmake pip install GDAL==3.6.3 pip install -e . - name: Lint with flake8 From d07a47d44a3ac0ab56f61bb6ddbe763a4378ee5d Mon Sep 17 00:00:00 2001 From: val-ismaili Date: Thu, 30 Mar 2023 18:06:39 +0100 Subject: [PATCH 18/36] wheel --- .github/workflows/build_pipeline.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build_pipeline.yml b/.github/workflows/build_pipeline.yml index 6864954..5839b3d 100644 --- a/.github/workflows/build_pipeline.yml +++ b/.github/workflows/build_pipeline.yml @@ -22,7 +22,8 @@ jobs: export ACCEPT_EULA=Y sudo apt-get update python -m pip install --upgrade pip - sudo apt-get install -y python3-pip libgdal-dev locales + sudo apt-get install -y python-dev python-pip + sudo apt-get install -y python3-dev python3-pip python3-venv python3-wheel libgdal-dev locales sudo apt-get install -y libspatialindex-dev export CPLUS_INCLUDE_PATH=/usr/include/gdal export C_INCLUDE_PATH=/usr/include/gdal From 60b953ff28ced5bd42038ea13453c5abc268b4b9 Mon Sep 17 00:00:00 2001 From: val-ismaili Date: Thu, 30 Mar 2023 18:09:06 +0100 Subject: [PATCH 19/36] wheel --- .github/workflows/build_pipeline.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build_pipeline.yml b/.github/workflows/build_pipeline.yml index 5839b3d..2b01c9f 100644 --- a/.github/workflows/build_pipeline.yml +++ b/.github/workflows/build_pipeline.yml @@ -22,7 +22,6 @@ jobs: export ACCEPT_EULA=Y sudo apt-get update python -m pip install --upgrade pip - sudo apt-get install -y python-dev python-pip sudo apt-get install -y python3-dev python3-pip python3-venv python3-wheel libgdal-dev locales sudo apt-get install -y libspatialindex-dev export CPLUS_INCLUDE_PATH=/usr/include/gdal From 4e22c19660c0000b8b126d163585a2121f2dd0b9 Mon Sep 17 00:00:00 2001 From: val-ismaili Date: Thu, 30 Mar 2023 18:22:33 +0100 Subject: [PATCH 20/36] gcc --- .github/workflows/build_pipeline.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build_pipeline.yml b/.github/workflows/build_pipeline.yml index 2b01c9f..7aa5731 100644 --- a/.github/workflows/build_pipeline.yml +++ b/.github/workflows/build_pipeline.yml @@ -27,6 +27,7 @@ jobs: export CPLUS_INCLUDE_PATH=/usr/include/gdal export C_INCLUDE_PATH=/usr/include/gdal sudo apt-get install ca-certificates + sudo apt update gcc export CURL_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt pip install wheel pip install cmake From 6f358e74ae53fcb4ae101f0c221a4825b588087b Mon Sep 17 00:00:00 2001 From: val-ismaili Date: Thu, 30 Mar 2023 18:28:03 +0100 Subject: [PATCH 21/36] gcc --- .github/workflows/build_pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_pipeline.yml b/.github/workflows/build_pipeline.yml index 7aa5731..6ed4ca1 100644 --- a/.github/workflows/build_pipeline.yml +++ b/.github/workflows/build_pipeline.yml @@ -27,8 +27,8 @@ jobs: export CPLUS_INCLUDE_PATH=/usr/include/gdal export C_INCLUDE_PATH=/usr/include/gdal sudo apt-get install ca-certificates - sudo apt update gcc export CURL_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt + sudo apt-get install -y gcc pip install wheel pip install cmake pip install GDAL==3.6.3 From d2b8c612277de751673e651b89e74c5ac1eda693 Mon Sep 17 00:00:00 2001 From: val-ismaili Date: Thu, 30 Mar 2023 18:34:33 +0100 Subject: [PATCH 22/36] build-essential --- .github/workflows/build_pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_pipeline.yml b/.github/workflows/build_pipeline.yml index 6ed4ca1..2e373fc 100644 --- a/.github/workflows/build_pipeline.yml +++ b/.github/workflows/build_pipeline.yml @@ -28,7 +28,7 @@ jobs: export C_INCLUDE_PATH=/usr/include/gdal sudo apt-get install ca-certificates export CURL_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt - sudo apt-get install -y gcc + sudo apt-get install -y gcc build-essential pip install wheel pip install cmake pip install GDAL==3.6.3 From cf96a30124f22909fb54466fb0f53f561c1bcb39 Mon Sep 17 00:00:00 2001 From: val-ismaili Date: Thu, 30 Mar 2023 18:40:08 +0100 Subject: [PATCH 23/36] numpy --- .github/workflows/build_pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_pipeline.yml b/.github/workflows/build_pipeline.yml index 2e373fc..bd6f800 100644 --- a/.github/workflows/build_pipeline.yml +++ b/.github/workflows/build_pipeline.yml @@ -22,7 +22,7 @@ jobs: export ACCEPT_EULA=Y sudo apt-get update python -m pip install --upgrade pip - sudo apt-get install -y python3-dev python3-pip python3-venv python3-wheel libgdal-dev locales + sudo apt-get install -y python3-dev python3-pip python3-venv python3-wheel libgdal-dev locales numpy sudo apt-get install -y libspatialindex-dev export CPLUS_INCLUDE_PATH=/usr/include/gdal export C_INCLUDE_PATH=/usr/include/gdal From a03d54185624015536e7a75691efaedd74ec1e63 Mon Sep 17 00:00:00 2001 From: val-ismaili Date: Thu, 30 Mar 2023 18:43:41 +0100 Subject: [PATCH 24/36] numpy --- .github/workflows/build_pipeline.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_pipeline.yml b/.github/workflows/build_pipeline.yml index bd6f800..05dbc0b 100644 --- a/.github/workflows/build_pipeline.yml +++ b/.github/workflows/build_pipeline.yml @@ -22,15 +22,14 @@ jobs: export ACCEPT_EULA=Y sudo apt-get update python -m pip install --upgrade pip - sudo apt-get install -y python3-dev python3-pip python3-venv python3-wheel libgdal-dev locales numpy + sudo apt-get install -y python3-dev python3-pip python3-venv python3-wheel libgdal-dev locales sudo apt-get install -y libspatialindex-dev export CPLUS_INCLUDE_PATH=/usr/include/gdal export C_INCLUDE_PATH=/usr/include/gdal sudo apt-get install ca-certificates export CURL_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt sudo apt-get install -y gcc build-essential - pip install wheel - pip install cmake + pip install wheel numpy cmake pip install GDAL==3.6.3 pip install -e . - name: Lint with flake8 From d0bdf745fae9c3a0a86297c672daa7d1dc69c038 Mon Sep 17 00:00:00 2001 From: val-ismaili Date: Thu, 30 Mar 2023 18:53:31 +0100 Subject: [PATCH 25/36] gdal --- .github/workflows/build_pipeline.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_pipeline.yml b/.github/workflows/build_pipeline.yml index 05dbc0b..1624c08 100644 --- a/.github/workflows/build_pipeline.yml +++ b/.github/workflows/build_pipeline.yml @@ -22,15 +22,14 @@ jobs: export ACCEPT_EULA=Y sudo apt-get update python -m pip install --upgrade pip - sudo apt-get install -y python3-dev python3-pip python3-venv python3-wheel libgdal-dev locales + sudo apt-get install -y python3-dev python3-pip libgdal-dev locales sudo apt-get install -y libspatialindex-dev export CPLUS_INCLUDE_PATH=/usr/include/gdal export C_INCLUDE_PATH=/usr/include/gdal sudo apt-get install ca-certificates export CURL_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt sudo apt-get install -y gcc build-essential - pip install wheel numpy cmake - pip install GDAL==3.6.3 + pip install GDAL==3.0.2 pip install -e . - name: Lint with flake8 run: | From ceecb2c67fdd82867b325dcdb53c1fdf5e09a9c3 Mon Sep 17 00:00:00 2001 From: val-ismaili Date: Thu, 30 Mar 2023 18:58:45 +0100 Subject: [PATCH 26/36] gdal upgrade --- .github/workflows/build_pipeline.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build_pipeline.yml b/.github/workflows/build_pipeline.yml index 1624c08..be6790e 100644 --- a/.github/workflows/build_pipeline.yml +++ b/.github/workflows/build_pipeline.yml @@ -28,8 +28,9 @@ jobs: export C_INCLUDE_PATH=/usr/include/gdal sudo apt-get install ca-certificates export CURL_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt + pip install cmake sudo apt-get install -y gcc build-essential - pip install GDAL==3.0.2 + pip install GDAL==3.6.3 pip install -e . - name: Lint with flake8 run: | From 01ba3fa9ab36cd4fd8c69ebd93325d3be64cceb7 Mon Sep 17 00:00:00 2001 From: val-ismaili Date: Thu, 30 Mar 2023 19:02:50 +0100 Subject: [PATCH 27/36] wheel --- .github/workflows/build_pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_pipeline.yml b/.github/workflows/build_pipeline.yml index be6790e..a29d7a3 100644 --- a/.github/workflows/build_pipeline.yml +++ b/.github/workflows/build_pipeline.yml @@ -28,7 +28,7 @@ jobs: export C_INCLUDE_PATH=/usr/include/gdal sudo apt-get install ca-certificates export CURL_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt - pip install cmake + pip install cmake wheel sudo apt-get install -y gcc build-essential pip install GDAL==3.6.3 pip install -e . From 6245a265f88bf723a2d35f6dce046150ab236bc0 Mon Sep 17 00:00:00 2001 From: val-ismaili Date: Thu, 30 Mar 2023 19:13:50 +0100 Subject: [PATCH 28/36] cmake --- .github/workflows/build_pipeline.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_pipeline.yml b/.github/workflows/build_pipeline.yml index a29d7a3..fc064d0 100644 --- a/.github/workflows/build_pipeline.yml +++ b/.github/workflows/build_pipeline.yml @@ -22,14 +22,13 @@ jobs: export ACCEPT_EULA=Y sudo apt-get update python -m pip install --upgrade pip - sudo apt-get install -y python3-dev python3-pip libgdal-dev locales + sudo apt-get install -y python3-dev python3-pip libgdal-dev locales cmake sudo apt-get install -y libspatialindex-dev export CPLUS_INCLUDE_PATH=/usr/include/gdal export C_INCLUDE_PATH=/usr/include/gdal sudo apt-get install ca-certificates export CURL_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt - pip install cmake wheel - sudo apt-get install -y gcc build-essential + pip install wheel pip install GDAL==3.6.3 pip install -e . - name: Lint with flake8 From efc5e545bcce59341d5fc70457f9d17b10e28e60 Mon Sep 17 00:00:00 2001 From: val-ismaili Date: Fri, 31 Mar 2023 08:48:08 +0100 Subject: [PATCH 29/36] c headers --- .github/workflows/build_pipeline.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build_pipeline.yml b/.github/workflows/build_pipeline.yml index fc064d0..4ea8840 100644 --- a/.github/workflows/build_pipeline.yml +++ b/.github/workflows/build_pipeline.yml @@ -26,6 +26,7 @@ jobs: sudo apt-get install -y libspatialindex-dev export CPLUS_INCLUDE_PATH=/usr/include/gdal export C_INCLUDE_PATH=/usr/include/gdal + export CFLAGS=$(gdal-config --cflags) sudo apt-get install ca-certificates export CURL_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt pip install wheel From 5a24f0bf163f4c6b2093d29d1e5a73707adfc29d Mon Sep 17 00:00:00 2001 From: val-ismaili Date: Fri, 31 Mar 2023 08:55:02 +0100 Subject: [PATCH 30/36] gdal-bin --- .github/workflows/build_pipeline.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build_pipeline.yml b/.github/workflows/build_pipeline.yml index 4ea8840..960519f 100644 --- a/.github/workflows/build_pipeline.yml +++ b/.github/workflows/build_pipeline.yml @@ -26,11 +26,10 @@ jobs: sudo apt-get install -y libspatialindex-dev export CPLUS_INCLUDE_PATH=/usr/include/gdal export C_INCLUDE_PATH=/usr/include/gdal - export CFLAGS=$(gdal-config --cflags) sudo apt-get install ca-certificates export CURL_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt pip install wheel - pip install GDAL==3.6.3 + sudo apt-get install gdal-bin pip install -e . - name: Lint with flake8 run: | From f7392eec1b0ba3fca7bf506fc245c0908d0f2598 Mon Sep 17 00:00:00 2001 From: val-ismaili Date: Fri, 31 Mar 2023 09:09:18 +0100 Subject: [PATCH 31/36] GDAL unpinned --- .github/workflows/build_pipeline.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_pipeline.yml b/.github/workflows/build_pipeline.yml index 960519f..df1e38d 100644 --- a/.github/workflows/build_pipeline.yml +++ b/.github/workflows/build_pipeline.yml @@ -22,14 +22,14 @@ jobs: export ACCEPT_EULA=Y sudo apt-get update python -m pip install --upgrade pip - sudo apt-get install -y python3-dev python3-pip libgdal-dev locales cmake + sudo apt-get install -y python3-pip libgdal-dev locales cmake sudo apt-get install -y libspatialindex-dev export CPLUS_INCLUDE_PATH=/usr/include/gdal export C_INCLUDE_PATH=/usr/include/gdal sudo apt-get install ca-certificates export CURL_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt pip install wheel - sudo apt-get install gdal-bin + pip install GDAL pip install -e . - name: Lint with flake8 run: | From eb6494d1828095512265a123411f436197ccef06 Mon Sep 17 00:00:00 2001 From: val-ismaili Date: Wed, 12 Apr 2023 11:10:42 +0100 Subject: [PATCH 32/36] gcc compiler --- .github/workflows/build_pipeline.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build_pipeline.yml b/.github/workflows/build_pipeline.yml index df1e38d..6790982 100644 --- a/.github/workflows/build_pipeline.yml +++ b/.github/workflows/build_pipeline.yml @@ -24,6 +24,7 @@ jobs: python -m pip install --upgrade pip sudo apt-get install -y python3-pip libgdal-dev locales cmake sudo apt-get install -y libspatialindex-dev + sudo apt-get install -y python3-dev build-essentials gcc export CPLUS_INCLUDE_PATH=/usr/include/gdal export C_INCLUDE_PATH=/usr/include/gdal sudo apt-get install ca-certificates From 2242332fd729407f6edb350dba11e977b58ebe11 Mon Sep 17 00:00:00 2001 From: val-ismaili Date: Wed, 12 Apr 2023 11:14:13 +0100 Subject: [PATCH 33/36] build-essential --- .github/workflows/build_pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_pipeline.yml b/.github/workflows/build_pipeline.yml index 6790982..08eb8f8 100644 --- a/.github/workflows/build_pipeline.yml +++ b/.github/workflows/build_pipeline.yml @@ -24,7 +24,7 @@ jobs: python -m pip install --upgrade pip sudo apt-get install -y python3-pip libgdal-dev locales cmake sudo apt-get install -y libspatialindex-dev - sudo apt-get install -y python3-dev build-essentials gcc + sudo apt-get install -y python3-dev build-essential gcc export CPLUS_INCLUDE_PATH=/usr/include/gdal export C_INCLUDE_PATH=/usr/include/gdal sudo apt-get install ca-certificates From 58e7d0872beb6b51cc224d6bab0f5011d1f7e2e0 Mon Sep 17 00:00:00 2001 From: val-ismaili Date: Wed, 3 May 2023 11:02:43 +0100 Subject: [PATCH 34/36] build_pipeline 3.7 --- .github/workflows/build_pipeline.yml | 5 ++--- CHANGELOG.md | 2 +- setup.py | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build_pipeline.yml b/.github/workflows/build_pipeline.yml index 83330b1..09f7058 100644 --- a/.github/workflows/build_pipeline.yml +++ b/.github/workflows/build_pipeline.yml @@ -10,7 +10,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-python@v1 with: - python-version: 3.11 + python-version: 3.7 - uses: actions/cache@v1 with: path: ~/.cache/pip @@ -22,9 +22,8 @@ jobs: export ACCEPT_EULA=Y sudo apt-get update python -m pip install --upgrade pip - sudo apt-get install -y python3-pip libgdal-dev locales cmake + sudo apt-get install -y python3-pip libgdal-dev locales sudo apt-get install -y libspatialindex-dev - sudo apt-get install -y python3-dev build-essential gcc export CPLUS_INCLUDE_PATH=/usr/include/gdal export C_INCLUDE_PATH=/usr/include/gdal sudo apt-get install ca-certificates diff --git a/CHANGELOG.md b/CHANGELOG.md index 093cb04..8e04627 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ # [v0.2.0] ## What's Changed -Python 3.11 support by @val-ismaili in https://github.com/arup-group/osmox/pull/35 +Currently supports 3.7 & 3.11 - future development will support 3.11 by default by @val-ismaili in https://github.com/arup-group/osmox/pull/35 # [v0.1.0] diff --git a/setup.py b/setup.py index 5634a44..9f4eb5c 100644 --- a/setup.py +++ b/setup.py @@ -14,6 +14,6 @@ description="A command line tool for processing osmfs into facility locations.", packages=find_packages(), install_requires=required, - python_requires='>=3.11', + python_requires='>=3.7', entry_points={"console_scripts": ["osmox = osmox.main:osmox"]}, ) From 08f5bda3fc704f29c91ad00eb19e191a901c7c68 Mon Sep 17 00:00:00 2001 From: val-ismaili Date: Wed, 3 May 2023 14:51:44 +0100 Subject: [PATCH 35/36] Installation note for Python 3.11 --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ffde3a6..2c71941 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,9 @@ Once assembled, these form part of our wider pipeline. But as a standalone tool, ## Install -Note: you can use the instructions [here](#using-docker) to build a Docker image for OSMOX and run it in a container if you cannot install it locally. +OSMOX can be installed on both Python 3.7 and 3.11 environments. + +Note: you can use the instructions [here](#using-docker) to build a Docker image for OSMOX and run it in a container if you cannot install it locally. This builds in a Python 3.7 environment. I. Installation for Mac ```{sh} @@ -39,7 +41,7 @@ It is recommended to use an Anaconda environment for installation on Windows: ```{sh} # Create a new environment in Anaconda -conda create -n osmox python=3.7 +conda create -n osmox python=3.11 conda activate osmox conda install geopandas From 3300663bee7afae6bb6c7ffa8ac684467b184edf Mon Sep 17 00:00:00 2001 From: val-ismaili Date: Wed, 3 May 2023 16:51:25 +0100 Subject: [PATCH 36/36] Changelog formatting --- CHANGELOG.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8e04627..b3ac9a9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,10 @@ # [v0.2.0] ## What's Changed -Currently supports 3.7 & 3.11 - future development will support 3.11 by default by @val-ismaili in https://github.com/arup-group/osmox/pull/35 + +### Added +- Support for Python 3.11 by @val-ismaili in https://github.com/arup-group/osmox/pull/35 +- A formal changelog # [v0.1.0]