Release 0.8.5

.github/workflows/build.yml

@@ -10,7 +10,7 @@ jobs:
 
     strategy:
       matrix:
-        os: [macos-10.15, ubuntu-20.04, windows-2019]
+        os: [macos-11, ubuntu-20.04, windows-2019]
 
     steps:
       - name: Cancel previous workflow runs
@@ -21,12 +21,13 @@ jobs:
       - name: Check-out repository
         uses: actions/checkout@v2
 
-      - name: Set up non-Python dependences (Linux)
+      - name: Set up non-Python dependencies (Linux)
         if: runner.os == 'Linux'
         run: |
           sudo apt-get -o Acquire::Retries=3 update
           sudo apt-get -o Acquire::Retries=3 install libxcb-xinerama0
           sudo apt-get -o Acquire::Retries=3 install libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-xfixes0
+          sudo apt-get -o Acquire::Retries=3 install libxcb-shape0
           sudo apt-get -o Acquire::Retries=3 install libpulse-mainloop-glib0
         # sudo apt-get install libgfortran4
         # echo "QT_DEBUG_PLUGINS=1" >> $GITHUB_ENV
@@ -54,6 +55,12 @@ jobs:
           python -m pip install toml
           python utils.py --update
 
+      - name: Compile and install pyobjc on macos-11
+        if: runner.os == 'macOS'
+        run: |
+          python -m pip install pyobjc-core --no-binary :all:
+          python -m pip install pyobjc-framework-Cocoa --no-binary :all:
+
       # https://docs.github.com/en/actions/reference/environment-variables
       - name: Declare env variables on push and pull_request
         shell: bash
@@ -79,21 +86,14 @@ jobs:
             ${{ env.PYTHON_PACKAGES_PATH }}
           key: ${{ matrix.os }}-${{ hashFiles('pyproject.toml') }}
 
-      - name: Set up Python packages manager
-        uses: Gr1N/setup-poetry@v7
-
-      - name: Create venv and install Python dependences
-        run: poetry install
+      - name: Install Python dependences
+        run: pip install '.[ci]' --extra-index-url https://easyscience.github.io/pypi
 
       - name: Create freezed python app bundle
-        run: poetry run python ${{ env.SCRIPTS_PATH }}/FreezeApp.py
+        run: python ${{ env.SCRIPTS_PATH }}/FreezeApp.py
 
       - name: Create offline and online app installers from freezed app bundle
-        run: poetry run python ${{ env.SCRIPTS_PATH }}/MakeInstaller.py ${{ secrets.BINARY_SIGN_WIN }} ${{ secrets.CERT_ZIP_PASS }}
-
-      - name: Sign the installer
-        if: False  # temporarily disabled until EC signing is automated
-        run: poetry run python ${{ env.SCRIPTS_PATH }}/Signatures.py ${{ secrets.BINARY_SIGN_WIN }} ${{ secrets.CERT_ZIP_PASS }}
+        run: python ${{ env.SCRIPTS_PATH }}/MakeInstaller.py
 
       - name: Set up screen recording dependencies (macOS)
         if: runner.os == 'macOS'
@@ -119,16 +119,33 @@ jobs:
         run: mkdir -p ~/.local/share/applications/
 
       - name: Install app
-        run: poetry run python ${{ env.SCRIPTS_PATH }}/InstallApp.py
+        run: python ${{ env.SCRIPTS_PATH }}/InstallApp.py
 
       - name: Run app in testmode, record screen and quit
-        run: poetry run python ${{ env.SCRIPTS_PATH }}/RunApp.py --testmode
+        if: runner.os != 'Windows'
+        run: python ${{ env.SCRIPTS_PATH }}/RunApp.py --testmode
+
+      - name: Create bogus tutorial file on Windows
+        if: runner.os == 'Windows'
+        run: echo "Not working currently" > tutorial.mp4
 
       - name: Rename test videos
