diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 52ae5769..63b1fb9c 100755 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ['3.8', '3.9', '3.10'] + python-version: ['3.10', '3.11', '3.12'] steps: - name: Check out repo diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index e72d1d62..ce33a2b2 100755 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -14,7 +14,7 @@ jobs: - uses: actions/setup-python@v4 with: python-version: 3.x - - uses: actions/cache@v2 + - uses: actions/cache@v4 with: key: ${{ github.ref }} path: .cache @@ -29,21 +29,22 @@ jobs: sudo pip3 install mkdocs-minify-plugin sudo pip3 install mkdocs-redirects sudo pip3 install pillow cairosvg + sudo pip3 install mkdocstrings-python - name: Deploy MkDocs Page run: sudo mkdocs gh-deploy --force - - name: Git Commit staged - run: | - sudo git config --global --add user.name emersonfelipesp - sudo git config --global --add user.email emersonfelipe.2003@gmail.com - sudo git add . - sudo git commit -m "Saves 'site' html pages" - - name: Git checkout to 'gh-pages' branch - run: | - sudo git checkout gh-pages - sudo git push --set-upstream origin gh-pages - - name: Change custom domain - run: | - sudo echo 'proxbox.netbox.dev.br' > CNAME - sudo git add CNAME - sudo git commit -m "Change custom domain to 'proxbox.netbox.dev.br'" - sudo git push + # - name: Git Commit staged + # run: | + # sudo git config --global --add user.name emersonfelipesp + # sudo git config --global --add user.email emersonfelipe.2003@gmail.com + # sudo git add . + # sudo git commit -m "Saves 'site' html pages" + # - name: Git checkout to 'gh-pages' branch + # run: | + # sudo git checkout gh-pages + # sudo git push --set-upstream origin gh-pages + # - name: Change custom domain + # run: | + # sudo echo 'proxbox.netbox.dev.br' > CNAME + # sudo git add CNAME + # sudo git commit -m "Change custom domain to 'proxbox.netbox.dev.br'" + # sudo git push diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index 541fd5cb..11d52dfc 100755 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [3.7, 3.8] + python-version: ['3.10', '3.11', '3.12'] steps: - uses: actions/checkout@v2 diff --git a/netbox_proxbox/views/proxbox_backend.py b/netbox_proxbox/views/proxbox_backend.py index f94f4247..7282bc69 100644 --- a/netbox_proxbox/views/proxbox_backend.py +++ b/netbox_proxbox/views/proxbox_backend.py @@ -1,5 +1,6 @@ from django.views import View from django.shortcuts import render, redirect +import subprocess try: from netbox import configuration diff --git a/netbox_proxbox/views/sync.py b/netbox_proxbox/views/sync.py index a0a672c8..e4d64563 100644 --- a/netbox_proxbox/views/sync.py +++ b/netbox_proxbox/views/sync.py @@ -35,14 +35,13 @@ class HtmxHttpRequest(HttpRequest): fastapi_verify_ssl: bool = fastapi_detail.get('verify_ssl', True) def sync_resource(request: HtmxHttpRequest, path: str, template_name: str, query_params: dict = None) -> HttpResponse: - global CONNECTED_URL_SUCCESSFUL - fastapi_path: str = f'{fastapi_url}/{path}' if fastapi_url else None if not fastapi_url: return HttpResponse(status=404, content='No FastAPI URL found') def make_request(): + global CONNECTED_URL_SUCCESSFUL try: response = requests.get(fastapi_path, params=query_params, verify=fastapi_verify_ssl) if response.ok: diff --git a/netbox_proxbox/websocket_client.py b/netbox_proxbox/websocket_client.py index 2cf9a89c..27190c7a 100644 --- a/netbox_proxbox/websocket_client.py +++ b/netbox_proxbox/websocket_client.py @@ -75,7 +75,6 @@ def start_websocket(uri): print('WebSocket task started.') def stop_websocket(): - global websocket_task if websocket_task: websocket_task.cancel() print('WebSocket task stopped.') @@ -100,7 +99,6 @@ def get(self, request, message): bulk_messages_count = 20 # Declare the global variable to store the messages global GLOBAL_WEBSOCKET_MESSAGES - global websocket_task # Ensure thread safety for message access with websocket_lock: