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

try removing --force from poetry installation #1146

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

try removing --force from poetry installation #1146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
41cdfcd
try removing force
39bytes Apr 6, 2024
13a40e1
Merge branch 'main' into jeff/remove-force
39bytes Apr 6, 2024
3e4aa97
bump versions
39bytes Apr 6, 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
2 changes: 1 addition & 1 deletion docs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "blocks",
"type": "module",
"version": "0.3.3",
"version": "0.3.4",
"scripts": {
"dev": "astro dev",
"start": "astro dev",
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "flojoy-studio",
"productName": "Flojoy Studio",
"description": "Joyful visual programming for Python",
"version": "0.3.3",
"version": "0.3.4",
"private": true,
"homepage": "./",
"author": "Jack Parmer <[email protected]>",
Expand Down
2 changes: 1 addition & 1 deletion pkgs/flojoy/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ authors = [
"Dallas Strandell <[email protected]>",
]
name = "flojoy"
version = "0.3.3"
version = "0.3.4"
description = ""
readme = "README.md"

Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "flojoy-studio"
version = "0.3.3"
version = "0.3.4"
description = ""
authors = [
"Jack Palmer <[email protected]>",
Expand Down
6 changes: 3 additions & 3 deletions src/main/python/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import log from "electron-log/main";
import { execCommand } from "../executor";

Check warning on line 2 in src/main/python/index.ts

View workflow job for this annotation

GitHub Actions / ts-code-style 

'../executor' import is restricted from being used by a pattern. Relative imports are not allowed
import { app } from "electron";
import { Command } from "../command";

Check warning on line 4 in src/main/python/index.ts

View workflow job for this annotation

GitHub Actions / ts-code-style 

'../command' import is restricted from being used by a pattern. Relative imports are not allowed
import { ChildProcess, execSync, spawn } from "child_process";
import { sendToStatusBar } from "../logging";

Check warning on line 6 in src/main/python/index.ts

View workflow job for this annotation

GitHub Actions / ts-code-style 

'../logging' import is restricted from being used by a pattern. Relative imports are not allowed
import {
InterpretersList,
PythonManager,
Expand All @@ -12,7 +12,7 @@
import * as os from "os";
import { existsSync, mkdirSync, readFileSync } from "fs";
import { poetryGroupEnsureValid } from "./poetry";
import { store } from "../store";

Check warning on line 15 in src/main/python/index.ts

View workflow job for this annotation

GitHub Actions / ts-code-style 

'../store' import is restricted from being used by a pattern. Relative imports are not allowed
import { join } from "path";

export async function checkPythonInstallation(
Expand Down Expand Up @@ -104,9 +104,9 @@
const unset = "unset PIPX_HOME PIPX_BIN_DIR";
await execCommand(
new Command({
darwin: `${unset} && "${py}" -m pipx install poetry --force`,
win32: `"${py}" -m pipx install poetry --force`,
linux: `"${py}" -m pipx install poetry --force`,
darwin: `${unset} && "${py}" -m pipx install poetry`,
win32: `"${py}" -m pipx install poetry`,
linux: `"${py}" -m pipx install poetry`,
}),
);
const poetryPath = await getPoetryPath();
Expand Down
Loading