Skip to content

Commit

Permalink
Merge pull request #228 from MannLabs/windows-fix
Browse files Browse the repository at this point in the history
Windows fix
  • Loading branch information
elena-krismer authored Aug 15, 2023
2 parents 3e57c38 + 2f9115a commit a21d0f6
Show file tree
Hide file tree
Showing 13 changed files with 15 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 0.6.3
current_version = 0.6.4
commit = True
tag = False
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<release>[a-z]+)(?P<build>\d+))?
Expand Down
2 changes: 2 additions & 0 deletions HISTORY.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# Changelog

# 0.6.4
* FIX windows installer

# 0.6.3
* ENH download metadata template in the GUI
Expand Down
2 changes: 1 addition & 1 deletion alphastats/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
__project__ = "alphastats"
__version__ = "0.6.3"
__version__ = "0.6.4"
__license__ = "Apache"
__description__ = "An open-source Python package for Mass Spectrometry Analysis"
__author__ = "Mann Labs"
Expand Down
4 changes: 2 additions & 2 deletions alphastats/gui/gui.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
def run():
file_path = os.path.realpath(__file__)
os.chdir(os.path.dirname(file_path))
os.system("python -m streamlit run AlphaPeptStats.py")
os.system("python -m streamlit run AlphaPeptStats.py --global.developmentMode=false")
_this_file = os.path.abspath(__file__)
_this_directory = os.path.dirname(_this_file)

Expand All @@ -21,7 +21,7 @@ def run():

print(f'Starting AlphaPeptStats from {file_path}')

args = ["streamlit", "run", file_path]
args = ["streamlit", "run", file_path, "--global.developmentMode=false"]

sys.argv = args

Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
author = "Elena Krismer"

# The full version, including alpha/beta/rc tags
release = "0.6.3"
release = "0.6.4"


# -- General configuration ---------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion release/one_click_linux_gui/control
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Package: alphastats
Version: 0.6.3
Version: 0.6.4
Architecture: all
Maintainer: MannLabs
Description: alphastats
Expand Down
2 changes: 1 addition & 1 deletion release/one_click_linux_gui/create_installer_linux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ python setup.py sdist bdist_wheel
# Setting up the local package
cd release/one_click_linux_gui
# Make sure you include the required extra packages and always use the stable or very-stable options!
pip install "../../dist/alphastats-0.6.3-py3-none-any.whl"
pip install "../../dist/alphastats-0.6.4-py3-none-any.whl"

# Creating the stand-alone pyinstaller folder
pip install pyinstaller==5.8
Expand Down
2 changes: 1 addition & 1 deletion release/one_click_macos_gui/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<key>CFBundleIconFile</key>
<string>alphapeptstats_logo.icns</string>
<key>CFBundleIdentifier</key>
<string>alphastats.0.6.3</string>
<string>alphastats.0.6.4</string>
<key>CFBundleShortVersionString</key>
<string>0.6.0</string>
<key>CFBundleInfoDictionaryVersion</key>
Expand Down
2 changes: 1 addition & 1 deletion release/one_click_macos_gui/create_installer_macos.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ python setup.py sdist bdist_wheel

# Setting up the local package
cd release/one_click_macos_gui
pip install "../../dist/alphastats-0.6.3-py3-none-any.whl"
pip install "../../dist/alphastats-0.6.4-py3-none-any.whl"

# Creating the stand-alone pyinstaller folder
pip install pyinstaller==5.8
Expand Down
2 changes: 1 addition & 1 deletion release/one_click_macos_gui/distribution.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?>
<installer-script minSpecVersion="1.000000">
<title>AlphaPeptStats 0.6.3</title>
<title>AlphaPeptStats 0.6.4</title>
<background mime-type="image/png" file="alphapeptstats_logo.png" scaling="proportional"/>
<welcome file="welcome.html" mime-type="text/html" />
<conclusion file="conclusion.html" mime-type="text/html" />
Expand Down
2 changes: 1 addition & 1 deletion release/one_click_windows_gui/alphastats_innoinstaller.iss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!

#define MyAppName "AlphaPeptStats"
#define MyAppVersion "0.6.3"
#define MyAppVersion "0.6.4"
#define MyAppPublisher "MannLabs"
#define MyAppURL "https://github.com/MannLabs/alphapeptstats"
#define MyAppExeName "alphastats_gui.exe"
Expand Down
2 changes: 1 addition & 1 deletion release/one_click_windows_gui/create_installer_windows.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ python setup.py sdist bdist_wheel
# Setting up the local package
cd release/one_click_windows_gui
# Make sure you include the required extra packages and always use the stable or very-stable options!
pip install "../../dist/alphastats-0.6.3-py3-none-any.whl"
pip install "../../dist/alphastats-0.6.4-py3-none-any.whl"

# Creating the stand-alone pyinstaller folder
pip install pyinstaller==5.8
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ def create_pip_wheel():
requirements = get_requirements()
setuptools.setup(
name="alphastats",
version="0.6.3",
version="0.6.4",
license="Apache",
description="An open-source Python package for automated and scalable statistical analysis of mass spectrometry-based proteomics",
long_description=get_long_description(),
Expand Down

0 comments on commit a21d0f6

Please sign in to comment.