Merge pull request #256 from nialov/build-miscellaneous-ci-and-docume…

…ntation-additions

Some miscellaneous ci and documentation additions

.github/workflows/conda.yml

@@ -11,8 +11,7 @@ jobs:
       fail-fast: false
       matrix:
         python-version: ["3.9"]
-        # platform: ["ubuntu-latest", "macos-latest", "windows-latest"]
-        platform: ["ubuntu-latest", "windows-latest"]
+        platform: ["ubuntu-latest", "macos-latest", "windows-latest"]
 
     runs-on: ${{ matrix.platform }}
     defaults:

.github/workflows/docker.yaml

@@ -0,0 +1,21 @@
+on:
+  pull_request:
+  push:
+    branches: [master, main]
+jobs:
+  docker-test:
+    name: Docker install and test
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Build Docker image
+        run: docker build -t eis_toolkit -f ./Dockerfile-docs .
+      - name: Run mkdocs in Docker container
+        run: |
+          docker run -v ./site/pdf/:/eis_toolkit/site/pdf/ --env ENABLE_PDF_EXPORT=1 eis_toolkit poetry run mkdocs build
+      - uses: actions/upload-artifact@v4
+        with:
+          name: document.pdf
+          path: ./site/pdf/document.pdf
+      - name: Run pytest in Docker container
+        run: docker run eis_toolkit poetry run pytest -v

.github/workflows/tests.yml

@@ -25,8 +25,8 @@ jobs:
           sudo apt-add-repository ppa:ubuntugis/ubuntugis-unstable
           sudo apt-get update
           sudo apt-get install gdal-bin libgdal-dev
-          pip install GDAL==3.4.3 pytest
-          if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
+          pip install GDAL==3.4.3 poetry
+          poetry install
       - name: Test with pytest
         run: |
-          pytest
+          poetry run pytest -v

CONTRIBUTING.md

@@ -7,78 +7,119 @@ If an issue for the changes you intend to make does not exist, create one.
 
 1. Raise an issue for the changes you wish to make (or start working on a pre-existing issue).
 2. Make a feature branch for your changes.
-> Name the branch as add_<name_of_the_function_to_be_added>
+
+> Name the branch as <issue_number>-add-<name_of_the_function_to_be_added> or something as descriptive
+
 3. Base your feature branch on the master branch.
+
 > Remember to
