Merge pull request #208 from QuTech-Delft/fix-git-hub-actions-for-dev…

…elop

Fix GitHub Actions JS and Python macos/x64 jobs

.github/actions/python-tests/action.yaml

@@ -14,7 +14,8 @@ runs:
     - name: Get latest CMake
       uses: lukka/get-cmake@latest
     - name: Install Python dependencies
-      run: python -m pip install --upgrade pip conan pytest setuptools wheel
+      run: |
+        python -m pip install --upgrade pip conan pytest setuptools wheel
       shell: ${{ inputs.shell }}
     - name: Build
       run: python -m pip install --verbose .

.github/workflows/test.yml

@@ -135,9 +135,10 @@ jobs:
       - name: Install node
         uses: actions/setup-node@v4
         with:
-          node-version: 16.20.0
+          node-version: 16.20.2
       - name: Install conan
-        run: python3 -m pip install --upgrade pip conan
+        run: |
+          pipx install conan
         shell: bash
       - name: Get latest CMake
         uses: lukka/get-cmake@latest

conan/profiles/debug

@@ -7,3 +7,6 @@ libqasm/*:build_type=Debug
 [options]
 libqasm/*:asan_enabled=False
 libqasm/*:build_tests=False
+
+[replace_requires]
+nodejs/*: nodejs/16.20.2

conan/profiles/release

@@ -7,3 +7,6 @@ libqasm/*:build_type=Release
 [options]
 libqasm/*:asan_enabled=False
 libqasm/*:build_tests=False
+
+[replace_requires]
+nodejs/*: nodejs/16.20.2

setup.py

@@ -96,8 +96,6 @@ def run(self):
 
                 ['-o']['libqasm/*:build_python=True']
                 ['-o']['libqasm/*:build_tests=True']
-                # The Python library needs the compatibility headers
-                ['-o']['libqasm/*:compat=True']
                 ['-o']['libqasm/*:cqasm_python_dir=' + re.escape(os.path.dirname(cqasm_target))]
                 ['-o']['libqasm/*:python_dir=' + re.escape(os.path.dirname(target))]
                 ['-o']['libqasm/*:python_ext=' + re.escape(os.path.basename(target))]
@@ -144,12 +142,6 @@ def run(self):
         if platform.system() == "Darwin":
             os.environ['MACOSX_DEPLOYMENT_TARGET'] = '10.10'
         _bdist_wheel.run(self)
-        impl_tag, abi_tag, plat_tag = self.get_tag()
-        archive_basename = "{}-{}-{}-{}".format(self.wheel_dist_name, impl_tag, abi_tag, plat_tag)
-        wheel_path = os.path.join(self.dist_dir, archive_basename + '.whl')
-        if platform.system() == "Darwin":
-            from delocate.delocating import delocate_wheel
-            delocate_wheel(wheel_path)
 
 
 class sdist(_sdist):
@@ -175,17 +167,10 @@ def initialize_options(self):
 
     classifiers=[
         'License :: OSI Approved :: Apache Software License',
-
         'Operating System :: POSIX :: Linux',
         'Operating System :: MacOS',
         'Operating System :: Microsoft :: Windows',
-
         'Programming Language :: Python :: 3 :: Only',
-        'Programming Language :: Python :: 3.5',
-        'Programming Language :: Python :: 3.6',
-        'Programming Language :: Python :: 3.7',
-        'Programming Language :: Python :: 3.8',
-
         'Topic :: Scientific/Engineering'
     ],