Updates python version to 3.10 and updates dependencies (#108)

.github/workflows/main.yml

@@ -18,11 +18,11 @@ jobs:
     runs-on: ${{ matrix.platform }}
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python 3.9
-      uses: actions/setup-python@v2
+    - uses: actions/checkout@v3
+    - name: Set up Python 3.10
+      uses: actions/setup-python@v4
       with:
-        python-version: 3.9
+        python-version: '3.10'
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
@@ -44,12 +44,12 @@ jobs:
       run: |
         python make.py --build-all
     - name: Upload coverage files
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: coverage (${{ runner.os }})
         path: htmlcov
     - name: Upload executable
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: dist (${{ runner.os }})
         path: installer/bundle

.github/workflows/publish_docs.yml

@@ -13,16 +13,16 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Checkout gh-pages
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         ref: gh-pages
         path: docs/_web
-    - name: Set up Python 3.9
-      uses: actions/setup-python@v2
+    - name: Set up Python 3.10
+      uses: actions/setup-python@v4
       with:
-        python-version: 3.9
+        python-version: '3.10'
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip

CONTRIBUTING.md

@@ -13,7 +13,7 @@ First begin by creating a fork of the SScanSS-2 repo, then clone the fork
 We recommend using anaconda python distribution  for development, a new virtual environment should be 
 created to isolate dependencies. For Windows, first download and install [Microsoft Visual C++](https://aka.ms/vs/16/release/vc_redist.x64.exe). Then run the following
 
-    conda env create -f environment.yml
+    conda env create -f environment.yaml
     conda activate sscanss
 
 And finally create a separate branch to begin work

README.md

@@ -17,7 +17,7 @@ Installation
 The code is currently known to run on Windows, and Linux; it has not been tested on Mac. Installers are available on the
 [release](https://github.com/ISISNeutronMuon/SScanSS-2/releases) page. It should be noted that while the code is 
 Python 3 compatible, a single version will be tested for each release to ensure a consistent experience for all users. 
-The supported version for the next release is Python 3.9.
+The supported version for the next release is Python 3.10.
 
 Citing SScanSS 2
 ----------------

environment.yaml

@@ -2,7 +2,7 @@ name: sscanss
 channels:
   - defaults
 dependencies:
-  - python=3.9
+  - python=3.10
   - pip
   - pip:
     - -r requirements.txt

installer/linux/build_installer.sh

@@ -98,14 +98,16 @@ echo ""
 wget https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh -O "$TMP_DIR/miniconda.sh"
 bash ./miniconda.sh -b -p ./miniconda
 
-./miniconda/bin/conda create -n sscanss -y python=3.9
+./miniconda/bin/conda create -n sscanss -y python=3.10
 
 echo ""
 echo "Downloading Dependencies"
 echo ""
 python_exec="./miniconda/envs/sscanss/bin/python"
 mkdir "$TMP_DIR/packages"
 $python_exec -m pip download -r "./sscanss/requirements.txt" --dest "$TMP_DIR/packages"
+# workaround for centos 7
+$python_exec -m pip download --only-binary=":all:" --platform="manylinux_2_17_x86_64"  --dest "$TMP_DIR/packages" pillow==9.2
 
 echo ""
 echo "Compressing Package.tar.gz ..."

make.py

@@ -23,7 +23,8 @@
     '--exclude-module', 'PyQt5.QtRemoteObjects', '--exclude-module', 'PyQt5.QtMultimedia', '--exclude-module',
     'PyQt5.QtQml', '--exclude-module', 'PyQt5.QtQuickWidgets', '--exclude-module', 'PyQt5.QtSql', '--exclude-module',
     'PyQt5.QtSvg', '--exclude-module', 'PyQt5.QtSerialPort', '--exclude-module', 'PyQt5.QtNetwork', '--exclude-module',
-    'PyQt5.QtScript', '--exclude-module', 'PyQt5.QtXml', '--exclude-module', 'PyQt5.QtXmlPatterns'
+    'PyQt5.QtScript', '--exclude-module', 'PyQt5.QtXml', '--exclude-module', 'PyQt5.QtXmlPatterns', '--exclude-module',
+    'sphinx'
 ]
 HIDDEN_IMPORT = ['--hidden-import', 'pkg_resources.py2_warn', '--hidden-import', 'OpenGL.platform.egl']
 IS_WINDOWS = sys.platform.startswith('win')

requirements-dev.txt

@@ -1,5 +1,5 @@
-coverage==6.2.0
-pylint==2.13.8
-Sphinx==4.5.0
+coverage==7.0.5
+pylint==2.16.2
+Sphinx==5.3.0
 sphinx-bootstrap-theme==0.8.1
 yapf==0.31.0

requirements.txt

@@ -1,17 +1,18 @@
-bitarray==2.4.1
+bitarray==2.6.2
+cython==0.29.33
+h5py==3.7.0
+jsbeautifier==1.14.7
+jsonschema==4.16.0
+matplotlib==3.6.3
+NLopt==2.7.1
+numpy==1.23.5
 gimpact==0.1.0
-h5py==3.6.0
-jsbeautifier==1.14.6
-jsonschema==4.4.0
-matplotlib==3.4.3
-NLopt==2.7.0
-numpy==1.21.6
-Pillow==9.0.0
-PyInstaller==4.10
+Pillow==9.2.0
+PyInstaller==5.7.0
 PyOpenGL==3.1.6
 PyQt5==5.15.6
 pystache==0.6.0
 QScintilla==2.13.2
-scipy==1.6.3
-tifffile==2021.11.2
-psutil==5.8.0
+scipy==1.9.3
+tifffile==2022.10.10
+psutil==5.9.4