diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 9d936d71..9df0ff06 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -16,21 +16,21 @@ jobs: name: pypi steps: - uses: actions/checkout@v4 - - name: Setup Python 3.10 + - name: Setup Python 3.12 uses: actions/setup-python@v3 with: - python-version: "3.10" + python-version: "3.12" - name: Setup Miniconda uses: conda-incubator/setup-miniconda@v2 with: - python-version: '3.10' + python-version: '3.12' auto-activate-base: false - name: Build package shell: bash -l {0} run: | - conda create -n deploy_env python=3.10 libgdal=3.5.2 build -c conda-forge -y + conda create -n deploy_env python=3.12 build -c conda-forge -y conda activate deploy_env python -m build -C--global-option=bdist_wheel -C--global-option=--build-number=0 --wheel diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3384e908..9364adb0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,10 +12,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - name: Setup Python 3.10 + - name: Setup Python 3.12 uses: actions/setup-python@v3 with: - python-version: "3.10" + python-version: "3.12" - name: Create test env shell: bash -l {0} run: | @@ -30,19 +30,19 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - name: Setup Python 3.10 + - name: Setup Python 3.12 uses: actions/setup-python@v3 with: - python-version: "3.10" + python-version: "3.12" - name: Setup Miniconda uses: conda-incubator/setup-miniconda@v2 with: - python-version: '3.10' + python-version: '3.12' auto-activate-base: false - name: Create test env shell: bash -l {0} run: | - conda create -n test_env python=3.12 libgdal=3.5.2 -c conda-forge -c defaults -y + conda create -n test_env python=3.12 libgdal=3.9 -c conda-forge -c defaults -y conda activate test_env PIP_NO_BINARY=rasterio pip install . pip install pylint mccabe diff --git a/.gitignore b/.gitignore index cec64376..dce3f320 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ # Python # *.py[cod] -*$py.class +*$py.class # Distribution / packaging .Python build/ @@ -20,5 +20,13 @@ dist/ *.egg *.whl *.manifest -*.spec +*.spec + +# Tests +.coverage +listing.lst + +# IDE +.idea/ +.ipynb_checkpoints/ diff --git a/setup.py b/setup.py index b81ddaeb..e7d0e1dd 100644 --- a/setup.py +++ b/setup.py @@ -19,13 +19,13 @@ packages=find_packages(exclude=['tests']), include_package_data=True, zip_safe=False, - setup_requires = ["setuptools_scm"], + setup_requires=["setuptools_scm"], install_requires=[ 'click==8.1.8', 'rasterio', 'pytest>=3.6', 'pytest-cov', - 'geopandas==0.13', + 'geopandas>=0.13', 'kiwisolver==1.4.5', 'matplotlib==3.7.3', 'packaging==24.1', @@ -33,10 +33,10 @@ 'sphinx_rtd_theme==3.0.1', 'pip==24.2', 'sphinx==7.1.2', - 'scipy==1.16', + 'scipy', 'pyscaffold', - 'gdal==3.5.0', - 'tqdm==4.66' + 'gdal>=3.5.0,<3.10', + 'tqdm>=4.66' ], entry_points=""" [rasterio.rio_plugins] diff --git a/tests/__pycache__/__init__.cpython-38.pyc b/tests/__pycache__/__init__.cpython-38.pyc deleted file mode 100644 index 1a0d783f..00000000 Binary files a/tests/__pycache__/__init__.cpython-38.pyc and /dev/null differ diff --git a/tests/__pycache__/cmptools.cpython-38.pyc b/tests/__pycache__/cmptools.cpython-38.pyc deleted file mode 100644 index e405e6c3..00000000 Binary files a/tests/__pycache__/cmptools.cpython-38.pyc and /dev/null differ diff --git a/tests/__pycache__/conftest.cpython-38-pytest-8.0.0.pyc b/tests/__pycache__/conftest.cpython-38-pytest-8.0.0.pyc deleted file mode 100644 index a39ff3a2..00000000 Binary files a/tests/__pycache__/conftest.cpython-38-pytest-8.0.0.pyc and /dev/null differ diff --git a/tests/__pycache__/test_algo.cpython-38-pytest-8.0.0.pyc b/tests/__pycache__/test_algo.cpython-38-pytest-8.0.0.pyc deleted file mode 100644 index 50e250df..00000000 Binary files a/tests/__pycache__/test_algo.cpython-38-pytest-8.0.0.pyc and /dev/null differ diff --git a/tests/__pycache__/test_radioindice.cpython-38-pytest-8.0.0.pyc b/tests/__pycache__/test_radioindice.cpython-38-pytest-8.0.0.pyc deleted file mode 100644 index f29bb088..00000000 Binary files a/tests/__pycache__/test_radioindice.cpython-38-pytest-8.0.0.pyc and /dev/null differ diff --git a/tests/__pycache__/test_rasterproc.cpython-38-pytest-8.0.0.pyc b/tests/__pycache__/test_rasterproc.cpython-38-pytest-8.0.0.pyc deleted file mode 100644 index 63f0843b..00000000 Binary files a/tests/__pycache__/test_rasterproc.cpython-38-pytest-8.0.0.pyc and /dev/null differ diff --git a/tests/__pycache__/test_rasterproduct.cpython-38-pytest-8.0.0.pyc b/tests/__pycache__/test_rasterproduct.cpython-38-pytest-8.0.0.pyc deleted file mode 100644 index 5c54a2bf..00000000 Binary files a/tests/__pycache__/test_rasterproduct.cpython-38-pytest-8.0.0.pyc and /dev/null differ diff --git a/tests/__pycache__/test_rastertools.cpython-38-pytest-8.0.0.pyc b/tests/__pycache__/test_rastertools.cpython-38-pytest-8.0.0.pyc deleted file mode 100644 index 17d43c1f..00000000 Binary files a/tests/__pycache__/test_rastertools.cpython-38-pytest-8.0.0.pyc and /dev/null differ diff --git a/tests/__pycache__/test_rastertype.cpython-38-pytest-8.0.0.pyc b/tests/__pycache__/test_rastertype.cpython-38-pytest-8.0.0.pyc deleted file mode 100644 index 6d75fce3..00000000 Binary files a/tests/__pycache__/test_rastertype.cpython-38-pytest-8.0.0.pyc and /dev/null differ diff --git a/tests/__pycache__/test_speed.cpython-38-pytest-8.0.0.pyc b/tests/__pycache__/test_speed.cpython-38-pytest-8.0.0.pyc deleted file mode 100644 index 558deb1e..00000000 Binary files a/tests/__pycache__/test_speed.cpython-38-pytest-8.0.0.pyc and /dev/null differ diff --git a/tests/__pycache__/test_stats.cpython-38-pytest-8.0.0.pyc b/tests/__pycache__/test_stats.cpython-38-pytest-8.0.0.pyc deleted file mode 100644 index 0146104c..00000000 Binary files a/tests/__pycache__/test_stats.cpython-38-pytest-8.0.0.pyc and /dev/null differ diff --git a/tests/__pycache__/test_tiling.cpython-38-pytest-8.0.0.pyc b/tests/__pycache__/test_tiling.cpython-38-pytest-8.0.0.pyc deleted file mode 100644 index 35f30315..00000000 Binary files a/tests/__pycache__/test_tiling.cpython-38-pytest-8.0.0.pyc and /dev/null differ diff --git a/tests/__pycache__/test_utils.cpython-38-pytest-8.0.0.pyc b/tests/__pycache__/test_utils.cpython-38-pytest-8.0.0.pyc deleted file mode 100644 index 60b1a111..00000000 Binary files a/tests/__pycache__/test_utils.cpython-38-pytest-8.0.0.pyc and /dev/null differ diff --git a/tests/__pycache__/test_vector.cpython-38-pytest-8.0.0.pyc b/tests/__pycache__/test_vector.cpython-38-pytest-8.0.0.pyc deleted file mode 100644 index 83c381fb..00000000 Binary files a/tests/__pycache__/test_vector.cpython-38-pytest-8.0.0.pyc and /dev/null differ diff --git a/tests/__pycache__/test_zonalstats.cpython-38-pytest-8.0.0.pyc b/tests/__pycache__/test_zonalstats.cpython-38-pytest-8.0.0.pyc deleted file mode 100644 index e8404e0f..00000000 Binary files a/tests/__pycache__/test_zonalstats.cpython-38-pytest-8.0.0.pyc and /dev/null differ diff --git a/tests/__pycache__/utils4test.cpython-38.pyc b/tests/__pycache__/utils4test.cpython-38.pyc deleted file mode 100644 index 3670b407..00000000 Binary files a/tests/__pycache__/utils4test.cpython-38.pyc and /dev/null differ