Revert "Bump version 2.2.6 beta4"

JYU-IBA · Apr 23, 2024 · 09aa2ee · 09aa2ee
1 parent 5f7d69b
commit 09aa2ee
Show file tree

Hide file tree

Showing 62 changed files with 4,800 additions and 317 deletions.
diff --git a/.github/workflows/compile_c_apps.yml b/.github/workflows/compile_c_apps.yml
@@ -2,7 +2,7 @@
 name: Compile C apps
 
 on:
- [workflow_call, workflow_dispatch]
+ workflow_call:
 
 jobs:
  check_artifacts:
@@ -138,4 +138,4 @@ jobs:
  name: c-apps-macos
  path: |
  ${{runner.workspace}}/potku/external/bin
- ${{runner.workspace}}/potku/external/lib
+ ${{runner.workspace}}/potku/external/lib
diff --git a/.github/workflows/package_potku.yml b/.github/workflows/package_potku.yml
@@ -2,7 +2,7 @@
 name: Package Potku
 
 on:
- [workflow_call, workflow_dispatch]
+ workflow_call:
 
 jobs:
 
@@ -40,11 +40,11 @@ jobs:
  path: ${{runner.workspace}}/potku/external/bin
  check_artifacts: true
  search_artifacts: true
- - name: Set up Python 3.12
- uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
+ - name: Set up Python 3.10
+ uses: actions/setup-python@61a6322f88396a6271a6ee3565807d608ecaddd1 # v4
  with:
  # Semantic version range syntax or exact version of a Python version
- python-version: '3.12'
+ python-version: '3.10'
  - name: Collect external files and package Potku
  run: |
  cd ${{runner.workspace}}/potku
@@ -57,7 +57,7 @@ jobs:
  exit /b 1
  )
  cd ${{runner.workspace}}/potku
- pipenv run pip install pyinstaller
+ pipenv run pip install pyinstaller==5.13.2
  pipenv run pyinstaller potku.spec
  - name: Create archive
  uses: thedoctor0/zip-release@a24011d8d445e4da5935a7e73c1f98e22a439464 # 0.7.1
@@ -104,11 +104,11 @@ jobs:
  path: ${{runner.workspace}}/potku/external
  check_artifacts: true
  search_artifacts: true
- - name: Set up Python 3.12
- uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
+ - name: Set up Python 3.10
+ uses: actions/setup-python@61a6322f88396a6271a6ee3565807d608ecaddd1 # v4
  with:
  # Semantic version range syntax or exact version of a Python version
- python-version: '3.12'
+ python-version: '3.10'
  - name: Collect external files and package Potku
  id: package
  run: |
@@ -122,7 +122,7 @@ jobs:
  exit 1
  fi
  cd ${{runner.workspace}}/potku
- pipenv run pip install pyinstaller
+ pipenv run pip install pyinstaller==5.13.2
  pipenv run pyinstaller potku.spec
  - name: Create archive
  uses: thedoctor0/zip-release@a24011d8d445e4da5935a7e73c1f98e22a439464 # 0.7.1
@@ -168,11 +168,11 @@ jobs:
  path: ${{runner.workspace}}/potku/external
  check_artifacts: true
  search_artifacts: true
- - name: Set up Python 3.12
- uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5.1.0
+ - name: Set up Python 3.10
+ uses: actions/setup-python@61a6322f88396a6271a6ee3565807d608ecaddd1 # v4
  with:
  # Semantic version range syntax or exact version of a Python version
- python-version: '3.12'
+ python-version: '3.10'
  - name: Collect external files and package Potku
  id: package
  run: |
@@ -186,7 +186,7 @@ jobs:
  exit 1
  fi
  cd ${{runner.workspace}}/potku
- pipenv run pip install pyinstaller
+ pipenv run pip install pyinstaller==5.13.2
  pipenv run pyinstaller potku.spec
  - name: Create archive
  uses: thedoctor0/zip-release@a24011d8d445e4da5935a7e73c1f98e22a439464 # 0.7.1
@@ -270,9 +270,9 @@ jobs:
  repo_token: "${{ secrets.GITHUB_TOKEN }}"
  automatic_release_tag: ${{ steps.get_content.outputs.version }}
  title: Potku ${{ steps.get_content.outputs.version }}
- draft: true
+ draft: false
  prerelease: false
  files: |
  ${{runner.workspace}}/potku/artifact/Potku-Linux.zip
  ${{runner.workspace}}/potku/artifact/Potku-Windows.zip
- ${{runner.workspace}}/potku/artifact/Potku-macOS.zip
+ ${{runner.workspace}}/potku/artifact/Potku-macOS.zip
diff --git a/.gitmodules b/.gitmodules
@@ -4,9 +4,3 @@
 [submodule "external/submodules/mcerd"]
  path = external/submodules/mcerd
  url = https://github.com/JYU-IBA/mcerd.git
-[submodule "external/submodules/erd_depth"]
- path = external/submodules/erd_depth
- url = https://github.com/JYU-IBA/erd_depth.git
-[submodule "external/submodules/coinc"]
- path = external/submodules/coinc
- url = https://github.com/JYU-IBA/coinc
diff --git a/Pipfile b/Pipfile
@@ -4,20 +4,20 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-numpy = ">=1.22.4"
-scipy = ">=1.8.1"
-matplotlib = ">=3.5.2"
-Shapely = ">=1.8.2"
-wheel = ">=0.37.1"
-reactivex = ">=4.0.2"
-Pillow = ">=9.1.1"
-hypothesis = ">=6.47.0"
-requests = ">=2.31.0"
-pyqt5 = "*"
+numpy = "1.22.4"
+scipy = "1.8.1"
+matplotlib = "3.5.2"
+PyQt5 = "5.15.6"
+Shapely = "1.8.2"
+wheel = "0.37.1"
+reactivex = "4.0.2"
+Pillow = "9.1.1"
+hypothesis = "6.47.0"
+requests = "2.31.0"
 
 [dev-packages]
-pypiwin32 = { version = "*", markers = "sys_platform== 'win32'"}
-pywin32 = { version = "*", markers = "sys_platform== 'win32'"}
+pypiwin32 = {sys_platform = "== 'win32'"}
+pywin32 = {sys_platform = "== 'win32'"}
 
 [requires]
-python_version = "3.12"
+python_version = "3.10"