pye57 0.4.11__tar.gz → 0.4.13__tar.gz

{pye57-0.4.11/src/pye57.egg-info → pye57-0.4.13}/PKG-INFO

@@ -1,10 +1,12 @@
 Metadata-Version: 2.1
 Name: pye57
-Version: 0.4.11
+Version: 0.4.13
 Summary: Python .e57 files reader/writer
 Home-page: https://www.github.com/davidcaron/pye57
 Author: David Caron
 Author-email: dcaron05@gmail.com
+Maintainer: Graham Knapp
+Maintainer-email: graham.knapp@gmail.com
 License: MIT
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python
@@ -94,21 +96,23 @@ translation_x = scan_0["pose"]["translation"]["x"]
 
 ## Installation
 
-If you're on linux or Windows, a wheel should be available.
+On linux, Windows or Apple Silicon:
 
 `python -m pip install pye57`
 
-## Building from source
+On macOS with Intel CPU you can try to build from source (advanced users):
 
-### Cloning the repository and required submodules
+## Building from source (for developers)
 
-Clone a new repository along with the required submodules
+### Cloning the repository with required submodule
+
+Clone a new repository along with the libe57Format submodule
 
 `git clone https://github.com/davidcaron/pye57.git --recursive`
 
 If the repository has already been previously cloned, but without the --recursive flag
 
-```
+```Bash
 cd pye57 # go to the cloned repository
 git submodule init # this will initialise the submodules in the repository
 git submodule update # this will update the submodules in the repository
@@ -126,9 +130,15 @@ To get xerces-c, you can either build from source or if you're using conda:
 
 `conda install -y xerces-c`
 
+### Dependencies on MacOS
+
+To get xerces-c, run:
+
+`bash ./scripts/install_xerces_c.sh`
+
 ### Run `pip install` from the repo source
 
-```
+```Bash
 cd pye57
 python -m pip install .
 ```
@@ -137,6 +147,6 @@ python -m pip install .
 
 Use pip again
 
-```
+```Bash
 python -m pip uninstall pye57
 ```

{pye57-0.4.11 → pye57-0.4.13}/README.md

@@ -68,21 +68,23 @@ translation_x = scan_0["pose"]["translation"]["x"]
 
 ## Installation
 
-If you're on linux or Windows, a wheel should be available.
+On linux, Windows or Apple Silicon:
 
 `python -m pip install pye57`
 
-## Building from source
+On macOS with Intel CPU you can try to build from source (advanced users):
 
-### Cloning the repository and required submodules
+## Building from source (for developers)
 
-Clone a new repository along with the required submodules
+### Cloning the repository with required submodule
+
+Clone a new repository along with the libe57Format submodule
 
 `git clone https://github.com/davidcaron/pye57.git --recursive`
 
 If the repository has already been previously cloned, but without the --recursive flag
 
-```
+```Bash
 cd pye57 # go to the cloned repository
 git submodule init # this will initialise the submodules in the repository
 git submodule update # this will update the submodules in the repository
@@ -100,9 +102,15 @@ To get xerces-c, you can either build from source or if you're using conda:
 
 `conda install -y xerces-c`
 
+### Dependencies on MacOS
+
+To get xerces-c, run:
+
+`bash ./scripts/install_xerces_c.sh`
+
 ### Run `pip install` from the repo source
 
-```
+```Bash
 cd pye57
 python -m pip install .
 ```
@@ -111,6 +119,6 @@ python -m pip install .
 
 Use pip again
 
-```
+```Bash
 python -m pip uninstall pye57
 ```

{pye57-0.4.11 → pye57-0.4.13}/pyproject.toml

@@ -14,5 +14,5 @@ build-backend = "setuptools.build_meta"
 # before-all = "bash scripts/install_xerces_c.sh"
 # before-all = "powershell scripts/install_xerces_c.ps1"
 test-requires = "pytest"
-build = "cp*-manylinux_x86_64 cp*-win_amd64*"
+build = "cp*-manylinux_x86_64 cp*-win_amd64* cp*-macosx*"
 test-command = "python -m pytest {project}/tests"

{pye57-0.4.11 → pye57-0.4.13}/setup.py

@@ -25,6 +25,7 @@ include_dirs = [
     "libE57Format/extern/CRCpp/inc",
 ]
 package_data = []
+extra_link_args = []
 
 if platform.system() == "Windows":
     libraries.append("xerces-c_3")
@@ -43,7 +44,20 @@ if platform.system() == "Windows":
         # include xerces-c dll in the package
         shutil.copy2(xerces_dir / "bin" / "xerces-c_3_2.dll", HERE / "src" / "pye57")
         package_data.append("xerces-c_3_2.dll")
