Skip to content

Commit

Permalink
Officially mark Linux as supported
Browse files Browse the repository at this point in the history
Only QOL stuff and launchers left, and launchers are WIP anyways.

Renamed --unix to --unsupported, since we may have non-Unix platforms to
consider as well.

Closes #243

requirements.txt:
Bump dependencies

All just fixes.
  • Loading branch information
Infernio committed Dec 21, 2023
1 parent bb3df38 commit c855882
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 12 deletions.
11 changes: 7 additions & 4 deletions Mopy/bash/barg.py
Original file line number Diff line number Diff line change
Expand Up @@ -117,10 +117,13 @@ def arg(group, dashed, descr, dest, action='store', dflt=None):
dest='language',
help='Specify the user language overriding the '
'system language settings.')
parser.add_argument('-n', '--unix',
parser.add_argument('-n', '--unsupported',
action='store_true',
help='Allow bash to run on unix systems ['
'EXPERIMENTTAL].')
help='Allow Wrye Bash to run on unsupported operating '
'systems [EXPERIMENTAL].')
# Deprecated alias for --unsupported
parser.add_argument('--unix', action='store_true', dest='unsupported',
help=argparse.SUPPRESS)
# parse and error check backup options
args = parser.parse_args()
if args.backup and args.restore:
Expand All @@ -135,7 +138,7 @@ def arg(group, dashed, descr, dest, action='store', dflt=None):
'-f': '--filename',
'-L': '--Language',
'-l': '--localAppDataPath',
'-n': '--unix',
'-n': '--unsupported',
'-o': '--oblivionPath',
'-p': '--personalPath',
'-q': '--quiet-quit',
Expand Down
9 changes: 5 additions & 4 deletions Mopy/bash/bash.py
Original file line number Diff line number Diff line change
Expand Up @@ -387,11 +387,12 @@ def main(opts):
:param opts: command line arguments
:type opts: Namespace"""
if (os_system := platform.system()) != 'Windows' and not opts.unix:
# Linux is still mostly broken, so raise on import
raise ImportError(f'Wrye Bash only partially supports {os_system} at '
curr_os = platform.system()
if curr_os not in ('Linux', 'Windows') and not opts.unsupported:
raise ImportError(f'Wrye Bash only partially supports {curr_os} at '
f"the moment. If you know what you're doing, use "
f"the --unix switch to bypass this raise statement.")
f"the --unsupported switch to bypass this raise "
f"statement.")
# Change working dir and logging
_early_setup()
# wx is needed to initialize locale, so that's first
Expand Down
8 changes: 4 additions & 4 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ vdf==3.4
wxPython==4.2.1
# Runtime, recommended --------------------------------------------------------
# For FOMOD schema validation
lxml==4.9.3
lxml==4.9.4
# For parsing download conditions when checking for updates
packaging==23.2
# For PDF support in the doc browser
PyMuPDF==1.23.7
PyMuPDF==1.23.8
# For reflink copies (does not support Windows/ReFS yet)
reflink==0.2.2; sys_platform != 'win32'
# For various Internet-based functionality
Expand All @@ -22,9 +22,9 @@ send2trash==1.8.2; sys_platform != 'win32'
# For Nexus Mods integration
websocket-client==1.7.0
# Compile/Build-time ----------------------------------------------------------
isort==5.12.0
isort==5.13.2
pyfiglet==1.0.2
pygit2==1.13.3
PyGithub==2.1.1
pyinstaller==6.2.0
pyinstaller==6.3.0
pytest==7.4.3

0 comments on commit c855882

Please sign in to comment.