From 7800450d8187913a0e27162d38153c3f45fc28da Mon Sep 17 00:00:00 2001 From: Roelof van Dijk Date: Thu, 20 Jun 2024 13:55:00 +0200 Subject: [PATCH 1/4] chore: allow numpy 2 --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index f8c1dc89..0ef16fa1 100644 --- a/setup.py +++ b/setup.py @@ -42,7 +42,7 @@ def finalize_options(self): except ImportError: BdistWheel = None -requirements = ['numpy<2', +requirements = ['numpy', 'scipy', 'rasterio[s3]>=1.3.8', 'utm', @@ -63,7 +63,7 @@ def finalize_options(self): } setup(name="s2p", - version="1.6.9", + version="1.6.10", description="Satellite Stereo Pipeline.", long_description=readme(), long_description_content_type='text/markdown', From afa88c7086283215d0b6c9e4ef9b8802d51984d1 Mon Sep 17 00:00:00 2001 From: Roelof van Dijk Date: Thu, 20 Jun 2024 20:22:26 +0200 Subject: [PATCH 2/4] fix: cleanup --- setup.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index 0ef16fa1..0f3689cb 100644 --- a/setup.py +++ b/setup.py @@ -1,12 +1,11 @@ import subprocess -from codecs import open -from setuptools import find_packages, setup +from setuptools import setup from setuptools.command import build_py, develop def readme(): - with open("README.md", "r", "utf-8") as f: + with open("README.md", "r", encoding="utf-8") as f: return f.read() From 98a39c7d2fd40cebdf0e08712af6235508d1bf70 Mon Sep 17 00:00:00 2001 From: Roelof van Dijk Date: Thu, 20 Jun 2024 20:31:55 +0200 Subject: [PATCH 3/4] fix: ubuntu image --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index aa774e09..8d9b5b00 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,7 +2,7 @@ name: CI on: [push] jobs: build: - runs-on: ubuntu-latest + runs-on: ubuntu:22.04@sha256:19478ce7fc2ffbce89df29fea5725a8d12e57de52eb9ea570890dc5852aac1ac defaults: run: shell: bash -l {0} From ce355035a1d1d23c331428113c2c3a01424a1b5b Mon Sep 17 00:00:00 2001 From: Roelof van Dijk Date: Thu, 20 Jun 2024 20:34:09 +0200 Subject: [PATCH 4/4] fix: backend? --- .github/workflows/build.yml | 2 +- pyproject.toml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 pyproject.toml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8d9b5b00..aa774e09 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,7 +2,7 @@ name: CI on: [push] jobs: build: - runs-on: ubuntu:22.04@sha256:19478ce7fc2ffbce89df29fea5725a8d12e57de52eb9ea570890dc5852aac1ac + runs-on: ubuntu-latest defaults: run: shell: bash -l {0} diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 00000000..9787c3bd --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,3 @@ +[build-system] +requires = ["setuptools", "wheel"] +build-backend = "setuptools.build_meta"