Skip to content

Commit

Permalink
New required spinedb_api version and an updated setup.py.
Browse files Browse the repository at this point in the history
- setup.py adds spinedb_api\alembic\versions package into installation bundle
- Fixed Data Store execution.
- Unnecessary Error Dialog in import preview widget removed
  • Loading branch information
ptsavol committed Sep 3, 2019
1 parent aea445c commit 52ecf73
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 7 deletions.
9 changes: 8 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,13 @@ All **notable** changes to this project are documented here.

The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)

## [0.3-beta.4] - 2019-09-03

### Fixed
- NameError: SpineDBAPIError when executing Data Stores
- Removed an unnecessary error dialog in Import Preview widget.
- Added missing modules from *spinedb_api\alembic\versions* package into installation bundle.

## [0.3-beta.3] - 2019-09-03

### Fixed
Expand All @@ -12,7 +19,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
## [0.3-beta.2] - 2019-09-03

### Added
- *packaging* and *appdirs* packages are now included in the installation bundle
- *packaging* and *appdirs* packages are now included in the installation bundle.

### Fixed
- Link to Getting Started Guide in Event Log
Expand Down
2 changes: 1 addition & 1 deletion setup.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 "Spine Toolbox"
#define MyAppVersion "0.3-beta.3"
#define MyAppVersion "0.3-beta.4"
#define MyAppPublisher "Spine Project Consortium"
#define MyAppURL "https://github.com/Spine-project"
#define MyAppExeName "spinetoolbox.exe"
Expand Down
4 changes: 2 additions & 2 deletions spinetoolbox/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
import sys
import os

SPINE_TOOLBOX_VERSION = "0.3-beta.3"
REQUIRED_SPINEDB_API_VERSION = "0.0.34"
SPINE_TOOLBOX_VERSION = "0.3-beta.4"
REQUIRED_SPINEDB_API_VERSION = "0.0.35"
# SPINE GREEN HTML: #99cc33 RGBa: 153, 204, 51, 255
# SPINE BLUE HTML: #004ac2 RGBa: 0, 74, 194, 255
# Invalid characters for directory names
Expand Down
6 changes: 3 additions & 3 deletions spinetoolbox/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ def main(argv):
# NOTE: Excluding 'scipy.spatial.cKDTree' and including 'scipy.spatial.ckdtree' is a workaround
# for a bug in cx_Freeze affecting Windows (https://github.com/anthony-tuininga/cx_Freeze/issues/233)
build_exe_options = {
"packages": ["packaging", "pkg_resources"],
"packages": ["packaging", "pkg_resources", "spinedb_api.alembic"],
"excludes": ["scipy.spatial.cKDTree"],
"includes": [
"atexit",
Expand Down Expand Up @@ -75,7 +75,7 @@ def main(argv):
"scipy.spatial.ckdtree",
"pymysql",
"tabulator.loaders.local",
"tabulator.parsers.csv",
"tabulator.parsers.csv"
],
"include_files": [
(doc_path, "docs/"),
Expand All @@ -84,7 +84,7 @@ def main(argv):
changelog_file,
readme_file,
copying_file,
copying_lesser_file,
copying_lesser_file
],
"include_msvcr": True,
}
Expand Down

0 comments on commit 52ecf73

Please sign in to comment.