pye57 0.4.5__tar.gz → 0.4.6__tar.gz

{pye57-0.4.5/src/pye57.egg-info → pye57-0.4.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pye57
-Version: 0.4.5
+Version: 0.4.6
 Summary: Python .e57 files reader/writer
 Home-page: https://www.github.com/davidcaron/pye57
 Author: David Caron
@@ -94,21 +94,21 @@ translation_x = scan_0["pose"]["translation"]["x"]
 
 ## Installation
 
-If you're on linux or Windows, a wheel should be available.
+On linux Windows or macos:
 
 `python -m pip install pye57`
 
-## Building from source
+## Building from source (for developers)
 
-### Cloning the repository and required submodules
+### Cloning the repository with required submodule
 
-Clone a new repository along with the required submodules
+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
@@ -128,7 +128,7 @@ To get xerces-c, you can either build from source or if you're using conda:
 
 ### Run `pip install` from the repo source
 
-```
+```Bash
 cd pye57
 python -m pip install .
 ```
@@ -137,6 +137,6 @@ python -m pip install .
 
 Use pip again
 
-```
+```Bash
 python -m pip uninstall pye57
 ```

{pye57-0.4.5 → pye57-0.4.6}/README.md

@@ -68,21 +68,21 @@ translation_x = scan_0["pose"]["translation"]["x"]
 
 ## Installation
 
-If you're on linux or Windows, a wheel should be available.
+On linux Windows or macos:
 
 `python -m pip install pye57`
 
-## Building from source
+## Building from source (for developers)
 
-### Cloning the repository and required submodules
+### Cloning the repository with required submodule
 
-Clone a new repository along with the required submodules
+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
@@ -102,7 +102,7 @@ To get xerces-c, you can either build from source or if you're using conda:
 
 ### Run `pip install` from the repo source
 
-```
+```Bash
 cd pye57
 python -m pip install .
 ```
@@ -111,6 +111,6 @@ python -m pip install .
 
 Use pip again
 
-```
+```Bash
 python -m pip uninstall pye57
 ```

{pye57-0.4.5 → pye57-0.4.6}/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.5 → pye57-0.4.6}/setup.py

@@ -43,7 +43,15 @@ 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.a")
+    libraries.append("xerces-c")
 else:
     libraries.append("xerces-c")
 
@@ -56,6 +64,9 @@ ext_modules = [
         libraries=libraries,
         library_dirs=library_dirs,
         language="c++",
+        extra_link_args=[
+            f"-Wl,-rpath,@loader_path",
+        ],
     ),
 ]
 

pye57-0.4.6/src/pye57/__version__.py

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

{pye57-0.4.5 → pye57-0.4.6}/src/pye57/libe57_wrapper.cpp

