build_macos.yaml

.github/workflows/build_macos.yml

@@ -0,0 +1,30 @@
+name: Build macOS Package
+on:
+  workflow_dispatch:
+  pull_request:
+jobs:
+  macos_build:
+    name: Build a MacOS app
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Setup Python
+        uses: actions/setup-python@v4
+        with:
+          # Version range or exact version of a Python version to use, using SemVer's version range syntax.
+          python-version: 3.11
+          # Used to specify a package manager for caching in the default directory. Supported values: pip, pipenv, poetry.
+          cache: pip
+          # The target architecture (x86, x64) of the Python interpreter.
+          architecture: x64
+
+      - name: Install Python dependencies
+        run: |
+          pip install -r requirements.txt
+          pip install -r requirements-dev.txt
+
+      - name: Build with py2app
+        run: python3 setup.py py2app
+
+

DisplayCAL/setup.py

@@ -308,7 +308,7 @@ def create_app_symlinks(dist_dir, scripts):
                     tgt = os.path.join(toolcontents, entry, subentry)
                     if subentry == "main.py":
                         # py2app
-                        with open(src, "rb") as main_in:
+                        with open(src, "r") as main_in:
                             py = main_in.read()
                         py = py.replace("main()", "main(%r)" % script[len(name) + 1:])
                         with open(tgt, "wb") as main_out:
@@ -478,11 +478,11 @@ def setup():
             pass
         try:
             import setuptools
-            from setuptools import setup, Extension
+            from setuptools import setup, Extension, find_packages
 
             setuptools = True
             print("using setuptools")
-            current_findall = setuptools.findall
+            current_findall = find_packages
         except ImportError:
             pass
     else:
@@ -1624,38 +1624,40 @@ def copy_package_data(self, package, target_dir):
         if dry_run or help:
             return
 
-        if do_py2app:
-            frameworks_dir = os.path.join(
-                dist_dir, name + ".app", "Contents", "Frameworks"
-            )
-            lib_dynload_dir = os.path.join(
-                dist_dir,
-                name + ".app",
-                "Contents",
-                "Resources",
-                "lib",
-                "python%s.%s" % sys.version_info[:2],
-                "lib-dynload",
-            )
-            # Fix Pillow (PIL) dylibs not being included
-            pil_dylibs = os.path.join(lib_dynload_dir, "PIL", ".dylibs")
-            if not os.path.isdir(pil_dylibs):
-                import PIL
+            # if do_py2app:
+            #     frameworks_dir = os.path.join(
+            #         dist_dir, name + ".app", "Contents", "Frameworks"
+            #     )
+            #     lib_dynload_dir = os.path.join(
+            #         dist_dir,
+            #         name + ".app",
+            #         "Contents",
+            #         "Resources",
+            #         "lib",
+            #         "python%s.%s" % sys.version_info[:2],
+            #         "lib-dynload",
+            #     )
+            #     # Fix Pillow (PIL) dylibs not being included
+            #     pil_dylibs = os.path.join(lib_dynload_dir, "PIL", ".dylibs")
+            #     if not os.path.isdir(pil_dylibs):
+            #         import PIL
+
+            #         pil_installed_dylibs = os.path.join(
+            #             os.path.dirname(PIL.__file__), ".dylibs"
+            #         )
+            #         print("Copying", pil_installed_dylibs, "->", pil_dylibs)
+            #         shutil.copytree(pil_installed_dylibs, pil_dylibs)
+            #         for entry in os.listdir(pil_dylibs):
+            #             print(os.path.join(pil_dylibs, entry))
+            #         # Remove wrongly included frameworks
+            #         dylibs_entries = os.listdir(pil_installed_dylibs)
+            #         print("frameworks_dir", frameworks_dir)
+            #         for entry in os.listdir(frameworks_dir):
+            #             if entry in dylibs_entries:
+            #                 dylib = os.path.join(frameworks_dir, entry)
+            #                 print("Removing", dylib)
+            #                 os.remove(dylib)
 
-                pil_installed_dylibs = os.path.join(
-                    os.path.dirname(PIL.__file__), ".dylibs"
-                )
-                print("Copying", pil_installed_dylibs, "->", pil_dylibs)
-                shutil.copytree(pil_installed_dylibs, pil_dylibs)
-                for entry in os.listdir(pil_dylibs):
-                    print(os.path.join(pil_dylibs, entry))
-                # Remove wrongly included frameworks
-                dylibs_entries = os.listdir(pil_installed_dylibs)
-                for entry in os.listdir(frameworks_dir):
-                    if entry in dylibs_entries:
-                        dylib = os.path.join(frameworks_dir, entry)
-                        print("Removing", dylib)
-                        os.remove(dylib)
             import wx
 
             if wx.VERSION >= (4,):

requirements-dev.txt

@@ -19,3 +19,5 @@ pytest-xdist
 snowballstemmer
 twine
 yappi
+py2app
+wheel

setup.cfg

@@ -1,7 +1,7 @@
 [metadata]
 name=DisplayCAL
 version=attr: DisplayCAL.VERSION
-license_file = LICENSE.txt
+license_files = LICENSE.txt
 
 [options]
 packages = find: