Merge pull request #51 from MannLabs/update_dependencies

Adapt GUI
MannLabs · Oct 24, 2024 · 46e38fd · 46e38fd
2 parents d04985f + 221954b
commit 46e38fd
Show file tree

Hide file tree

Showing 17 changed files with 181 additions and 174 deletions.
diff --git a/directlfq/__init__.py b/directlfq/__init__.py
@@ -2,7 +2,7 @@
 
 
 __project__ = "directlfq"
-__version__ = "0.2.20"
+__version__ = "0.3.0"
 __license__ = "Apache"
 __description__ = "An open-source Python package of the AlphaPept ecosystem"
 __author__ = "Mann Labs"

diff --git a/directlfq/dashboard_parts.py b/directlfq/dashboard_parts.py
diff --git a/directlfq/gui_textfields.py b/directlfq/gui_textfields.py
@@ -133,7 +133,7 @@ class Cards():
         collapsed=True,
         width=ButtonConfiguration.width,
         align='start',
-        margin=(0, 80, 5, 10),
+        margin=(20, 0, 20, 0),
         css_classes=['spectronaut_instr']
     )
     diann = pn.Card(

diff --git a/misc/.bumpversion.cfg b/misc/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.2.20
+current_version = 0.3.0
 commit = True
 tag = False
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<release>[a-z]+)(?P<build>\d+))?

diff --git a/release/linux/build_installer_linux.sh b/release/linux/build_installer_linux.sh
@@ -9,7 +9,7 @@ rm -rf dist_pyinstaller build_pyinstaller
 
 # Creating the wheel
 python setup.py sdist bdist_wheel
-pip install "dist/directlfq-0.2.20-py3-none-any.whl[stable,gui]"
+pip install "dist/directlfq-0.3.0-py3-none-any.whl[stable,gui]"
 
 # Creating the stand-alone pyinstaller folder
 pip install pyinstaller

diff --git a/release/linux/control b/release/linux/control
@@ -1,5 +1,5 @@
 Package: directlfq
-Version: 0.2.20
+Version: 0.3.0
 Architecture: all
 Maintainer: Mann Labs <opensource@alphapept.com>
 Description: directlfq

diff --git a/release/linux/create_installer_linux.sh b/release/linux/create_installer_linux.sh
@@ -19,7 +19,7 @@ python setup.py sdist bdist_wheel
 # Setting up the local package
 cd release/linux
 # Make sure you include the required extra packages and always use the stable or very-stable options!
-pip install "../../dist/directlfq-0.2.20-py3-none-any.whl[stable, gui]"
+pip install "../../dist/directlfq-0.3.0-py3-none-any.whl[stable, gui]"
 
 # Creating the stand-alone pyinstaller folder
 pip install pyinstaller==4.10

diff --git a/release/macos/Info.plist b/release/macos/Info.plist
@@ -9,9 +9,9 @@
 	<key>CFBundleIconFile</key>
 	<string>alpha_logo.icns</string>
 	<key>CFBundleIdentifier</key>
-	<string>directlfq.0.2.20</string>
+	<string>directlfq.0.3.0</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.2.20</string>
+	<string>0.3.0</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>

diff --git a/release/macos/build_installer_macos.sh b/release/macos/build_installer_macos.sh
@@ -9,7 +9,7 @@ rm -rf dist_pyinstaller build_pyinstaller
 
 # Creating the wheel
 python setup.py sdist bdist_wheel
-pip install "dist/directlfq-0.2.20-py3-none-any.whl[stable,gui]"
+pip install "dist/directlfq-0.3.0-py3-none-any.whl[stable,gui]"
 
 # Creating the stand-alone pyinstaller folder
 pip install pyinstaller

diff --git a/release/macos/build_package_macos.sh b/release/macos/build_package_macos.sh
@@ -30,5 +30,5 @@ cd -
 
 chmod 777 release/macos/scripts/*
 
-pkgbuild --root dist_pyinstaller/${PACKAGE_NAME} --identifier de.mpg.biochem.${PACKAGE_NAME}.app --version 0.2.20 --install-location /Applications/${PACKAGE_NAME}.app --scripts release/macos/scripts ${PACKAGE_NAME}.pkg
+pkgbuild --root dist_pyinstaller/${PACKAGE_NAME} --identifier de.mpg.biochem.${PACKAGE_NAME}.app --version 0.3.0 --install-location /Applications/${PACKAGE_NAME}.app --scripts release/macos/scripts ${PACKAGE_NAME}.pkg
 productbuild --distribution release/macos/distribution.xml --resources release/macos/Resources --package-path ${PACKAGE_NAME}.pkg ${BUILD_NAME}.pkg
diff --git a/release/macos/create_installer_macos.sh b/release/macos/create_installer_macos.sh
@@ -22,7 +22,7 @@ python setup.py sdist bdist_wheel
 
 # Setting up the local package
 cd release/macos
-pip install "../../dist/directlfq-0.2.20-py3-none-any.whl[stable, gui]"
+pip install "../../dist/directlfq-0.3.0-py3-none-any.whl[stable, gui]"
 
 # Creating the stand-alone pyinstaller folder
 pip install pyinstaller==4.10
@@ -42,5 +42,5 @@ cp ../../LICENSE Resources/LICENSE
 cp ../logos/alpha_logo.png Resources/alpha_logo.png
 chmod 777 scripts/*
 
-pkgbuild --root dist/directlfq --identifier de.mpg.biochem.directlfq.app --version 0.2.20 --install-location /Applications/directlfq.app --scripts scripts directlfq.pkg
+pkgbuild --root dist/directlfq --identifier de.mpg.biochem.directlfq.app --version 0.3.0 --install-location /Applications/directlfq.app --scripts scripts directlfq.pkg
 productbuild --distribution distribution.xml --resources Resources --package-path directlfq.pkg dist/directlfq_gui_installer_macos.pkg
diff --git a/release/macos/distribution.xml b/release/macos/distribution.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <installer-script minSpecVersion="1.000000">
-    <title>directlfq 0.2.20</title>
+    <title>directlfq 0.3.0</title>
     <background mime-type="image/png" file="alpha_logo.png" scaling="proportional"/>
     <welcome file="welcome.html" mime-type="text/html" />
     <conclusion file="conclusion.html" mime-type="text/html" />

diff --git a/release/windows/build_installer_windows.ps1 b/release/windows/build_installer_windows.ps1
@@ -10,7 +10,7 @@ Remove-Item -Recurse -Force -ErrorAction SilentlyContinue ./dist_pyinstaller
 # Creating the wheel
 python setup.py sdist bdist_wheel
 # Make sure you include the required extra packages and always use the stable or very-stable options!
-pip install "dist/directlfq-0.2.20-py3-none-any.whl[stable, gui]"
+pip install "dist/directlfq-0.3.0-py3-none-any.whl[stable, gui]"
 
 # Creating the stand-alone pyinstaller folder
 pip install pyinstaller

diff --git a/release/windows/create_installer_windows.sh b/release/windows/create_installer_windows.sh
@@ -19,7 +19,7 @@ python setup.py sdist bdist_wheel
 # Setting up the local package
 cd release/windows
 # Make sure you include the required extra packages and always use the stable or very-stable options!
-pip install "../../dist/directlfq-0.2.20-py3-none-any.whl[stable, gui]"
+pip install "../../dist/directlfq-0.3.0-py3-none-any.whl[stable, gui]"
 
 # Creating the stand-alone pyinstaller folder
 pip install pyinstaller==4.10

diff --git a/release/windows/directlfq_innoinstaller.iss b/release/windows/directlfq_innoinstaller.iss
@@ -5,7 +5,7 @@
 ; so all paths are given relative to the location of this .iss file.
 
 #define MyAppName "directlfq"
-#define MyAppVersion "0.2.20"
+#define MyAppVersion "0.3.0"
 #define MyAppPublisher "Max Planck Institute of Biochemistry and the University of Copenhagen, Mann Labs"
 #define MyAppURL "https://github.com/MannLabs/directlfq"
 #define MyAppExeName "directlfq_gui.exe"

diff --git a/requirements/requirements_gui.txt b/requirements/requirements_gui.txt
@@ -1,3 +1,3 @@
-panel==0.14.2
-dash==2.7.1
-matplotlib==3.6.3
+panel==0.10.3
+dash==2.5.1
+matplotlib==3.4.3
diff --git a/settings.ini b/settings.ini
@@ -13,7 +13,7 @@ author = Constantin Ammar
 author_email = constantin.ammar@gmail.com
 copyright = fast.ai
 branch = master
-version = 0.2.20
+version = 0.3.0
 min_python = 3.6
 audience = Developers
 language = English