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.

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

Added helpers to devbox #172

Merged
merged 23 commits into from
Mar 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
3356650
Merge branch 'master' of github.com:bee-mar/mmpm into develop
Bee-Mar Dec 26, 2023
9fc9576
Merge branch 'develop' of github.com:bee-mar/mmpm into develop
Bee-Mar Dec 26, 2023
8d794fe
Merge branch 'develop' of github.com:bee-mar/mmpm into develop
Bee-Mar Dec 26, 2023
4c06596
Hotfix/conditional deps (#154)
Bee-Mar Dec 26, 2023
0df2a65
silly mistake not calling get on the env vars
Bee-Mar Dec 26, 2023
d47eaab
update changelog
Bee-Mar Dec 26, 2023
e28a0db
formatting files
Bee-Mar Dec 26, 2023
3a26262
Merge branch 'master' of github.com:bee-mar/mmpm into develop
Bee-Mar Dec 28, 2023
a3a40ac
updating for minor version bump
Bee-Mar Jan 7, 2024
b0bac2c
removed unnecessary Dockerfile
Bee-Mar Jan 8, 2024
19fbeb7
fix: added better logic to determine the appropriate python3 path (#165)
Bee-Mar Jan 18, 2024
4f3d7ca
Update method to determine Python and Gunicorn executable and add Dev…
Bee-Mar Feb 11, 2024
ec92a26
update changelog
Bee-Mar Feb 11, 2024
1d06ae1
Merge branch 'master' into develop
Bee-Mar Feb 11, 2024
5d26988
update pdm run script
Bee-Mar Feb 11, 2024
70d3897
added extra initialization at end of devbox setup
Bee-Mar Feb 11, 2024
23a9afc
added devbox script and nodejs version
Bee-Mar Feb 11, 2024
95a1914
added scripts to devbox
Bee-Mar Mar 2, 2024
6c7c963
Merge branch 'master' into develop
Bee-Mar Mar 2, 2024
f571c42
rearrange devbox config
Bee-Mar Mar 5, 2024
71128a5
Merge branch 'develop' of github.com:bee-mar/mmpm into develop
Bee-Mar Mar 5, 2024
198c9b5
cleanup devbox
Bee-Mar Mar 5, 2024
ab56ed3
cleanup of devbox
Bee-Mar Mar 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
54 changes: 47 additions & 7 deletions devbox.json
Original file line number Diff line number Diff line change
@@ -1,23 +1,63 @@
{
"packages": [
"python@3.10",
"bun@1.0.25",
"pm2@5.3.1",
"nodejs@20.11.0",
"pdm@2.12.3",
"python310Packages.pip@23.2.1"
"pm2@5.3.1",
"python@3.10"
],
"env": {
"VENV_DIR": ".venv"
"VENV_DIR": "$PWD/.venv"
},
"shell": {
"init_hook": [
"[ -d $VENV_DIR ] && source $VENV_DIR/bin/activate"
"[ ! -d $VENV_DIR ] && echo 'Creating virtualenv ...' && python3 -m venv $VENV_DIR",
"source $VENV_DIR/bin/activate"
],
"scripts": {
"setup": [
"pdm install",
"cd ui && bun install; cd ..",
"source $VENV_DIR/bin/activate"
"cd ui && bun install"
],
"test": [
"coverage run -m pytest test"
],
"report": [
"coverage report"
],
"lint": [
"pylint mmpm",
"cd ui && bun run lint"
],
"mypy": [
"mypy mmpm"
],
"format": [
"isort mmpm",
"isort test",
"black mmpm --line-length=150",
"black test --line-length=150",
"cd ui && bun run format"
],
"start": [
"pm2 start dev/ecosystem.json"
],
"stop": [
"pm2 stop dev/ecosystem.json"
],
"remove": [
"pm2 delete dev/ecosystem.json"
],
"logs": [
"pm2 logs mmpm"
],
"deploy": [
"cd ui && npm install --legacy-peer-deps && cd ..",
"cd ui && ./node_modules/@angular/cli/bin/ng.js build --configuration production --output-hashing none --base-href / && cd ..",
"pdm install",
"mkdir -p mmpm/ui",
"cp -r ui/build/* mmpm/ui",
"pdm build"
]
}
}
Expand Down
41 changes: 20 additions & 21 deletions devbox.lock
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,26 @@
}
}
},
"nodejs@20.11.0": {
"last_modified": "2024-01-27T14:55:31Z",
"resolved": "github:NixOS/nixpkgs/160b762eda6d139ac10ae081f8f78d640dd523eb#nodejs_20",
"source": "devbox-search",
"version": "20.11.0",
"systems": {
"aarch64-darwin": {
"store_path": "/nix/store/kwwq75mfw7xch7vx40sdn5sbxp5ibmgd-nodejs-20.11.0"
},
"aarch64-linux": {
"store_path": "/nix/store/9w2340q4fl45sfmllsgicbv2n2xhzjsw-nodejs-20.11.0"
},
"x86_64-darwin": {
"store_path": "/nix/store/zgmy5yc85d3mkz6zdmazv799c45f2gkh-nodejs-20.11.0"
},
"x86_64-linux": {
"store_path": "/nix/store/d6lkbndr98lcn8spbqxfq52f2ldvqhks-nodejs-20.11.0"
}
}
},
"pdm@2.12.3": {
"last_modified": "2024-02-05T02:15:44Z",
"resolved": "github:NixOS/nixpkgs/0a254180b4cad6be45aa46dce896bdb8db5d2930#pdm",
Expand Down Expand Up @@ -58,27 +78,6 @@
}
}
},
"python310Packages.pip@23.2.1": {
"last_modified": "2023-12-13T22:54:10Z",
"plugin_version": "0.0.1",
"resolved": "github:NixOS/nixpkgs/fd04bea4cbf76f86f244b9e2549fca066db8ddff#python310Packages.pip",
"source": "devbox-search",
"version": "23.2.1",
"systems": {
"aarch64-darwin": {
"store_path": "/nix/store/vjyrxbxqsadvr9g6mzig6y406dhwcrqi-python3.10-pip-23.2.1"
},
"aarch64-linux": {
"store_path": "/nix/store/j8pxwv7vyjm8z2fqglijjvabbkmxbv9r-python3.10-pip-23.2.1"
},
"x86_64-darwin": {
"store_path": "/nix/store/7lyvqf8wl47wzgsqmlcz39ycmwxyg9zx-python3.10-pip-23.2.1"
},
"x86_64-linux": {
"store_path": "/nix/store/gdhvfi5zaqzpa5l3kk0spmv71r549slf-python3.10-pip-23.2.1"
}
}
},
"python@3.10": {
"last_modified": "2024-01-27T14:55:31Z",
"plugin_version": "0.0.1",
Expand Down
15 changes: 15 additions & 0 deletions ui/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading