Skip to content

Commit

Permalink
Merge pull request #14 from dsa-ntc/schlich/ci
Browse files Browse the repository at this point in the history
Schlich/ci
  • Loading branch information
icemoon4 authored Dec 22, 2023
2 parents f28f5e1 + ea35a3e commit 0f39fb7
Show file tree
Hide file tree
Showing 23 changed files with 1,158 additions and 1,214 deletions.
34 changes: 30 additions & 4 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,17 +1,25 @@
{
"name": "DSA - ActionKit Templates",
"image": "mcr.microsoft.com/devcontainers/python:1-3.11-bullseye",
"postCreateCommand": "pip install -e .",
"postAttachCommand": "pip install -e .",
"containerEnv": {
"DJANGO_SETTINGS_MODULE": "dsa_actionkit.settings"
"DJANGO_SETTINGS_MODULE": "dsa_actionkit.settings",
"ROOT_URLCONF": "dsa_actionkit.urls",
"DJANGO_SECRET_KEY": "solidarityforever"
},
"customizations": {
"vscode": {
"extensions": [
"ms-python.python",
"tamasfe.even-better-toml",
"samuelcolvin.jinjahtml",
"batisteo.vscode-django"
"batisteo.vscode-django",
"charliermarsh.ruff",
"eamodio.gitlens",
"GitHub.vscode-github-actions",
"tamasfe.even-better-toml",
"esbenp.prettier-vscode",
"redhat.vscode-yaml"
]
},
"settings": {
Expand All @@ -23,5 +31,23 @@
"editor.defaultFormatter": "samuelcolvin.jinjahtml",
"editor.formatOnSave": true
},
"python.terminal.activateEnvInCurrentTerminal": true,
"[python]": {
"editor.codeActionsOnSave": {
"source.fixAll.ruff": true,
"source.organizeImports.ruff": true
},
"editor.defaultFormatter": "charliermarsh.ruff"
},
"python.testing.cwd": "tests",
"python.testing.unittestEnabled": false,
"python.testing.pytestEnabled": true,
"editor.formatOnSave": true,
"editor.formatOnPaste": true,
"editor.stickyScroll.enabled": true,
"dbt.enableNewLineagePanel": true,
"files.insertFinalNewline": true,
"terminal.integrated.environmentChangesIndicator": "on"
}
}
}
}
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,5 @@ site.css.map
build
.venv
dist
*.egg-info
*.egg-info
db.sqlite
18 changes: 12 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@

## Quickstart

Use the following commands to try installing and running this application *in a separate project*, such as when you need to extend the app with your own branding.

> To make contributions and changes to the way the app runs under the hood, skip to [Developing](#developing) and work directly from the source code in this repository!
```console
$ mkdir myproject && cd myproject
$ python --version
Expand All @@ -27,13 +31,7 @@ Starting development server at http://127.0.0.1:8000/
Quit the server with CONTROL-C.
```

## Developing

Clone the repo and install the project package and all dependencies in editable mode:

```
pip install -e .
```

## Customize

Expand Down Expand Up @@ -101,6 +99,14 @@ In the occasional moment when you are developing without an internet connection

In that situation, if you set STATIC_FALLBACK to a directory where, e.g. `jquery.min.js` is present, then it will look for all the internet-external files in that directory. Note that this only works with `load_js` and `load_css` template tags.

## Developing

Clone the repo and install the project package and all dependencies in editable mode:

```
pip install -e .
```

Adding Tests
============

Expand Down
1 change: 1 addition & 0 deletions dsa_actionkit/aktemplates.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#!/usr/bin/env python
import os
import sys

#STATIC_FALLBACK="/static/js/fallback_local" PYTHONPATH=./djanger django-admin runserver --settings=settings


Expand Down
Loading

0 comments on commit 0f39fb7

Please sign in to comment.