Merge pull request #298 from napse-invest/dev

Dev

.github/workflows/check_no_changes_workflows.yml

@@ -4,6 +4,7 @@ on:
   pull_request_target:
     paths:
       - .github/workflows/*
+      - pyproject.toml
 
 jobs:
   check-changes:

.github/workflows/django.yml

@@ -50,7 +50,7 @@ jobs:
           ref: ${{ github.event.pull_request.head.sha || github.ref }}
 
       - name: Set up python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.11"
           architecture: "x64"

.github/workflows/mkdocs.yml

@@ -46,11 +46,11 @@ jobs:
       - uses: actions/checkout@v4
         with:
           ref: ${{ github.event.pull_request.head.sha || github.ref }}
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: 3.11
       - run: echo "cache_id=$(date --utc '+%V')" >> $GITHUB_ENV 
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           key: mkdocs-material-${{ env.cache_id }}
           path: .cache

.github/workflows/pypi.yml

@@ -18,7 +18,7 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Setup python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: 3.11
 
@@ -28,6 +28,8 @@ jobs:
         echo "LATEST_TAG=$tag" >> $GITHUB_ENV
 
     - name: Update version in setup.py
+      env:
+        LATEST_TAG: ${{ env.LATEST_TAG }}
       run: sed -i "s/{{VERSION}}/${{ env.LATEST_TAG }}/g" setup.py
 
     - name: Install pypa/build

Makefile

@@ -1,5 +1,5 @@
 SHELL := /bin/bash
-
+.PHONY: setup
 OS := $(shell uname)
 
 all: setup-testing-environment makemigrations migrate runserver
@@ -10,7 +10,7 @@ ifeq ($(OS),Darwin)        # Mac OS X
 else ifeq ($(OS),Linux)
 	./setup/setup-unix.sh
 else 
-	./setup/setup-windows.sh
+	powershell -NoProfile -ExecutionPolicy Bypass -File ".\setup\setup-windows.ps1"
 endif
 
 setup-testing-environment:
@@ -37,6 +37,9 @@ clean:
 celery:
 	source .venv/bin/activate && watchfiles --filter python celery.__main__.main --args "-A tests.test_app worker --beat -l INFO"
 
+shell:
+	source .venv/bin/activate && python tests/test_app/manage.py shell
+
 test:
 	source .venv/bin/activate && python tests/test_app/manage.py test -v2 --keepdb --parallel
 

django_napse/api/api_urls.py

@@ -24,10 +24,11 @@ def build_main_router() -> DefaultRouter:
     api_dir = Path(__file__).parent
     api_modules_folders_names = [folder.name for folder in api_dir.iterdir() if folder.is_dir() and not folder.name.startswith("_")]
     for module_name in api_modules_folders_names:
+        # print(f"module name: {module_name}")
         try:
             module: ModuleType = import_module(f"django_napse.api.{module_name}.views")
         except (ImportError, ModuleNotFoundError) as error:  # noqa: F841
-            # print(f"Could not import module {module_name}")
+            # print(f"Could not import module {module_name} ({type(error)})")
             # print(error)
             continue
         for obj in vars(module).values():

django_napse/api/bots/serializers/__init__.py

@@ -1,5 +1,5 @@
 from .architecture_serializer import ArchitectureSerializer
-from .bot_serializers import BotSerializer
+from .bot_serializers import BotDetailSerializer, BotSerializer
 from .config_serializer import ConfigSerializer
 from .plugin_serializer import PluginSerializer
 from .strategy_serializer import StrategySerializer