From 2e01fa5de16dfedd31c9b639c5999d4bd54f76a2 Mon Sep 17 00:00:00 2001 From: Daniel Perrefort Date: Fri, 4 Nov 2022 10:58:02 -0400 Subject: [PATCH] Drops x11 support from version 0.3 (#127) * Drops x11 support from version 0.3 * Bumps version patch --- crc-interactive.py | 17 ----------------- version.txt | 2 +- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/crc-interactive.py b/crc-interactive.py index 5e8af57..41cc745 100755 --- a/crc-interactive.py +++ b/crc-interactive.py @@ -81,19 +81,6 @@ def _validate_arguments(self, args): if args.invest and not args.partition: self.error('You must specify a partition when using the Investor cluster') - @staticmethod - def x11_is_available(): - """Return whether x11 is available in the current runtime environment""" - - try: - _, x11_err = Shell.run_command('xset q', include_err=True) - return not x11_err - - except OSError: - pass - - return False - def create_srun_command(self, args): """Create an ``srun`` command based on parsed commandline arguments @@ -128,10 +115,6 @@ def create_srun_command(self, args): if (args.gpu or args.invest) and args.num_gpus: srun_args += ' ' + '--gres=gpu:{}'.format(args.num_gpus) - # Add the --x11 flag only if X11 is working - if self.x11_is_available(): - srun_args += ' --x11 ' - cluster_to_run = next(cluster for cluster in SlurmInfo.get_cluster_names() if getattr(args, cluster)) return 'srun -M {} {} --pty bash'.format(cluster_to_run, srun_args) diff --git a/version.txt b/version.txt index c2c0004..449d7e7 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -0.3.5 +0.3.6