-``` console
+
+```bash
 git pull
 ```
-before checking out to a new branch.
-
-4. Do all
-- editing
-- formatting
 
-and
-
-- testing
+before checking out to a new branch.
 
-on the issue-specific branch. Commit only to that branch, do not edit the master branch directly.
+4.  Do all editing formatting and testing on the issue-specific branch.
+    Commit only to that branch, do not edit the master branch directly.
 
-5. Once you have something working, make sure your commits are according to the desired coding style and that your branch contains appropriate documentation and tests.
+5.  Once you have something working, make sure your commits are
+    according to the desired coding style and that your branch contains
+    appropriate documentation and tests.
 
-6. Create a pull request (PR) to merge your branch into the master. In it, summarize your changes.
-Assign a reviewer / reviewers for the PR.
+6.  Create a pull request (PR) to merge your branch into the master. In
+    it, summarize your changes. Assign a reviewer / reviewers for the
+    PR.
 
 ## Terminology and general coding principles
 
 1. Packages
 
-The folders at eis_toolkit/eis_toolkit are called packages. The initial division to packages already exist. Feel free to suggest modifications to the
-current package division via creating an issue for it! Note that the packages can split up into sub packages if needed. Subpackages' names should also represent the main purpose of the modules belonging to the particular subpackage.
+The folders inside `./eis_toolkit` are called subpackages. Feel free to suggest
+modifications to the current subpackage division via creating an issue for it!
+Note that the subpackages can split up into more subpackages if needed.
 
 2. Modules
 
-Module names come from the names of the .py files containing function declarations. You will need to create a new python file for each functionality. The name of the file containing the function declaration(s) for providing the functionality will be essentially the same as the function’s name but instead of the basic form use –ing form if it makes sense.
+Module names come from the names of the .py files containing function
+declarations. You will need to create a new python file for each functionality.
+The name of the file containing the function declaration(s) for providing the
+functionality will be essentially the same as the function’s name but instead
+of the basic form use –ing form if it makes sense.
 
-- Try to create modules in a way that each module contains only one functionality. Split this functionality into two function declarations: one for external use and one (the core functionality) for internal use. See e.g. implementation of [clipping functionality](./eis_toolkit/raster_processing/clipping.py) for reference.
+-   Try to create modules in a way that each module contains only one
+    functionality. Split this functionality into two function
+    declarations: one for external use and one (the core functionality)
+    for internal use. See e.g. implementation of [clipping
+    functionality](./eis_toolkit/raster_processing/clipping.py) for
+    reference.
 
 1. Functions
 
-Name each function according to what it is supposed to do. Try to express the purpose as simplistic as possible. In principle, each function should be creted for executing one task. We prefer modular structure and low hierarchy by trying to avoid nested function declarations. It is highly recommended to call other functions for executing sub tasks.
+Name each function according to what it is supposed to do. Try to
+express the purpose as simplistic as possible. In principle, each
+function should be created for executing one task. We prefer modular
+structure and low hierarchy by trying to avoid nested function
+declarations. It is highly recommended to call other functions for
+executing sub tasks.
 
 **Example (packages, modules & functions):**
 
-Create a function which clips a raster file with polygon -> name the function as clip. Write this function declaration into a new python file with name clipping.py inside of the eis_toolkit/eis_toolkit/raster_processing folder.
+Create a function which clips a raster file with polygon -\> name the
+function as clip. Write this function declaration into a new python file
+with name clipping.py inside of the
+`eis_toolkit/raster_processing` folder.
 
 4. Classes
 
-A class can be defined inside of a module or a function. Class names should begin with a capital letter and follow the CamelCase naming convention: if a class name contains multiple words, the spaces are simply ignored and each separate word begins with capital letters.
+A class can be defined inside of a module or a function. Class names
+should begin with a capital letter and follow the CamelCase naming
+convention: if a class name contains multiple words, the spaces are
+simply ignored and each separate word begins with capital letters.
+
+When implementing the toolkit functions, create classes only when they
+are clearly beneficial.
 
-When implementing the toolkit functions, create classes only when they are clearly beneficial.
-> If you create new custom exception classes, add them directly into eis_toolkit/eis_toolkit/exceptions.py file.
+> If you create new custom exception classes, add them directly into
+> `eis_toolkit/exceptions.py` file.
 
 5. Variables
 
-Avoid using global variables. Name your variables clearly for code maintainability and to avoid bugs.
+Avoid using global variables. Name your variables clearly for code
+maintainability and to avoid bugs.
 
 6. Docstrings and code comments 
 
-For creating docstrings, we rely on google convention (see section 3.8 in [link](https://google.github.io/styleguide/pyguide.html) for more detailed instructions). Let’s try to minimize the amount of code comments. Well defined docstrings should do most of the job with clear code structure.
+For creating docstrings, we rely on google convention (see section 3.8
+in [link](https://google.github.io/styleguide/pyguide.html) for more
+detailed instructions). Let's try to minimize the amount of code
+comments. Well defined docstrings should do most of the job with clear
+code structure.
 
 ## Naming policy
 
-General guidelines about naming policy (applies to package, module, function, class and variable names):
-- all names should be given in English
-- avoid too cryptic names by using complete words
-- if the name consists of multiple words, use snake_case so replace space with underscore character (_) (CamelCase is used for classes as an exception to this rule)
-- do not include special characters, capital letters or numbers into the names unless in case of using numbers in variable names and there is an unavoidable need for it / using numbers significantly increases clarity
+General guidelines about naming policy (applies to package, module,
+function, class and variable names):
+
+-   all names should be given in English
+
+-   avoid too cryptic names by using complete words
+
+-   if the name consists of multiple words, use snake_case so replace
+    space with underscore character (\_) (CamelCase is used for classes
+    as an exception to this rule)
+
+-   do not include special characters, capital letters or numbers into
+    the names unless in case of using numbers in variable names and
+    there is an unavoidable need for it / using numbers significantly
+    increases clarity
 
 ## Code style
 
 ### pre-commit
 
-> Note that pre-commit was added as the primary style check tool later in the project and you need to install and enable it manually! 
+> Note that pre-commit was added as the primary style check tool later
+> in the project and you need to install and enable it manually!
 
 The repository contains a `.pre-commit-config.yaml` file that has configuration
 to run a set of [`pre-commit`](https://pre-commit.com) hooks. As the name
@@ -90,14 +131,14 @@ copy of the repository to run.
 To install `pre-commit` on Debian or Ubuntu -based systems with `apt` as
 the package manager you should be able to run: 
 
-``` console
+```bash
 apt update
 apt install pre-commit
 ```
 
 Alternatively, it can be installed with the system installation of `Python`:
 
