diff --git a/README.md b/README.md index 3ec04e9..1a12cf4 100644 --- a/README.md +++ b/README.md @@ -75,15 +75,6 @@ The `rasters` package is available as a [pip package on PyPi](https://pypi.org/p pip install rasters ``` -### macOS Installation - -If you run into issues with installing the [pykdtree](https://github.com/storpipfugl/pykdtree) dependency on macOS because of the OpenMP library, use [mamba](https://github.com/mamba-org/mamba) to install `pykdtree`: - -``` -mamba install pykdtree -pip install rasters -``` - ## Examples Import the `Raster` class from the `rasters` package. diff --git a/makefile b/makefile index f0d2d12..aa766f9 100644 --- a/makefile +++ b/makefile @@ -1,10 +1,39 @@ +.PHONY: clean test build twine-upload dist environment install uninstall reinstall test + clean: - rm -rf build/ dist/ *.egg-info/ + rm -rf *.o *.out *.log + rm -rf build/ + rm -rf dist/ + rm -rf *.egg-info + rm -rf .pytest_cache + find . -type d -name "__pycache__" -exec rm -rf {} + + +test: + pytest build: python -m build -publish: +twine-upload: + twine upload dist/* + +dist: make clean make build - twine upload dist/* + make twine-upload + +environment: + mamba create -y -n rasters python=3.11 jupyter + +remove-environment: + mamba env remove -y -n rasters + +install: + pip install -e .[dev] + +uninstall: + pip uninstall -y rasters + +reinstall: + make uninstall + make install diff --git a/pyproject.toml b/pyproject.toml index 1cdd13f..410e01d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "rasters" -version = "1.4.3" +version = "1.4.4" description = "raster processing toolkit" readme = "README.md" authors = [ @@ -29,7 +29,7 @@ dependencies = [ "scikit-image", "affine", "astropy", - "pykdtree", + "pykdtree>=1.3.11", "pyresample", "pytest", "scipy", @@ -40,8 +40,11 @@ requires-python = ">=3.11" [project.optional-dependencies] dev = [ + "build", + "jupyter", "pytest>=6.0", - "pytest-cov", # For test coverage reports (optional) + "pytest-cov", + "twine" ] [tool.setuptools.package-data] diff --git a/rasters/version.txt b/rasters/version.txt index 3c80e4f..e1df5de 100644 --- a/rasters/version.txt +++ b/rasters/version.txt @@ -1 +1 @@ -1.4.3 \ No newline at end of file +1.4.4 \ No newline at end of file