Skip to content

Commit

Permalink
setup: bump dclab to 0.29.0 and fix windows installation directory
Browse files Browse the repository at this point in the history
  • Loading branch information
paulmueller committed Oct 8, 2020
1 parent ec23513 commit a0b6db0
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 9 deletions.
7 changes: 4 additions & 3 deletions .appveyor/shapeout2.iss_dummy
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
#define MyAppNameSimple "Shape-Out"
#define MyzmAppName "Shape-Out 2"
#define MyAppVersion "0.1.0"
#define MyAppPublisher "ZELLMECHANIK DRESDEN"
#define MyAppURL "http://zellmechanik.com"
#define MyAppPublisher "Zellmechanik-Dresden"
#define MyAppURL "https://zellmechanik.com"
#define MyAppPlatform "win32"
#define MyAppExeName "ShapeOut2.exe"

Expand All @@ -22,8 +22,9 @@ AppPublisher={#MyAppPublisher}
AppPublisherURL={#MyAppURL}
AppSupportURL={#MyAppURL}
AppUpdatesURL={#MyAppURL}
DefaultDirName={localappdata}\{#MyAppName}
DefaultDirName={localappdata}\{#MyAppPublisher}\{#MyAppName}
DisableDirPage=yes
UsePreviousAppDir=false
DefaultGroupName={#MyAppName}
AllowNoIcons=yes
OutputBaseFilename={#MyAppNameSimple}_{#MyAppVersion}_{#MyAppPlatform}_setup
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
2.2.5
- setup: correct installation directory on Windows
- setup: bump dclab from 0.27.11 to 0.29.0
2.2.4
- fix: UI slot issues (probably a racing condition) in the
analysis view; editing the viscosity for "other" medium not
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
long_description=open('README.rst').read() if exists('README.rst') else '',
install_requires=["appdirs",
"fcswrite>=0.5.1",
"dclab>=0.27.11",
"dclab>=0.29.0",
"h5py>=2.8.0",
"numpy>=1.9.0",
"pyqt5",
Expand Down
13 changes: 8 additions & 5 deletions shapeout2/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@

import appdirs

#: default settings file name
NAME = "shapeout2.cfg"
#: application name
NAME = "Shape-Out 2"
#: application author
ORG = "Zellmechanik-Dresden"

#: default configuration parameters
DEFAULTS = {
Expand All @@ -23,13 +25,14 @@
class SettingsFile(object):
"""Manages a settings file in the user's config dir"""

def __init__(self, name=NAME, defaults=DEFAULTS, directory=None):
def __init__(self, name=NAME, org=ORG, defaults=DEFAULTS, directory=None):
"""Initialize settings file (create if it does not exist)"""
if directory is None:
directory = appdirs.user_config_dir()
fname = pathlib.Path(directory) / name
directory = appdirs.user_config_dir(appname=name, appauthor=org)
fname = pathlib.Path(directory) / (name.replace(" ", "_") + ".cfg")
# create file if not existent
if not fname.exists():
fname.parent.mkdir(exist_ok=True, parents=True)
# Create the file
fname.open("w").close()

Expand Down

0 comments on commit a0b6db0

Please sign in to comment.