-``` console
+```bash
 pip install pre-commit
 ```
 
@@ -107,7 +148,7 @@ methods (<https://pre-commit.com>).
 To enable the hooks locally, enter the directory with your local
 version of `eis_toolkit`, and run:
 
-``` console
+```bash
 pre-commit install
 ```
 
@@ -119,7 +160,7 @@ the commit.
 To disable the hooks and allow commits even with errors pointed out by
 `pre-commit`, you can add the `--no-verify` option to the `git` command-line:
 
-``` console
+```bash
 git commit -m "<message>" --no-verify
 ```
 
@@ -129,33 +170,37 @@ out by `pre-commit`.
 You can also run the hooks without committing on all files. Make sure you save
 any text changes as `pre-commit` can modify unformatted files:
 
-``` console
+```bash
 pre-commit run --all-files
 ```
 
-
 ## Testing
 
-Creating and executing tests improves code quality and helps to ensure that nothing gets broken
-after merging the PR.
+Creating and executing tests improves code quality and helps to ensure
+that nothing gets broken after merging the PR.
 
 > **Please** note that creating and running tests is not optional!
 
 Create a new python file into eis_toolkit/tests folder every time you wish to add a new functionality
 into eis_toolkit. Name that file as <name_of_the_function_to_be_added>_test.py.
 
-In this test file you can declare all test functions related to the new function. Add a function at least for testing that 
-- the new function works as expected (in this you can utilize other software for generating the reference solution) 
-- custom exception class errors get fired when expected
+In this test file you can declare all test functions related to the new
+function. Add a function at least for testing that
 
-You can utilize both local and remote test data in your tests.
-For more information about creating and running tests, take a look at [test instructions](./instructions/testing.md).
+-   the new function works as expected (in this you can utilize other
+    software for generating the reference solution)
+-   custom exception class errors get fired when expected
 
-## Documentation
+You can utilize both local and remote test data in your tests. For more
+information about creating and running tests, take a look at [test
+instructions](./instructions/testing.md).
 
-When adding (or editing) a module, function or class, **please** make sure the documentation stays up-to-date!
-For more information, take a look at [documentation instructions](./instructions/generating_documentation.md).
+## Documentation
 
+When adding (or editing) a module, function or class, **please** make
+sure the documentation stays up-to-date! For more information, take a
+look at [documentation
+instructions](./instructions/generating_documentation.md).
 
 ## Creating a PR
 
@@ -171,22 +216,29 @@ If you act according to the workflow stated in this document, these PR checks
 should always pass since you have already run pytest through before committing :)
 The purpose of this automatic workflow is to double check that nothing gets broken by merge.
 
-However, **IF** you make changes to the dependencies of the repository (i.e. edit
-pyproject.toml file), you need to update requirements.txt file in order to the
-workflow tests to stay up-to-date. You can do this by running the following command
+However, **IF** you make changes to the dependencies of the repository (i.e.
+edit pyproject.toml file), you need to update `poetry.lock` and
+`environment.yaml` files in order to the workflow tests to stay up-to-date. You
+can update the `poetry.lock` file by running the following commands:
 
