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

Update submodule from PR: 93 #540

Merged
merged 8 commits into from
Jun 12, 2023
Merged

Update submodule from PR: 93 #540

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b24bb6b
fix a couple of bugs
smahmed776 Jun 10, 2023
17121d8
fix one more
smahmed776 Jun 10, 2023
dfad86a
improve autogen script for docs
smahmed776 Jun 10, 2023
dd9a362
fix path related bug
smahmed776 Jun 10, 2023
8c5ac1e
resolve merge conflicts
smahmed776 Jun 10, 2023
065bafe
remove unnecessary comment from watch.py
smahmed776 Jun 10, 2023
dc746ee
Merge branch 'develop' into update-node-manifest-93
smahmed776 Jun 10, 2023
2683d7a
Merge branch 'develop' into update-node-manifest-93
smahmed776 Jun 12, 2023
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
1 change: 0 additions & 1 deletion PYTHON/WATCH/watch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ def run(self):
self.topology = Topology(graph=self.nx_graph)
self.topology.print_id_to_label_mapping()
self.topology.print_graph()
self.topology.collect_ready_jobs()

num_times_waited_for_new_jobs = 0
wait_time_for_new_jobs = 0.1
Expand Down
2 changes: 1 addition & 1 deletion PYTHON/nodes
Open in desktop
Submodule nodes updated from edcab5 to 6da27a
3 changes: 2 additions & 1 deletion flojoy.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,8 @@ $existingPath = [Environment]::GetEnvironmentVariable("Path", "User")
# Check if the path already exists in the variable
if ($existingPath -split ";" -contains $python_scripts_path) {
feedback $true "The Python Scripts path is already present in the Path environment variable..." ""
} else {
}
else {
info_msg "Adding Scipts path to Path environment..."
setx path "$existingPath;$python_scripts_path" 2>$1 > $null
feedback $? "Scripts path added successfully, Please restart PowerShell and run the script again to take effect." "Failed to add Scripts path please add following path to Path environment and run this script again. $python_scripts_path"
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 @@ -60,7 +60,7 @@
"rq-watch": "OBJC_DISABLE_INITIALIZE_FORK_SAFETY=YES rq worker flojoy-watch",
"rq-flojoy": "cd PYTHON && OBJC_DISABLE_INITIALIZE_FORK_SAFETY=YES python worker.py",
"start-project": "concurrently --prefix \"[{time}-{name}]\" -n \"React,Django,RQ-watch,RQ-flojoy\" -c auto \"npm:start\" \"npm:backend\" \"npm:rq-watch\" \"npm:rq-flojoy\"",
"start-project:win": "concurrently -n \"React,Django,RQ-watch,RQ-flojoy\" -c auto \"npm:start\" \"npm:backend\" \"rqworker.exe -w rq_win.WindowsWorker flojoy-watch\" \"cd PYTHON && rqworker.exe -w rq_win.WindowsWorker flojoy\"",
"start-project:win": "concurrently --prefix \"[{time}-{name}]\" -n \"React,Django,RQ-watch,RQ-flojoy\" -c auto \"npm:start\" \"npm:backend\" \"rqworker.exe -w rq_win.WindowsWorker flojoy-watch\" \"cd PYTHON && rqworker.exe -w rq_win.WindowsWorker flojoy\"",
"start-project:ci": "CI=true concurrently --prefix \"[{time}-{name}]\" -n \"React,Django,RQ-watch,RQ-flojoy\" -c auto \"npm:start\" \"npm:backend\" \"npm:rq-watch\" \"npm:rq-flojoy\"",
"format": "npx prettier --write . && black . --extend-exclude '/(node_modules)/'",
"check": "npx prettier --check . && black . --extend-exclude '/(node_modules)/' --check",
Expand Down