-        run: poetry run python ${{ env.SCRIPTS_PATH }}/CreateTestVideos.py ${{ env.BRANCH_NAME }}
+        run: >
+          python ${{ env.SCRIPTS_PATH }}/RenameTestVideos.py
+          ${{ env.BRANCH_NAME }}
+
+      - name: Sign app installer
+        if: github.event_name == 'push' && env.BRANCH_NAME == 'master'
+        run: >
+          python ${{ env.SCRIPTS_PATH }}/SignAppInstaller.py
+          ${{ env.BRANCH_NAME }}
+          ${{ secrets.MACOS_CERTIFICATE_ENCODED }} ${{ secrets.MACOS_CERTIFICATE_PASSWORD }}
+          ${{ secrets.APPSTORE_NOTARIZATION_USERNAME }} ${{ secrets.APPSTORE_NOTARIZATION_PASSWORD }}
 
-      - name: Create zip archive of offline app installer
-        run: poetry run python ${{ env.SCRIPTS_PATH }}/ZipArtifacts.py ${{ env.BRANCH_NAME }}
+      - name: Create zip archive of offline app installer for distribution
+        run: >
+          python ${{ env.SCRIPTS_PATH }}/ZipAppInstaller.py
+          ${{ env.BRANCH_NAME }}
 
       - name: Upload zipped offline app installer to GitHub releases (non-master branch)
         if: github.event_name == 'push' && env.BRANCH_NAME != 'master'
@@ -139,7 +156,7 @@ jobs:
           allowUpdates: true
           replacesArtifacts: true
           token: ${{ secrets.GITHUB_TOKEN }}
-          artifacts: "${{ env.DISTRIBUTION_PATH }}/${{ env.APP_NAME }}_*.zip,${{ env.DISTRIBUTION_PATH }}/tutorial_*.mp4"
+          artifacts: "${{ env.DISTRIBUTION_PATH }}/*.zip,${{ env.DISTRIBUTION_PATH }}/*.mp4"
           tag: ${{ env.BRANCH_NAME }}
           name: ${{ env.BRANCH_NAME }}
           bodyFile: "RELEASE.md"
@@ -153,11 +170,14 @@ jobs:
           allowUpdates: true
           replacesArtifacts: true
           token: ${{ secrets.GITHUB_TOKEN }}
-          artifacts: "${{ env.DISTRIBUTION_PATH }}/${{ env.APP_NAME }}_*.zip"
+          artifacts: "${{ env.DISTRIBUTION_PATH }}/*.zip"
           tag: ${{ env.RELEASE_TAG }}
           name: ${{ env.RELEASE_TITLE }}
           bodyFile: "RELEASE.md"
 
       - name: Upload online app installer to repository via FTP
         if: github.event_name == 'push'
-        run: poetry run python ${{ env.SCRIPTS_PATH }}/UploadToFtp.py ${{ env.BRANCH_NAME }} ${{ secrets.APP_REPO_FTP_PASSWORD }}
+        run: >
+          python ${{ env.SCRIPTS_PATH }}/UploadToFtp.py
+          ${{ env.BRANCH_NAME }}
+          ${{ secrets.APP_REPO_FTP_PASSWORD }}

.github/workflows/snapcraft.yml

@@ -0,0 +1,75 @@
+name: Build Snap Image
+
+on: [push, pull_request]
+
+jobs:
+  build_snap:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - uses: snapcore/action-build@v1
+      id: snapcraft
+    - uses: actions/upload-artifact@v3
+      with:
+        name: snap
+        path: ${{ steps.snapcraft.outputs.snap }}
+
+  install_test:
+    runs-on: ubuntu-latest
+    needs: build_snap
+    steps:
+      - uses: actions/download-artifact@v3
+        with:
+          name: snap
+          path: .
+      - name: Install snap
+        run: |
+            sudo snap install --dangerous *.snap
+      - name: Set up screen dependencies (Linux)
+        run: |
+          sudo apt-get -o Acquire::Retries=3 update
+          sudo apt-get -o Acquire::Retries=3 install libxcb-xinerama0
+          sudo apt-get -o Acquire::Retries=3 install libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-xfixes0
+          sudo apt-get -o Acquire::Retries=3 install libpulse-mainloop-glib0
+          sudo apt-get -o Acquire::Retries=3 install libxkbcommon-x11-0
+          Xvfb :0 -screen 0 1920x1080x24 -ac &
+          echo "DISPLAY=:0" >> $GITHUB_ENV
+      - name: Run snap
+        run: |
+            snap run easydiffraction &
+            sleep 60
+
+  upload_snap:
+    runs-on: ubuntu-latest
+    needs: install_test
+    steps:
+      - uses: actions/download-artifact@v3
+        with:
+          name: snap
+          path: .
+
+      - name: Get branch names
+        id: branch-name
+        uses: tj-actions/branch-names@v6
+
+      - name: Get snap filename
+        run: |
+          echo "SNAP_FILENAME=$(ls *.snap)" >> $GITHUB_ENV
+
+      - name: Publish Develop Branch to snapcraft beta
+        if: steps.branch-name.outputs.current_branch == 'develop'
+        uses: snapcore/action-publish@v1
+        env:
+          SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.STORE_LOGIN }}
+        with:
+          snap: ${{ env.SNAP_FILENAME }}
+          release: beta
+
+      - name: Publish Main Branch to snapcraft stable
+        if: steps.branch-name.outputs.current_branch == 'main'
+        uses: snapcore/action-publish@v1
+        env:
+          SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.STORE_LOGIN }}
+        with:
+          snap: ${{ env.SNAP_FILENAME }}
+          release: stable