-```console
-poetry export --without-hashes --format=requirements.txt > requirements.txt
+```bash
+# Not required if you added a package with poetry add command
+poetry lock --no-update
 ```
 
-and committing the new version of the particular file into your feature
-branch. Please note that this file is only used for GitHub workflows, otherwise
-we utilize poetry for dependency  handling.
-
+and committing the new version of the particular file into your feature branch.
+Dependencies in `environment.yaml` need to be kept up to date manually by
+including the same package, which was added to `pyproject.toml`, in
+`environment.yaml`. Please note that this file is only used for GitHub
+workflows, otherwise we utilize poetry for dependency handling.
 
 ## Recent changes
+
 Some changes have been made to the style guide:
-- Use `numbers.Number` as the type when both floats and integers are accepted by functions:
+
+-   Use `numbers.Number` as the type when both floats and integers are
+    accepted by functions:
+
 ```python
 from numbers import Number
 
@@ -196,7 +248,11 @@ def func(int_or_float: Number):
 ```python
 raise InvalidParameterValueException(f"Window size is too small: {height}, {width}.")
 ```
-- Use beartype's decorator for automatic function argument type checking and import types from `beartype.typing` if a warning is raised by beartype on imports from `typing`:
+
+-   Use beartype's decorator for automatic function argument type
+    checking and import types from `beartype.typing` if a warning is
+    raised by beartype on imports from `typing`:
+
 ```python
 from beartype import beartype
 from beartype.typing import Sequence
@@ -229,14 +285,23 @@ def my_function(parameter_1: float, parameter_2: bool, parameter_seq: Sequence):
 ```
 
 ## Developer's checklist
+
 Here are some things to remember while implementing a new tool:
 
-- Create an issue **before or when you start** developing a functionality
-- Adhere to the style guide
-  - Look at existing implementations and copy the form
-  - Enable pre-commit and fix style/other issues according to the error messages
-- Remember to use typing hints
-- Write tests for your functions
-- Add a .md file for you functionality
-- If you think the tool you are developing could use a separate general utility function, make an issue about this need before starting to develop it on your own. Also check if a utility function exists already
-- Remember to implement only the minimum what is required for the tool! With data functions, you can usually assume file reading/writing, nodata handling and other such processes are done before/after executing your tool
+-   Create an issue **before or when you start** developing a
+    functionality
+-   Adhere to the style guide
+    -   Look at existing implementations and copy the form
+    -   Enable pre-commit and fix style/other issues according to the
+        error messages
+-   Remember to use typing hints
+-   Write tests for your functions
+-   Add a .md file for you functionality
+-   If you think the tool you are developing could use a separate
+    general utility function, make an issue about this need before
+    starting to develop it on your own. Also check if a utility function
+    exists already
+-   Remember to implement only the minimum what is required for the
+    tool! With data functions, you can usually assume file
+    reading/writing, nodata handling and other such processes are done
+    before/after executing your tool

Dockerfile-docs

@@ -0,0 +1,26 @@
+FROM ubuntu:22.04
+
+EXPOSE 8888
+EXPOSE 8000
+
+WORKDIR /eis_toolkit
+
+ARG DEBIAN_FRONTEND=noninteractive
+RUN apt-get update && apt-get install -y \
+    libpango-1.0-0 \
+    libharfbuzz0b \
+    libpangoft2-1.0-0 \
+    libgdal-dev \
+    python3-pip
+
+RUN pip install poetry pre-commit
+
+COPY poetry.lock pyproject.toml mkdocs.yml /eis_toolkit/
+COPY docs /eis_toolkit/docs/
+COPY docs_assets /eis_toolkit/docs_assets/
+COPY eis_toolkit /eis_toolkit/eis_toolkit/
+COPY tests /eis_toolkit/tests/
+
+RUN poetry install
+
+# COPY . .