ign-borea 0.2.2__tar.gz → 0.2.3__tar.gz

{ign_borea-0.2.2 → ign_borea-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: ign-borea
-Version: 0.2.2
+Version: 0.2.3
 Summary: A package to manipulate orientation files
 Author-email: Antoine Cornu <antoine.cornu@ign.fr>, Nicolas Laurain <nicolas.laurain@ign.fr>
 License: MIT License
@@ -36,13 +36,13 @@ Classifier: Operating System :: MacOS
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: numpy<=1.26.4
+Requires-Dist: numpy
 Requires-Dist: dataclasses
 Requires-Dist: pyproj
 Requires-Dist: scipy
 Requires-Dist: pandas
 Provides-Extra: dev
-Requires-Dist: numpy<=1.26.4; extra == "dev"
+Requires-Dist: numpy; extra == "dev"
 Requires-Dist: pylint; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-shutil; extra == "dev"
@@ -53,6 +53,7 @@ Requires-Dist: dataclasses; extra == "dev"
 Requires-Dist: pyproj; extra == "dev"
 Requires-Dist: scipy; extra == "dev"
 Requires-Dist: pandas; extra == "dev"
+Dynamic: license-file
 
 [![IGNF badge](https://img.shields.io/badge/IGNF-8cbd3a)](https://www.ign.fr/) [![PyPI Downloads](https://img.shields.io/pypi/dm/ign-borea.svg?label=PyPI%20downloads)](
 https://pypi.org/project/ign-borea/)
@@ -83,6 +84,11 @@ pip install GDAL==<GDAL VERSION FROM OGRINFO>
 ```
 You can find more information on [mothergeo-py](https://mothergeo-py.readthedocs.io/en/latest/development/how-to/gdal-ubuntu-pkg.html) if you have problems installing GDAL.
 
+#### Conda/Mamba
+
+You create your conda/mamba environment with pip in it, then in the environment you install borea with `pip install ign-borea` and GDAL with `conda install GDAL` or `mamba install GDAL`.  
+Note: GDAL version must be >= 3.3.2
+
 #### In the QGIS environment
 
 View the doc on [borea github docs/installation/In_QGIS.md](https://github.com/IGNF/Borea/tree/main/docs/installation/In_QGIS.md).
@@ -157,7 +163,7 @@ The DataFrame **pt3d** is a table with 5 column and n line. The id of column mus
 
     it can be created with the function `read_file_pt_dataframe(path_file_pt,header_file,"pt3d")`  
 The dictionary **pinit** which give the initialization point X, Y, Z. A point on the worksite with a z at an approximate flying height. The name of the key in the dictionary is `coor_init`.  
-Example at the end of explanation of function [file](https://github.com/IGNF/Borea/tree/main/docs/functions/Space_resection.md).
+Example at the end of explanation of function [file](https://github.com/IGNF/Borea/tree/main/examples/eg_space_resection.py) l.38.
 
 * You can calculate some control point statistics to see how accurate your site is `stat = Stat(work, pathreturn, control_type)` to init the object and run for all stat with `stat.main_stat_and_save()`. Make stat on function image to world and world to image, if there are data. And save result on *pathreturn/Stat_{Name_worksite}.txt*.
 

{ign_borea-0.2.2 → ign_borea-0.2.3}/README.md

@@ -21,18 +21,32 @@ Why Borea? B for Box and orea is a back slang of aero.
 
 ## Dependency
 
+Borea needs:
+- python >= 3.9
+- gdal >= 3.3.2
+- numpy
+- pyproj
+- scipy
+- pandas
+- dataclasses
+
 ### Conda/Mamba
-For conda/mamba environment the depencency is [borea_dependency/environment.yml](./borea_dependency/environment.yml).  
+For conda/mamba environment is [borea_dependency/environment.yml](./borea_dependency/environment.yml).  
 
 ### Pip venv
-For pip environment (venv) the depencency is [borea_dependency/requirements.txt](./borea_dependency/requirements.txt)  
+For pip environment (venv) is [borea_dependency/requirements.txt](./borea_dependency/requirements.txt)  
 and you need to install `libgdal-dev` and `GDAL>=3.3.2`.
 
 ## Installation
 
-You need to retrieve the repository with ```git clone``` and install the environment. By ```conda``` or ```mamba``` with ```environment.yml``` or ```pip``` with ```requirements.txt```.
+There are two ways to install Borea with the repository `git clone` or with pip `pip install ign-borea` [doc](./README_borea_lib.md).
+
+With **the repository**, you also need to install the environment.  
+With **pip** the environment comes with it but does not contain GDAL, which you have to install yourself.
 
+### Installation of the environment
 #### Conda/Mamba
+GDAL is contained and installed in the conda/mamba environment.
 ```
 conda env create -f ./borea_dependency/environment.yaml
 ```
@@ -41,20 +55,18 @@ mamba env create -f ./borea_dependency/environment.yaml
 ```
 
 #### Pip
-The package exists on pip with `pip install ign-borea` without GDAL
-
+GDAL is not included in the pip environment, so you have to install it yourself.
 ```
 pip install -r ./borea_dependency/requirements.txt
 sudo apt-get install libgdal-dev
 ```
-Please note that the `GDAL` version depends on the `libgdal-dev` version.
+You need the version of `GDAL` and you can get it back with:
 ```
-apt-cache show libgdal-dev
-# or if you are ogr
-ogrinfo --version
+gdalinfo --version
 ```
+after
 ```
-pip install GDAL==<GDAL VERSION FROM OGRINFO>
+pip install GDAL==<GDAL VERSION>
 ```
 You can find more information on [mothergeo-py](https://mothergeo-py.readthedocs.io/en/latest/development/how-to/gdal-ubuntu-pkg.html) if you have problems installing GDAL.
 

{ign_borea-0.2.2 → ign_borea-0.2.3}/README_borea_lib.md

@@ -27,6 +27,11 @@ pip install GDAL==<GDAL VERSION FROM OGRINFO>
 ```
 You can find more information on [mothergeo-py](https://mothergeo-py.readthedocs.io/en/latest/development/how-to/gdal-ubuntu-pkg.html) if you have problems installing GDAL.
 
+#### Conda/Mamba
+
+You create your conda/mamba environment with pip in it, then in the environment you install borea with `pip install ign-borea` and GDAL with `conda install GDAL` or `mamba install GDAL`.  
+Note: GDAL version must be >= 3.3.2
+
 #### In the QGIS environment
 
 View the doc on [borea github docs/installation/In_QGIS.md](https://github.com/IGNF/Borea/tree/main/docs/installation/In_QGIS.md).
@@ -101,7 +106,7 @@ The DataFrame **pt3d** is a table with 5 column and n line. The id of column mus
 
     it can be created with the function `read_file_pt_dataframe(path_file_pt,header_file,"pt3d")`  
 The dictionary **pinit** which give the initialization point X, Y, Z. A point on the worksite with a z at an approximate flying height. The name of the key in the dictionary is `coor_init`.  
-Example at the end of explanation of function [file](https://github.com/IGNF/Borea/tree/main/docs/functions/Space_resection.md).
+Example at the end of explanation of function [file](https://github.com/IGNF/Borea/tree/main/examples/eg_space_resection.py) l.38.
 
 * You can calculate some control point statistics to see how accurate your site is `stat = Stat(work, pathreturn, control_type)` to init the object and run for all stat with `stat.main_stat_and_save()`. Make stat on function image to world and world to image, if there are data. And save result on *pathreturn/Stat_{Name_worksite}.txt*.
 

{ign_borea-0.2.2 → ign_borea-0.2.3}/borea/datastruct/shot.py

@@ -9,7 +9,7 @@ from borea.geodesy.local_euclidean_proj import LocalEuclideanProj
 from borea.utils.check.check_order_axe import check_order_axe
 
 
-# pylint: disable=too-many-instance-attributes too-many-arguments too-many-positional-arguments
+# pylint: disable=too-many-instance-attributes, too-many-arguments, too-many-positional-arguments
 class Shot:
     """
     Shot class definition.

{ign_borea-0.2.2 → ign_borea-0.2.3}/borea/datastruct/workdata.py

@@ -35,7 +35,7 @@ class Workdata:
         self.approxeucli = False
         self.epsg_output = False
 
-    # pylint: disable-next=too-many-arguments too-many-positional-arguments
+    # pylint: disable-next=too-many-arguments, too-many-positional-arguments
     def add_shot(self, name_shot: str, pos_shot: np.ndarray,
                  ori_shot: np.ndarray, name_cam: str,
                  unit_angle: str, linear_alteration: bool,
@@ -83,7 +83,7 @@ class Workdata:
 
         ProjEngine().set_epsg(epsg, path_geoid, epsg_output)
 
-    # pylint: disable-next=too-many-arguments too-many-positional-arguments
+    # pylint: disable-next=too-many-arguments, too-many-positional-arguments
     def add_camera(self, name_camera: str, ppax: float, ppay: float,
                    focal: float, width: int, height: int) -> None:
         """
@@ -150,7 +150,7 @@ class Workdata:
         try:
             self.shots[name_shot]
         except KeyError as e_info:
-            raise ValueError(f"The shot {name_shot} doesn't exist in list of shots.") from e_info
+            raise KeyError(f"The shot {name_shot} doesn't exist in list of shots.") from e_info
 
         if name_point not in self.gcp2d:
             self.gcp2d[name_point] = []

{ign_borea-0.2.2 → ign_borea-0.2.3}/borea/geodesy/proj_engine.py

@@ -9,7 +9,7 @@ from borea.geodesy.transform_geodesy import TransformGeodesy
 from borea.utils.singleton.singleton import Singleton
 
 
-# pylint: disable=unpacking-non-sequence
+# pylint: disable=unpacking-non-sequence, unsubscriptable-object
 @dataclass
 class ProjEngine(metaclass=Singleton):
     """

{ign_borea-0.2.2 → ign_borea-0.2.3}/borea/geodesy/transform_geodesy.py

@@ -1,6 +1,7 @@
 """
 Module for class ProjEngine, transform geodesy
 """
+# pylint: disable=unsubscriptable-object
 import pyproj
 import numpy as np
 import pandas as pd
@@ -235,6 +236,7 @@ class TransformGeodesy():
                                                                 df_pt['y'],
                                                                 df_pt['z']]))
 
+        # pylint: disable-next=unpacking-non-sequence
         df_pt["x"], df_pt["y"] = self.proj_to_proj_out(df_pt['x'], df_pt['y'])
 
         return df_pt

{ign_borea-0.2.2 → ign_borea-0.2.3}/borea/worksite/worksite.py

@@ -173,7 +173,7 @@ class Worksite(Workdata):
                                                                    self.type_z_shot, False)[2]
                 shot.set_z_nadir(z_nadir)
 
-    # pylint: disable-next=too-many-arguments too-many-positional-arguments
+    # pylint: disable-next=too-many-arguments, too-many-positional-arguments
     def set_unit_output(self, type_z: str = None, unit_angle: str = None,
                         linear_alteration: bool = None, order_axe: str = None,
                         proj_output: bool = True) -> None:

{ign_borea-0.2.2 → ign_borea-0.2.3}/borea_dependency/requirements-dev.txt

@@ -1,4 +1,4 @@
-numpy <= 1.26.4
+numpy
 pylint
 pytest
 pytest-shutil

{ign_borea-0.2.2 → ign_borea-0.2.3}/borea_dependency/requirements.txt

@@ -1,4 +1,4 @@
-numpy <= 1.26.4
+numpy
 dataclasses
 pyproj
 scipy

{ign_borea-0.2.2 → ign_borea-0.2.3}/ign_borea.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: ign-borea
-Version: 0.2.2
+Version: 0.2.3
 Summary: A package to manipulate orientation files
 Author-email: Antoine Cornu <antoine.cornu@ign.fr>, Nicolas Laurain <nicolas.laurain@ign.fr>
 License: MIT License
@@ -36,13 +36,13 @@ Classifier: Operating System :: MacOS
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: numpy<=1.26.4
+Requires-Dist: numpy
 Requires-Dist: dataclasses
 Requires-Dist: pyproj
 Requires-Dist: scipy
 Requires-Dist: pandas
 Provides-Extra: dev
-Requires-Dist: numpy<=1.26.4; extra == "dev"
+Requires-Dist: numpy; extra == "dev"
 Requires-Dist: pylint; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-shutil; extra == "dev"
@@ -53,6 +53,7 @@ Requires-Dist: dataclasses; extra == "dev"
 Requires-Dist: pyproj; extra == "dev"
 Requires-Dist: scipy; extra == "dev"
 Requires-Dist: pandas; extra == "dev"
+Dynamic: license-file
 
 [![IGNF badge](https://img.shields.io/badge/IGNF-8cbd3a)](https://www.ign.fr/) [![PyPI Downloads](https://img.shields.io/pypi/dm/ign-borea.svg?label=PyPI%20downloads)](
 https://pypi.org/project/ign-borea/)
@@ -83,6 +84,11 @@ pip install GDAL==<GDAL VERSION FROM OGRINFO>
 ```
 You can find more information on [mothergeo-py](https://mothergeo-py.readthedocs.io/en/latest/development/how-to/gdal-ubuntu-pkg.html) if you have problems installing GDAL.
 
+#### Conda/Mamba
+
+You create your conda/mamba environment with pip in it, then in the environment you install borea with `pip install ign-borea` and GDAL with `conda install GDAL` or `mamba install GDAL`.  
+Note: GDAL version must be >= 3.3.2
+
 #### In the QGIS environment
 
 View the doc on [borea github docs/installation/In_QGIS.md](https://github.com/IGNF/Borea/tree/main/docs/installation/In_QGIS.md).
@@ -157,7 +163,7 @@ The DataFrame **pt3d** is a table with 5 column and n line. The id of column mus
 
     it can be created with the function `read_file_pt_dataframe(path_file_pt,header_file,"pt3d")`  
 The dictionary **pinit** which give the initialization point X, Y, Z. A point on the worksite with a z at an approximate flying height. The name of the key in the dictionary is `coor_init`.  
-Example at the end of explanation of function [file](https://github.com/IGNF/Borea/tree/main/docs/functions/Space_resection.md).
+Example at the end of explanation of function [file](https://github.com/IGNF/Borea/tree/main/examples/eg_space_resection.py) l.38.
 
 * You can calculate some control point statistics to see how accurate your site is `stat = Stat(work, pathreturn, control_type)` to init the object and run for all stat with `stat.main_stat_and_save()`. Make stat on function image to world and world to image, if there are data. And save result on *pathreturn/Stat_{Name_worksite}.txt*.
 

{ign_borea-0.2.2 → ign_borea-0.2.3}/ign_borea.egg-info/requires.txt

@@ -1,11 +1,11 @@
-numpy<=1.26.4
+numpy
 dataclasses
 pyproj
 scipy
 pandas
 
 [dev]
-numpy<=1.26.4
+numpy
 pylint
 pytest
 pytest-shutil

{ign_borea-0.2.2 → ign_borea-0.2.3}/pyproject.toml

@@ -5,7 +5,7 @@ requires = ["setuptools>=61.0"]
 [project]
 dynamic = ["dependencies", "optional-dependencies"]
 name = "ign-borea"
-version = "0.2.2"
+version = "0.2.3"
 authors = [
   { name="Antoine Cornu", email="antoine.cornu@ign.fr" },
   { name="Nicolas Laurain", email="nicolas.laurain@ign.fr"}