Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

version 0.9.4 #131

Merged
merged 5 commits into from
Sep 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
## 0.9.4 ***(September 9, 2024)***

### Added
- License agreement for the plugin

### Changed
- RSXML Module updated to version 2.0.6
- Warehouse renamed to Data Exchange #129

## 0.9.3 ***(June 19, 2024)***

Expand Down
1 change: 1 addition & 0 deletions Images/data-exchange-icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
674 changes: 674 additions & 0 deletions LICENSE

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion __version__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.9.3"
__version__ = "0.9.4"
1 change: 1 addition & 0 deletions scripts/deploy.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ def copy_plugin(plugin_dir: str):
['__init__.py'],
['CHANGELOG.md'],
['README.md'],
['LICENSE'],
['config.json'],
['wheels', '**', '*.whl'],
['src', '**', '*.py'],
Expand Down
11 changes: 7 additions & 4 deletions src/__init__.py
Original file line number Diff line number Diff line change
@@ -1,18 +1,21 @@
import os

RSXML_VERSION = '2.0.1'
from qgis.core import QgsMessageLog, Qgis

RSXML_VERSION = '2.0.6'

# This is how we import the rsxml module. We do this because we want to bundle the rsxml whl with this package
try:
import rsxml
print('rsxml imported from site-packages')
QgsMessageLog.logMessage('rsxml imported from system', 'Riverscapes Viewer', Qgis.Info)
except ImportError:
import sys
import os
this_dir = os.path.dirname(os.path.realpath(__file__))
path = os.path.join(this_dir, '..', 'wheels', f'rsxml-{RSXML_VERSION}-py3-none-any.whl')
sys.path.append(path)
if not os.path.exists(path):
raise Exception('rsxml wheel not found at {}.'.format(path))
QgsMessageLog.logMessage(f'rsxml wheel not found at {path}.', 'Riverscapes Viewer', Qgis.Critical)
raise Exception(f'rsxml wheel not found at {path}.')
import rsxml
print('rsxml imported from wheels')
QgsMessageLog.logMessage(f'rsxml imported from wheel {path}', 'Riverscapes Viewer', Qgis.Info)
4 changes: 2 additions & 2 deletions src/classes/context_menu.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ class ContextMenu(QMenu):
':/plugins/qrave_toolbar/close.png'
),
'WAREHOUSE_VIEW': (
'View in Warehouse',
':/plugins/qrave_toolbar/RaveAddIn_16px.png'
'View in Data Exchange',
':/plugins/qrave_toolbar/data-exchange-icon.svg'
),
}

Expand Down
Loading