Skip to content

Commit

Permalink
Merge pull request #424 from karrioapi/karrio-2023.9
Browse files Browse the repository at this point in the history
[release] Karrio 2023.9
  • Loading branch information
danh91 authored Nov 28, 2023
2 parents 0664c25 + cfdef96 commit a09254d
Show file tree
Hide file tree
Showing 3,484 changed files with 852,023 additions and 506,893 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
34 changes: 0 additions & 34 deletions .codegen/typescript/.gitignore

This file was deleted.

25 changes: 0 additions & 25 deletions .codegen/typescript/package.json

This file was deleted.

21 changes: 0 additions & 21 deletions .codegen/typescript/tsconfig.json

This file was deleted.

4 changes: 0 additions & 4 deletions .coveragerc
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,7 @@
[run]
branch = True
omit =
*/sdk/extensions/asendia_us/*
*/sdk/extensions/boxknight/*
*/sdk/extensions/dicom/*
*/sdk/extensions/ics_courier/*
*/sdk/extensions/ups_ground/*

[report]
include =
Expand Down
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
DEBUG_MODE=True
ALLOWED_HOSTS=*
DATABASE_NAME=db.sqlite3
# DATABASE_ENGINE=postgresql_psycopg2
# DATABASE_ENGINE=postgresql
# DATABASE_USERNAME=postgres
# DATABASE_PASSWORD=postgres
# DATABASE_NAME=db
Expand Down
12 changes: 12 additions & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,15 @@ jobs:
./bin/setup-server-env &&
./bin/migrate &&
./bin/run-server-tests
dashbaord-ci:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Install
run: |
npm install
- name: Test Build
run: |
npm run build -w apps/dashboard
27 changes: 15 additions & 12 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -103,26 +103,29 @@ venv.bak/
# mypy
.mypy_cache/

.idea
# misc
*.DS_Store
*.pem

# node
node_modules

.DS_Store
# turbo
.turbo

# vercel
.vercel

# karrio stuff:
sdk/**/poetry.lock
schemas/**/poetry.lock
ee/sdk/**/poetry.lock
!sdk/core/karrio/lib
!apps/dashboard/src/lib
!packages/lib

.bash_history
*.DS_Store

.idea/
staticfiles/*
server/main/karrio/server/staticfiles/*
!server/main/karrio/server/staticfiles/.gitkeep
apps/api/karrio/server/staticfiles/*

.karrio/
.codegen/*
!.codegen/typescript/
.codegen/typescript/api/generated
packages/karriojs/api/generated
!docker/.env
1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
auto-install-peers = true
7 changes: 6 additions & 1 deletion .vscode/karrio.code-workspace
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,16 @@
}
],
"settings": {
"editor.formatOnPaste": true,
"python.terminal.activateEnvInCurrentTerminal": true,
"editor.formatOnSave": true,
"python.defaultInterpreterPath": "${workspaceFolder}/.venv/karrio",
"files.associations": {
"**/*.html": "html",
"**/templates/**/*.html": "django-html",
"**/templates/**/*": "django-txt",
"**/requirements{/**,*}.{txt,in}": "pip-requirements"
}
},
"python.analysis.autoImportCompletions": true,
}
}
15 changes: 0 additions & 15 deletions .vscode/settings.json

This file was deleted.

Loading

0 comments on commit a09254d

Please sign in to comment.