Revert "Merge branch 'release_6.0.0' into 2663-update-nomenclature-fo…

…r-sesans-plots"

This reverts commit 4153f65, reversing
changes made to b4eba95.

.github/workflows/ci.yml

@@ -109,7 +109,7 @@ jobs:
 
       - name: Fetch sources for sibling projects
         run: |
-          git clone --depth=50 --branch=release_0.9.0 https://github.com/SasView/sasdata.git ../sasdata
+          git clone --depth=50 --branch=master https://github.com/SasView/sasdata.git ../sasdata
           git clone --depth=50 --branch=master https://github.com/SasView/sasmodels.git ../sasmodels
           git clone --depth=50 --branch=master https://github.com/bumps/bumps.git ../bumps
 
@@ -120,7 +120,6 @@ jobs:
           rm -rf dist
           python setup.py clean
           python setup.py build
-          mv build/lib/sasdata/example_data/* ../sasview/src/sas/example_data/
           python -m pip install --no-deps .
 
       - name: Build and install sasmodels
@@ -181,13 +180,17 @@ jobs:
 
       ### Build documentation (if enabled)
 
-      - name: Build sasmodels, sasdata, and bumps docs
+      - name: Install doc-building dependencies
+        if: ${{ matrix.docs }}
+        run: |
+          python -m pip install sphinx
+
+      - name: Build sasmodels and bumps docs
         if: ${{ matrix.docs }}
         run: |
           make -C ../bumps/doc html || true
           mkdir -p ~/.sasmodels/compiled_models
           make -j4 -C ../sasmodels/doc html || true
-          make -C ../sasdata/docs html || true
 
       - name: Build sasview docs
         if: ${{ matrix.docs }}
@@ -237,7 +240,11 @@ jobs:
           security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k DloaAcYP build.keychain
 
           cd installers/dist
+          python ../../build_tools/fix_qt_folder_names_for_codesign.py SasView6.app
+          python ../../build_tools/code_sign_osx.py
+          codesign --verify --options=runtime --entitlements ../../build_tools/entitlements.plist --timestamp --deep --verbose=4 --force --sign "Developer ID Application: European Spallation Source Eric (W2AG9MPZ43)" SasView6.app
           hdiutil create SasView6.dmg -srcfolder SasView6.app -ov -format UDZO
+          codesign -s "Developer ID Application: European Spallation Source Eric (W2AG9MPZ43)" SasView6.dmg
 
       - name: Build sasview installer tarball (Linux)
         if: ${{ matrix.installer && startsWith(matrix.os, 'ubuntu') }}
@@ -254,43 +261,6 @@ jobs:
             installers/dist/sasview-pyinstaller-dist.tar.gz
           if-no-files-found: ignore
 
-      - name: Sign executable and create dmg (OSX)
-        if: ${{ matrix.installer && startsWith(matrix.os, 'macos') }}
-        env:
-          MACOS_CERTIFICATE: ${{ secrets.MACOS_CERTIFICATE }}
-          MACOS_CERTIFICATE_PWD: ${{ secrets.MACOS_CERTIFICATE_PWD }}
-        run: |
-          echo $MACOS_CERTIFICATE | base64 --decode > certificate.p12
-          security create-keychain -p DloaAcYP build.keychain
-          security default-keychain -s build.keychain
-          security unlock-keychain -p DloaAcYP build.keychain
-          security import certificate.p12 -k build.keychain -P $MACOS_CERTIFICATE_PWD -T /usr/bin/codesign
-          security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k DloaAcYP build.keychain
-
-          cd installers/dist
-          python ../../build_tools/fix_qt_folder_names_for_codesign.py SasView6.app
-          python  ../../build_tools/code_sign_osx.py
-          codesign --verify --options=runtime --entitlements ../../build_tools/entitlements.plist --timestamp --deep --verbose=4 --force --sign "Developer ID Application: European Spallation Source Eric (W2AG9MPZ43)" SasView6.app
-          hdiutil create SasView6.dmg -srcfolder SasView6.app -ov -format UDZO
-          codesign -s "Developer ID Application: European Spallation Source Eric (W2AG9MPZ43)" SasView6.dmg
-
-      - name: Notarize Release Build (OSX)
-        if: ${{ matrix.installer && startsWith(matrix.os, 'macos') }}
-        uses: lando/notarize-action@v2
-        with:
-          product-path: "installers/dist/SasView6.dmg"
-          primary-bundle-id: "org.sasview.SasView6"
-          appstore-connect-username: ${{ secrets.NOTARIZATION_USERNAME }}
-          appstore-connect-password: ${{ secrets.NOTARIZATION_PASSWORD }}
-          appstore-connect-team-id: W2AG9MPZ43
-          verbose: True
-
-      - name: Staple Release Build (OSX)
-        if: ${{ matrix.installer && startsWith(matrix.os, 'macos') }}
-        uses: BoundfoxStudios/action-xcode-staple@v1
-        with:
-          product-path: "installers/dist/SasView6.dmg"
-
       - name: Publish installer package
         if: ${{ matrix.installer }}
         uses: actions/upload-artifact@v3
@@ -302,33 +272,6 @@ jobs:
             installers/dist/sasview6.tar.gz
           if-no-files-found: error
 
-      - name: Rename artifacts (Windows)
-        if: ${{ matrix.installer && startsWith(matrix.os, 'windows') }}
-        run: |
-          mv installers/dist/setupSasView.exe installers/dist/setupSasView-6.0.0-alpha-Win64.exe
-
-      - name: Rename artifacts (MacOS)
-        if: ${{ matrix.installer && startsWith(matrix.os, 'macos') }}
-        run: |    
-          mv installers/dist/SasView6.dmg  installers/dist/SasView-6.0.0-alpha-MacOSX.dmg
-
-      - name: Rename artifacts (Linux)
-        if: ${{ matrix.installer && startsWith(matrix.os, 'ubuntu') }}
-        run: |    
-          mv installers/dist/sasview6.tar.gz installers/dist/SasView-6.0.0-alpha-Linux.tar.gz
-
-      - name: Upload Release Installer to GitHub
-        uses: ncipollo/release-action@v1
-        with:
-          draft: false
-          prerelease: true
-          allowUpdates: true
-          replacesArtifacts: true
-          token: ${{ secrets.GITHUB_TOKEN }}
-          artifacts: "installers/dist/setupSasView-6.0.0-alpha-Win64.exe, installers/dist/SasView-6.0.0-alpha-MacOSX.dmg, installers/dist/SasView-6.0.0-alpha-Linux.tar.gz"
-          name: "Release 6.0.0-alpha"
-          bodyFile: "build_tools/release_notes/6.0.0_notes.txt"
-          tag: "v6.0.0-alpha"
 
   test-installer:
     needs: [ build-matrix ]

INSTALL.txt

@@ -1,8 +1,7 @@
 Quick Intro for Building Sasview
 ================================
 
-Note - at the current time sasview will only run in gui form under Python 3.11
-and later.
+Note - at the current time sasview will only run in gui form under Python 3.
 
 Before trying to install and run sasview you'll need to check what
 dependencies are required:

build_tools/code_sign_osx.py

@@ -15,42 +15,13 @@
     "SasView*.app/Contents/Resources/zmq/.dylibs/*.dylib", recursive=True
 )
 
-pyside_QtWebEngineProcessApp = glob.glob(
-    "SasView*.app/Contents/Resources/PySide6/Qt/lib/QtWebEngineCore.framework/Versions/A/Helpers/QtWebEngineProcess.app", recursive=True
-)
-
-pyside_QtWebEngineCore = glob.glob(
-    "SasView*.app/Contents/Resources/PySide6/Qt/lib/QtWebEngineCore.framework/Versions/A/QtWebEngineCore", recursive=True
-)
-
-pyside_QtWebEngineProcess_Helpers = glob.glob(
-    "SasView*.app/Contents/Resources/PySide6/Qt/lib/QtWebEngineCore.framework/Helpers/QtWebEngineProcess.app/Contents/MacOS/QtWebEngineProcess", recursive=True
-)
-
-pyside_Qtlibs = glob.glob(
-    "SasView*.app/Contents/Resources/PySide6/Qt/lib/Qt*.framework/Versions/A/Qt*", recursive=True
-)
-
-#pyside_libs = pyside_QtWebEngineCore + pyside_QtWebEngineProcess
-
 sign_command = ['codesign', '--timestamp', '--options=runtime', '--verify', '--verbose=4', '--force',
-                '--sign',  'Developer ID Application: European Spallation Source Eric (W2AG9MPZ43)']
-
-sign_deep_command = ['codesign', '--timestamp', '--deep', '--options=runtime', '--verify', '--verbose=4', '--force',
-                 '--sign',  'Developer ID Application: European Spallation Source Eric (W2AG9MPZ43)']
+                '--sign', 'Developer ID Application: European Spallation Source Eric (W2AG9MPZ43)']
 
-#Signing QtWebEngineProcess.app first as it is a helper app
-for sfile in itertools.chain(pyside_QtWebEngineProcessApp):
-    sign_deep_command.append(sfile)
-    subprocess.check_call(sign_deep_command)
-    sign_deep_command.pop()
 
-for sfile in itertools.chain(so_list, dylib_list,
-                             dylib_list_resources,
-                             zmq_dylib_list_resources,
-                             pyside_QtWebEngineCore,
-                             pyside_QtWebEngineProcess_Helpers,
-                             pyside_Qtlibs):
+#TODO: Check if it is necesarry to do it per file (one long list maybe enough)
+for sfile in itertools.chain(so_list, dylib_list, dylib_list_resources,
+                             zmq_dylib_list_resources):
     sign_command.append(sfile)
     subprocess.check_call(sign_command)
     sign_command.pop()

build_tools/requirements.txt

@@ -33,4 +33,3 @@ zope
 superqt
 pyopengl
 pyopengl_accelerate
-sphinx