Try reverting cibuildwheel command to FS2

.github/workflows/build_and_test.yaml

@@ -38,7 +38,7 @@ jobs:
       - name: set up rust
         uses: dtolnay/rust-toolchain@stable
       - run: |
-          rustup target add aarch64-apple-darwin x86_64-apple-darwin
+          rustup target add aarch64-apple-darwin
         if: matrix.os == 'macos'
         shell: bash
       - name: install python dependencies
@@ -54,6 +54,31 @@ jobs:
         run: |
           pip install -U setuptools-rust
           python -c "import setuptools; setuptools.setup()" sdist
+      #- name: build ${{ matrix.platform || matrix.os }} binaries
+      #  run: cibuildwheel --output-dir dist
+      #  env:
+      #    CIBW_BUILD: "cp3${{ matrix.python-version }}-*"
+      #    CIBW_SKIP: "*-win32 *-musllinux* *i686 *ppc64le *s390x *aarch64"
+      #    CIBW_PLATFORM: ${{ matrix.platform || matrix.os }}
+      #    # TODO: why doesn't pytest work with cibuildwheel?
+      #    # CIBW_TEST_COMMAND: "pytest -v {project}/python/fastsim/tests"
+      #    CIBW_TEST_COMMAND: "python -m unittest discover {project}/python/fastsim/tests"
+      #    CIBW_ARCHS_MACOS: "universal2"
+      #    # see https://cibuildwheel.readthedocs.io/en/stable/faq/#universal2
+      #    CIBW_TEST_SKIP: "*_arm64 *_universal2:arm64"
+      #    CIBW_ENVIRONMENT: 'PATH="$HOME/.cargo/bin:$PATH"'
+      #    CIBW_ENVIRONMENT_WINDOWS: 'PATH="$UserProfile\.cargo\bin;$PATH"'
+      #    CIBW_MANYLINUX_X86_64_IMAGE: "manylinux2014"
+      #    CIBW_MANYLINUX_I686_IMAGE: "manylinux2014"
+      #    CIBW_BEFORE_BUILD: >
+      #      python -m pip install -U setuptools-rust &&
+      #      rustup default stable &&
+      #      rustup show
+      #    CIBW_BEFORE_BUILD_LINUX: >
+      #      yum -y install openssl openssl-devel &&
+      #      pip install -U setuptools-rust &&
+      #      curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain=nightly --profile=minimal -y &&
+      #      rustup show
       - name: build ${{ matrix.platform || matrix.os }} binaries
         run: cibuildwheel --output-dir dist
         env:
@@ -63,15 +88,15 @@ jobs:
           # TODO: why doesn't pytest work with cibuildwheel?
           # CIBW_TEST_COMMAND: "pytest -v {project}/python/fastsim/tests"
           CIBW_TEST_COMMAND: "python -m unittest discover {project}/python/fastsim/tests"
-          CIBW_ARCHS_MACOS: "arm64 universal2"
+          CIBW_ARCHS_MACOS: "universal2"
           # see https://cibuildwheel.readthedocs.io/en/stable/faq/#universal2
-          CIBW_TEST_SKIP: "*_arm64 *_universal2:arm64"
+          CIBW_TEST_SKIP: "*_universal2:arm64"
           CIBW_ENVIRONMENT: 'PATH="$HOME/.cargo/bin:$PATH"'
           CIBW_ENVIRONMENT_WINDOWS: 'PATH="$UserProfile\.cargo\bin;$PATH"'
           CIBW_MANYLINUX_X86_64_IMAGE: "manylinux2014"
           CIBW_MANYLINUX_I686_IMAGE: "manylinux2014"
           CIBW_BEFORE_BUILD: >
-            python -m pip install -U setuptools-rust &&
+            pip install -U setuptools-rust &&
             rustup default stable &&
             rustup show
           CIBW_BEFORE_BUILD_LINUX: >