Tweaks to simplejson warning copy and forward/reverse validation

onecodex/cli.py

@@ -65,7 +65,6 @@ def onecodex(ctx, api_key, no_pprint, verbose, telemetry):
     # Show a warning if simplejson is installed
     if is_simplejson_installed():
         warn_simplejson()
-        sys.exit(1)
 
     # create the api
     no_api_subcommands = ["login", "logout"]
@@ -196,11 +195,15 @@ def upload(ctx, files, max_threads, clean, no_interleave, prompt, validate,
     if (forward or reverse) and not (forward and reverse):
         click.echo('You must specify both forward and reverse files', err=True)
         sys.exit(1)
-    if forward:
+    if forward and reverse:
+        if len(files) > 0:
+            click.echo('You may not pass a FILES argument when using the '
+                       ' --forward and --reverse options.', err=True)
+            sys.exit(1)
         files = [(forward, reverse)]
         no_interleave = True
     if len(files) == 0:
-        print(ctx.get_help())
+        click.echo(ctx.get_help())
         return
     else:
         files = list(files)

onecodex/utils.py

@@ -192,8 +192,8 @@ def warn_simplejson():
          "#                                                                                    #\n"  # noqa
          "#  You currently have simplejson installed. Unfortunately, this library does not     #\n"  # noqa
          "#  work properly alongside simplejson. Please install this library in a separate     #\n"  # noqa
-         "#  virtual environment using a tool such as virtualenv. For more information, see    #\n"  # noqa
-         "#  https://virtualenv.pypa.io/en/stable/.                                            #\n"  # noqa
+         "#  virtual environment using a tool such as virtualenv or uninstall simplejson.      #\n"  # noqa
+         "#  For more information, see https://virtualenv.pypa.io/en/stable/.                  #\n"  # noqa
          "#                                                                                    #\n"  # noqa
          "######################################################################################\n")  # noqa)
     echo(m, err=True)

tests/test_cli.py

@@ -258,6 +258,14 @@ def test_paired_files(runner, upload_mocks):
         assert 'You must specify both forward and reverse files' in result6.output
         assert result6.exit_code != 0
 
+        # Check with --forward, --reverse, and files, should fail
+        args = ['--api-key', '01234567890123456789012345678901', 'upload', '--forward', f,
+                '--reverse', f2, f2]
+        with mock.patch(patch1) as mp, mock.patch(patch2) as mp2:
+            result7 = runner.invoke(Cli, args)
+        assert 'You may not pass a FILES argument' in result7.output
+        assert result7.exit_code != 0
+
 
 def test_large_uploads(runner, upload_mocks, monkeypatch):
     # a lot of funky mocking

tests/test_simplejson.py

@@ -5,5 +5,4 @@
 
 def test_simplejson(runner, upload_mocks):
     result = runner.invoke(Cli, ['upload'])
-    assert result.exit_code != 0
     assert "You currently have simplejson installed" in result.output