Skip to content

Commit bc22d07

Browse files
committed
Merge branch 'main' of github.com:JBEI/foldy-internal
2 parents 8b23d6b + aef8aa5 commit bc22d07

55 files changed

Lines changed: 4562 additions & 2322 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.vscode/settings.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,22 +19,22 @@
1919
"docker.enableDockerComposeLanguageService": false,
2020
"cursor.general.disableHttp2": true,
2121
"workbench.colorCustomizations": {
22-
"activityBar.activeBackground": "#ab307e",
23-
"activityBar.background": "#ab307e",
22+
"activityBar.activeBackground": "#1f6fd0",
23+
"activityBar.background": "#1f6fd0",
2424
"activityBar.foreground": "#e7e7e7",
2525
"activityBar.inactiveForeground": "#e7e7e799",
26-
"activityBarBadge.background": "#25320e",
27-
"activityBarBadge.foreground": "#e7e7e7",
26+
"activityBarBadge.background": "#ee90bb",
27+
"activityBarBadge.foreground": "#15202b",
2828
"commandCenter.border": "#e7e7e799",
29-
"sash.hoverBorder": "#ab307e",
30-
"statusBar.background": "#832561",
29+
"sash.hoverBorder": "#1f6fd0",
30+
"statusBar.background": "#1857a4",
3131
"statusBar.foreground": "#e7e7e7",
32-
"statusBarItem.hoverBackground": "#ab307e",
33-
"statusBarItem.remoteBackground": "#832561",
32+
"statusBarItem.hoverBackground": "#1f6fd0",
33+
"statusBarItem.remoteBackground": "#1857a4",
3434
"statusBarItem.remoteForeground": "#e7e7e7",
35-
"titleBar.activeBackground": "#832561",
35+
"titleBar.activeBackground": "#1857a4",
3636
"titleBar.activeForeground": "#e7e7e7",
37-
"titleBar.inactiveBackground": "#83256199",
37+
"titleBar.inactiveBackground": "#1857a499",
3838
"titleBar.inactiveForeground": "#e7e7e799"
3939
},
4040
"peacock.color": "#1857a4",

backend/pyproject.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ dependencies = [
9999
"Pillow==11.1.0",
100100
"dnachisel",
101101
"openpyxl",
102+
"xlrd>=2.0.1",
102103

103104
# Misc runtime utils
104105
"requests==2.32.3",

backend/requirements.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -628,6 +628,8 @@ wtforms==3.1.2
628628
# via
629629
# flask-admin
630630
# foldy-backend (backend/pyproject.toml)
631+
xlrd==2.0.2
632+
# via foldy-backend (backend/pyproject.toml)
631633
zstandard==0.23.0
632634
# via flask-compress
633635

0 commit comments

Comments
 (0)