-
+elif platform.system() == "Darwin":
+    xerces_dir = Path("/usr/local/")
+    if xerces_dir.exists():
+        # include xerces-c dylib in the package
+        shutil.copy2(xerces_dir / "lib" / "libxerces-c-3.2.dylib", HERE / "src" / "pye57")
+        library_dirs.append(str(xerces_dir / "lib"))
+        include_dirs.append(str(xerces_dir / "include"))
+        package_data.append("libxerces-c-3.2.dylib")
+    libraries.append("xerces-c")
+    extra_link_args = [
+        f"-Wl,-rpath,@loader_path",
+        f"-L{str(HERE / 'src' / 'pye57')}",
+        "-lxerces-c",
+    ]
 else:
     libraries.append("xerces-c")
 
@@ -56,6 +70,7 @@ ext_modules = [
         libraries=libraries,
         library_dirs=library_dirs,
         language="c++",
+        extra_link_args=extra_link_args,
     ),
 ]
 
@@ -99,6 +114,8 @@ setup(
     version=version,
     author="David Caron",
     author_email="dcaron05@gmail.com",
+    maintainer="Graham Knapp",
+    maintainer_email="graham.knapp@gmail.com",
     url="https://www.github.com/davidcaron/pye57",
     description="Python .e57 files reader/writer",
     long_description=long_description,

pye57-0.4.13/src/pye57/__version__.py

@@ -0,0 +1 @@
+__version__ = "0.4.13"

{pye57-0.4.11 → pye57-0.4.13}/src/pye57/scan_header.py

@@ -5,6 +5,10 @@ from pye57 import libe57
 from pye57.utils import get_fields, get_node
 
 class ScanHeader:
+    """Provides summary statistics for an individual lidar scan in an E57 file.
+
+    Including the number of points, bounds and pose of the scan.
+    """
     def __init__(self, scan_node):
         self.node = scan_node
         points = self.node["points"]
@@ -29,7 +33,11 @@ class ScanHeader:
 
     @property
     def rotation(self) -> np.array:
-        q = Quaternion([e.value() for e in self.node["pose"]["rotation"]])
+        try:
+            rotation = self.node["pose"]["rotation"]
+            q = Quaternion([e.value() for e in rotation])
+        except KeyError:
+            q = Quaternion()
         return q.elements
 
     @property

{pye57-0.4.11 → pye57-0.4.13/src/pye57.egg-info}/PKG-INFO

@@ -1,10 +1,12 @@
 Metadata-Version: 2.1
 Name: pye57
-Version: 0.4.11
+Version: 0.4.13
 Summary: Python .e57 files reader/writer
 Home-page: https://www.github.com/davidcaron/pye57
 Author: David Caron
 Author-email: dcaron05@gmail.com
+Maintainer: Graham Knapp
+Maintainer-email: graham.knapp@gmail.com
 License: MIT
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python
@@ -94,21 +96,23 @@ translation_x = scan_0["pose"]["translation"]["x"]
 
 ## Installation
 
-If you're on linux or Windows, a wheel should be available.
+On linux, Windows or Apple Silicon:
 
 `python -m pip install pye57`
 
-## Building from source
+On macOS with Intel CPU you can try to build from source (advanced users):
 
-### Cloning the repository and required submodules
+## Building from source (for developers)
 
-Clone a new repository along with the required submodules
+### Cloning the repository with required submodule
+
+Clone a new repository along with the libe57Format submodule
 
 `git clone https://github.com/davidcaron/pye57.git --recursive`
 
 If the repository has already been previously cloned, but without the --recursive flag
 
-```
+```Bash
 cd pye57 # go to the cloned repository
 git submodule init # this will initialise the submodules in the repository
 git submodule update # this will update the submodules in the repository
@@ -126,9 +130,15 @@ To get xerces-c, you can either build from source or if you're using conda:
 
 `conda install -y xerces-c`
 
+### Dependencies on MacOS
+
+To get xerces-c, run:
+
+`bash ./scripts/install_xerces_c.sh`
+
 ### Run `pip install` from the repo source
 
-```
+```Bash
 cd pye57
 python -m pip install .
 ```
@@ -137,6 +147,6 @@ python -m pip install .
 
 Use pip again
 
-```
+```Bash
 python -m pip uninstall pye57
 ```

pye57-0.4.11/src/pye57/__version__.py

@@ -1 +0,0 @@
-__version__ = "0.4.11"