@@ -271,6 +271,7 @@ PYBIND11_MODULE(libe57, m) {
                                             bool doScaling,
                                             size_t stride=0) {
         py::buffer_info info = np_array.request();
+        const std::string dtype = info.format;
 
         if (info.ndim != 1)
             throw std::runtime_error("Incompatible buffer dimension!");
@@ -279,24 +280,26 @@ PYBIND11_MODULE(libe57, m) {
             new (&s) SourceDestBuffer(imf, pathName, static_cast<int8_t *>(info.ptr), capacity, doConversion, doScaling, (stride == 0) ? sizeof(int8_t) : stride);
         else if (info.format == "B")
             new (&s) SourceDestBuffer(imf, pathName, static_cast<uint8_t *>(info.ptr), capacity, doConversion, doScaling, (stride == 0) ? sizeof(uint8_t) : stride);
-        else if (info.format == "h")
+        // Handle fixed or native byte order from https://docs.python.org/3/library/struct.html
+        // Note - these may be platform dependent. Could they cause strange bugs on some platforms ?
+        else if (dtype == "h" || dtype == "=h")
             new (&s) SourceDestBuffer(imf, pathName, static_cast<int16_t *>(info.ptr), capacity, doConversion, doScaling, (stride == 0) ? sizeof(int16_t) : stride);
-        else if (info.format == "H")
+        else if (dtype == "H" || dtype == "=H")
             new (&s) SourceDestBuffer(imf, pathName, static_cast<uint16_t *>(info.ptr), capacity, doConversion, doScaling, (stride == 0) ? sizeof(uint16_t) : stride);
-        else if (info.format == "l")
+        else if (dtype == "l" || dtype == "=l")
             new (&s) SourceDestBuffer(imf, pathName, static_cast<int32_t *>(info.ptr), capacity, doConversion, doScaling, (stride == 0) ? sizeof(int32_t) : stride);
-        else if (info.format == "L")
+        else if (dtype == "L" || dtype == "=L")
             new (&s) SourceDestBuffer(imf, pathName, static_cast<uint32_t *>(info.ptr), capacity, doConversion, doScaling, (stride == 0) ? sizeof(uint32_t) : stride);
-        else if (info.format == "q")
+        else if (dtype == "q" || dtype == "=q")
             new (&s) SourceDestBuffer(imf, pathName, static_cast<int64_t *>(info.ptr), capacity, doConversion, doScaling, (stride == 0) ? sizeof(int64_t) : stride);
-        else if (info.format == "?")
+        else if (dtype == "?")
             new (&s) SourceDestBuffer(imf, pathName, static_cast<bool *>(info.ptr), capacity, doConversion, doScaling, (stride == 0) ? sizeof(bool) : stride);
-        else if (info.format == "f")
+        else if (dtype == "f" || dtype == "=f")
             new (&s) SourceDestBuffer(imf, pathName, static_cast<float *>(info.ptr), capacity, doConversion, doScaling, (stride == 0) ? sizeof(float) : stride);
-        else if (info.format == "d")
+        else if (dtype == "d" || dtype == "=d")
             new (&s) SourceDestBuffer(imf, pathName, static_cast<double *>(info.ptr), capacity, doConversion, doScaling, (stride == 0) ? sizeof(double) : stride);
         else
-            throw py::value_error("Incompatible type (integers: bBhHlLq, bool: ?, floats: fd)");
+            throw py::value_error("Incompatible type (integers: bBhHlLq, bool: ?, floats: fd), got: " + dtype);
     },
     "destImageFile"_a, "pathName"_a, "b"_a, "capacity"_a, "doConversion"_a=false, "doScaling"_a=false, "stride"_a=0);
 //    cls_SourceDestBuffer.def(py::init<e57::ImageFile, const std::string, int8_t *, const size_t, bool, bool, size_t>(), "destImageFile"_a, "pathName"_a, "b"_a, "capacity"_a, "doConversion"_a=false, "doScaling"_a=false, "stride"_a=sizeof(int8_t));

{pye57-0.4.5 → pye57-0.4.6/src/pye57.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pye57
-Version: 0.4.5
+Version: 0.4.6
 Summary: Python .e57 files reader/writer
 Home-page: https://www.github.com/davidcaron/pye57
 Author: David Caron
@@ -94,21 +94,21 @@ translation_x = scan_0["pose"]["translation"]["x"]
 
 ## Installation
 
-If you're on linux or Windows, a wheel should be available.
+On linux Windows or macos:
 
 `python -m pip install pye57`
 
-## Building from source
+## Building from source (for developers)
 
-### Cloning the repository and required submodules
+### Cloning the repository with required submodule
 
-Clone a new repository along with the required submodules
+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
@@ -128,7 +128,7 @@ To get xerces-c, you can either build from source or if you're using conda:
 
 ### Run `pip install` from the repo source
 
-```
+```Bash
 cd pye57
 python -m pip install .
 ```
@@ -137,6 +137,6 @@ python -m pip install .
 
 Use pip again
 
-```
+```Bash
 python -m pip uninstall pye57
 ```

pye57-0.4.5/src/pye57/__version__.py

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