Add CI for Windows and Mac

.github/workflows/build.yml

@@ -3,12 +3,12 @@ name: CI
 on: [push, pull_request]
 
 jobs:
-  build:
+  build-Linux:
 
     runs-on: ubuntu-22.04
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4.0.0
 
     - name: Install system dependencies
       run: >
@@ -26,6 +26,7 @@ jobs:
         python-is-python3
         python3-biopython
         python3-dev
+        python3-setuptools
         python3-numpy
         python3-pil
         python3-pytest
@@ -49,3 +50,88 @@ jobs:
     - name: Test
       run: |
         ./install-prefix/bin/pymol -ckqy testing/testing.py --run all
+
+  build-Windows:
+
+    runs-on: windows-latest
+
+    env:
+      CONDA_ROOT: ${{github.workspace}}\..\tmp\mambaforge
+      MAMBAFORGE_EXEC: ${{github.workspace}}\..\tmp\mambaforge.exe
+
+    steps:
+    - uses: actions/[email protected]
+    - name: Download miniconda
+      shell: cmd
+      run: |-
+        if not exist %CONDA_ROOT% mkdir %CONDA_ROOT%
+        curl -L -o %MAMBAFORGE_EXEC% https://github.com/conda-forge/miniforge/releases/download/24.3.0-0/Mambaforge-24.3.0-0-Windows-x86_64.exe
+        start /wait %MAMBAFORGE_EXEC% /S /D=%CONDA_ROOT%
+
+    - name: Set up Miniconda
+      shell: cmd
+      run: |-
+        CALL %CONDA_ROOT%\\Scripts\\activate.bat
+        conda install -y -c conda-forge -c schrodinger python cmake libpng freetype pyqt glew libxml2 numpy catch2=2.13.3 glm libnetcdf collada2gltf biopython pillow msgpack-python pytest
+
+    - name: Conda info
+      shell: cmd
+      run: |-
+        CALL %CONDA_ROOT%\\Scripts\\activate.bat
+        conda info
+
+    - name: Get additional sources
+      shell: cmd
+      run: |
+        git clone --depth 1 https://github.com/rcsb/mmtf-cpp.git
+        cp -R mmtf-cpp/include/mmtf* %CONDA_ROOT%/Library/include/
+        git clone --depth 1 --single-branch --branch cpp_master https://github.com/msgpack/msgpack-c.git
+        cp -R msgpack-c/include/msgpack* %CONDA_ROOT%/Library/include/
+
+    - name: Build PyMOL
+      shell: cmd
+      run: |
+        CALL %CONDA_ROOT%\\Scripts\\activate.bat
+        python setup.py --testing install --prefix=%GITHUB_WORKSPACE%\\install-prefix
+
+    - name: Test
+      shell: cmd
+      run: |
+        CALL %CONDA_ROOT%\\Scripts\\activate.bat
+        %GITHUB_WORKSPACE%\\install-prefix\\Scripts\\pymol.bat -ckqy testing\\testing.py --run all
+
+  build-MacOS:
+
+    runs-on: macos-latest
+
+    env:
+      CONDA_ROOT: "/tmp/miniconda"
+
+    steps:
+    - uses: actions/[email protected]
+    - name: Set up Miniconda and Build
+      run: |-
+        curl -L -o $CONDA_ROOT.sh https://github.com/conda-forge/miniforge/releases/download/24.3.0-0/Mambaforge-MacOSX-x86_64.sh
+        bash $CONDA_ROOT.sh -b -p $CONDA_ROOT
+        export PATH="$CONDA_ROOT/bin:$PATH"
+        conda config --set quiet yes
+        conda install -y -c conda-forge -c schrodinger python cmake libpng freetype pyqt glew libxml2 numpy catch2=2.13.3 glm libnetcdf collada2gltf biopython pillow msgpack-python pytest
+        conda info
+
+    - name: Get additional sources
+      run: |
+        git clone --depth 1 https://github.com/rcsb/mmtf-cpp.git
+        cp -R mmtf-cpp/include/mmtf* ${CONDA_ROOT}/include/
+        git clone --depth 1 --single-branch --branch cpp_master https://github.com/msgpack/msgpack-c.git
+        cp -R msgpack-c/include/msgpack* ${CONDA_ROOT}/include/
+
+    - name: Build PyMOL
+      run: |-
+        export MACOSX_DEPLOYMENT_TARGET=12.0
+        export PATH="$CONDA_ROOT/bin:$PATH"
+        python setup.py install --prefix=${GITHUB_WORKSPACE}/install-prefix
+
+    - name: Test
+      run: |-
+        export PATH="$CONDA_ROOT/bin:$PATH"
+        ${GITHUB_WORKSPACE}/install-prefix/bin/pymol -ckqy testing/testing.py --run all

setup.py

@@ -114,17 +114,18 @@ def is_conda_env():
 
 def guess_msgpackc():
     for prefix in prefix_path:
-        f = os.path.join(prefix, 'include', 'msgpack', 'version_master.h')
+        for suffix in ['h', 'hpp']:
+            f = os.path.join(prefix, 'include', 'msgpack', f'version_master.{suffix}')
 
-        try:
-            m = re.search(r'MSGPACK_VERSION_MAJOR\s+(\d+)', open(f).read())
-        except EnvironmentError:
-            continue
+            try:
+                m = re.search(r'MSGPACK_VERSION_MAJOR\s+(\d+)', open(f).read())
+            except EnvironmentError:
+                continue
 
-        if m is not None:
-            major = int(m.group(1))
-            if major > 1:
-                return 'c++11'
+            if m is not None:
+                major = int(m.group(1))
+                if major > 1:
+                    return 'c++11'
 
     return 'no'
 
@@ -422,7 +423,10 @@ def make_launch_script(self):
     def_macros += [("_PYMOL_NO_MSGPACKC", None)]
 else:
     if options.use_msgpackc == 'c++11':
-        def_macros += [("MMTF_MSGPACK_USE_CPP11", None)]
+        def_macros += [
+            ("MMTF_MSGPACK_USE_CPP11", None),
+            ("MSGPACK_NO_BOOST", None),
+        ]
     else:
         libs += ['msgpackc']
 

testing/tests/api/externing.py

@@ -1,4 +1,5 @@
 import os
+import sys
 from pymol import cmd, testing, stored
 
 def touch(filename):
@@ -9,8 +10,17 @@ class TestExterning(testing.PyMOLTestCase):
     def testCdLsPwd(self):
         with testing.mkdtemp() as path:
             cmd.cd(path)
-            self.assertEqual(os.getcwd(),
-                    os.path.realpath(path))
+            if sys.platform == 'win32':
+                import ctypes
+                def get_long_path_name(path):
+                    buf = ctypes.create_unicode_buffer(260)
+                    ctypes.windll.kernel32.GetLongPathNameW(path, buf, len(buf))
+                    return buf.value
+                self.assertEqual(get_long_path_name(os.getcwd()),
+                                 get_long_path_name(os.path.realpath(path)))
+            else:
+                self.assertEqual(os.getcwd(),
+                        os.path.realpath(path))
 
             touch('foo1.txt')
             touch('foo2.txt')