Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: elyra-ai/elyra
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 22e753b736ba235a0c92563452c44f54efa393fa
Choose a base ref
..
head repository: elyra-ai/elyra
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9e7da6433a66e6803d1fda828c1d42c9e75f7e7e
Choose a head ref
Showing with 6 additions and 12 deletions.
  1. +3 −9 create-release.py
  2. +3 −3 elyra/util/http.py
12 changes: 3 additions & 9 deletions create-release.py
View file
Original file line number Diff line number Diff line change
@@ -865,16 +865,12 @@ def initialize_config(args=None) -> SimpleNamespace:
"new_version": (
args.version
if (not args.rc or not str.isdigit(args.rc)) and (not args.beta or not str.isdigit(args.beta))
else f"{args.version}rc{args.rc}"
if args.rc
else f"{args.version}b{args.beta}"
else f"{args.version}rc{args.rc}" if args.rc else f"{args.version}b{args.beta}"
),
"new_npm_version": (
args.version
if (not args.rc or not str.isdigit(args.rc)) and (not args.beta or not str.isdigit(args.beta))
else f"{args.version}-rc.{args.rc}"
if args.rc
else f"{args.version}-beta.{args.beta}"
else f"{args.version}-rc.{args.rc}" if args.rc else f"{args.version}-beta.{args.beta}"
),
"rc": args.rc,
"beta": args.beta,
@@ -883,9 +879,7 @@ def initialize_config(args=None) -> SimpleNamespace:
"tag": (
f"v{args.version}"
if (not args.rc or not str.isdigit(args.rc)) and (not args.beta or not str.isdigit(args.beta))
else f"v{args.version}rc{args.rc}"
if args.rc
else f"v{args.version}b{args.beta}"
else f"v{args.version}rc{args.rc}" if args.rc else f"v{args.version}b{args.beta}"
),
"pre_release": True if (args.rc or args.beta) else False,
}
6 changes: 3 additions & 3 deletions elyra/util/http.py
View file
Original file line number Diff line number Diff line change
@@ -59,12 +59,12 @@ def write_error(self, status_code, **kwargs):
else:
if isinstance(exception, Exception) and exception.args:
if isinstance(exception.args[0], Exception):
reply[
"message"
] = f"Error. The server sent an invalid response.\
reply["message"] = (
f"Error. The server sent an invalid response.\
\nPlease open an issue and provide this error message,\
any error details, and any related JupyterLab log messages.\
\n\nError found:\n{str(exception.args[0])}"
)
else:
reply["message"] = str(exception.args[0])
else: