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

Handle amalthea -> ark rename in generate-comms.ts #3851

Merged
merged 2 commits into from
Jul 3, 2024
Merged

Handle amalthea -> ark rename in generate-comms.ts #3851

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7bc516d
Handle amalthea -> ark rename in generate-comms.ts
wesm Jul 3, 2024
4f8ba01
Ark does not use the Elastic license
wesm Jul 3, 2024
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
21 changes: 9 additions & 12 deletions positron/comms/generate-comms.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ const commsFiles = comms.map(comm => comm + '.json');
const tsOutputDir = `${__dirname}/../../src/vs/workbench/services/languageRuntime/common`;

/// The directory to write the generated Rust files to (note that this presumes
/// that the amalthea repo is cloned into the same parent directory as the
/// that the ark repo is cloned into the same parent directory as the
/// positron repo)
const rustOutputDir = `${__dirname}/../../../amalthea/crates/amalthea/src/comm`;
const rustOutputDir = `${__dirname}/../../../ark/crates/amalthea/src/comm`;

/// The directory to write the generated Python files to
const pythonOutputDir = `${__dirname}/../../extensions/positron-python/python_files/positron/positron_ipykernel`;
Expand Down Expand Up @@ -426,8 +426,7 @@ function* createRustComm(name: string, frontend: any, backend: any): Generator<s

/*---------------------------------------------------------------------------------------------
* Copyright (C) ${year} Posit Software, PBC. All rights reserved.
* Licensed under the Elastic License 2.0. See LICENSE.txt for license information.
*--------------------------------------------------------------------------------------------*/
*--------------------------------------------------------------------------------------------*/

//
// AUTO-GENERATED from ${name}.json; do not edit.
Expand Down Expand Up @@ -1485,9 +1484,7 @@ async function createCommInterface() {
console.log(`Writing to ${pythonOutputFile}`);
writeFileSync(pythonOutputFile, python, { encoding: 'utf-8' });

// Use black to format the Python file; the lint tests for the
// Python extension require that the Python files have exactly the
// format that black produces.
// Use ruff to format the Python file
execSync(`python3 -m ruff format ${pythonOutputFile}`, { stdio: 'ignore' });
}
} catch (e: any) {
Expand All @@ -1501,19 +1498,19 @@ async function createCommInterface() {

// Check prerequisites

// Check that the amalthea repo is cloned
// Check that the ark repo is cloned
if (!existsSync(rustOutputDir)) {
console.error('The amalthea repo must be cloned into the same parent directory as the ' +
console.error('The ark repo must be cloned into the same parent directory as the ' +
'Positron rep, so that Rust output types can be written.');
process.exit(1);
}

// Check that the Python module 'black' is installed by running Python
// Check that the Python module 'ruff' is installed by running Python
// and importing it
try {
execSync('python3 -m black --version');
execSync('python3 -m ruff --version');
} catch (e) {
console.error('The Python module "black" must be installed to run this script; it is ' +
console.error('The Python module "ruff" must be installed to run this script; it is ' +
'required to properly format the Python output.');
process.exit(1);
}
Expand Down
Loading