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.

Sign up for GitHub

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

Adapt ExamineGamma for different installs #268

Merged
merged 3 commits into from
Nov 13, 2023
Merged

Adapt ExamineGamma for different installs #268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9b7bcb8
Examine function adapted to Draco module settings
MarkusZehner Nov 3, 2023
e8a2d51
Update ExamineGamma for deviating install path
MarkusZehner Nov 6, 2023
67fd0c9
Installation note on GAMMA_HOME pattern
MarkusZehner Nov 6, 2023
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
5 changes: 5 additions & 0 deletions docs/source/general/installation.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,3 +130,8 @@ To test `pysqlite2` you can import it as follows and then run the test above:

Installing this package is likely to cause problems with the `sqlite3` library installed on the system.
Thus, it is safer to build a static `sqlite3` library for it (see installation script).

GAMMA
-----
GAMMA's home directory as environment variable 'GAMMA_HOME' is expected to end either as GAMMA_SOFTWARE-<VERSIONNUMBER> or GAMMA_SOFTWARE/<VERSIONNUMBER>.
If this differs in your install and cannot be changed, a workaround is adjusting the expected pattern in :class:`~pyroSAR.examine.ExamineGamma`.
2 changes: 1 addition & 1 deletion pyroSAR/examine.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ def __init__(self):
setattr(self, 'home', home_sys)
else:
raise RuntimeError('could not read GAMMA installation directory')
self.version = re.search('GAMMA_SOFTWARE-(?P<version>[0-9]{8})',
self.version = re.search('GAMMA_SOFTWARE[-/](?P<version>[0-9]{8})',
getattr(self, 'home')).group('version')

try:
Expand Down