.gitignore

@@ -47,3 +47,6 @@ temp.prm
 settings.ini*
 .ci/
 .idea/
+
+#Snap
+*.snap

CHANGELOG.md

@@ -1,3 +1,36 @@
+# Version 0.8.5-beta (29 Mar 2023)
+
+### Changes
+
+- GSAS-II calculation engine has been removed.
+- Overall application performance has been significantly improved.
+
+### Bug Fixes
+
+- Summary report export widget is now properly enabled for custom projects.
+- Undo/redo functionality has been fixed.
+
+# Version 0.8.4-beta (28 Jul 2022)
+
+### New Features
+
+- Simulating and fitting polarised data using the [CrysPy](https://github.com/ikibalin/cryspy) calculation engine.
+- Reading CIF files with experimental data and instrumental parameters.
+
+### Changes
+
+- Default example with experimental phase has been modified.
+- Added example projects with polarised data.
+- Windows installer is now 64-bit.
+
+### Bug Fixes
+
+- CrysFML simulation now shows Bragg peaks.
+- Inclusion of the space group setting in calculations.
+- The `Project save` button is now disabled for read-only example projects.
+- The `Reset state` functionality now resets calculator choice.
+- Overall performance has been improved.
+
 # Version 0.8.3-beta (27 Jan 2022)
 
 ### Features

DEPENDENCIES.md

@@ -6,7 +6,6 @@ The following Open Source projects are used in easyDiffraction (if there are any
 
 - [CrysPy](https://github.com/ikibalin/cryspy): [MIT License](https://raw.githubusercontent.com/ikibalin/cryspy/master/LICENSE)
 - [CrysFML](https://code.ill.fr/scientific-software/crysfml): [GNU Lesser General Public License (LGPL)](https://raw.githubusercontent.com/easyScience/libsDarwin/main/libsDarwin/CFML_api/LICENSE)
-- [GSAS-II](https://subversion.xray.aps.anl.gov/trac/pyGSAS): [License](https://raw.githubusercontent.com/easyScience/libsDarwin/main/libsDarwin/GSASII/license2013.txt)
 
 ## Visualization libraries
 
@@ -22,7 +21,3 @@ The following Open Source projects are used in easyDiffraction (if there are any
 - [PT Sans](https://fonts.google.com/specimen/PT+Sans): [SIL Open Font Licence (OFL)](https://scripts.sil.org/OFL)
 - [PT Mono](https://fonts.google.com/specimen/PT+Mono): [SIL Open Font Licence (OFL)](https://scripts.sil.org/OFL)
 - [Font Awesome](https://github.com/FortAwesome/Font-Awesome): [SIL Open Font Licence (OFL)](https://scripts.sil.org/OFL)
-
-## Notes
-
-- GSAS-II: This product includes software produced by UChicago Argonne, LLC under Contract No. DE-AC02-06CH11357 with the Department of Energy.

LICENSE.md

@@ -1,6 +1,6 @@
 BSD 3-Clause License
 
-Copyright (c) 2021-2022, easyDiffraction contributors (https://github.com/easyScience/easyDiffraction).
+Copyright (c) 2021-2023, easyDiffraction contributors (https://github.com/easyScience/easyDiffraction).
 
 All rights reserved.