diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml deleted file mode 100644 index 531b041..0000000 --- a/.github/workflows/main.yml +++ /dev/null @@ -1,52 +0,0 @@ -name: test - -on: [push, pull_request, workflow_dispatch] - -jobs: - test: - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - python-version: ['3.11', '3.12', '3.13', '3.14'] - steps: - - uses: actions/checkout@v4 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v5 - with: - python-version: ${{ matrix.python-version }} - - name: Install dependencies - run: | - python -m pip install --upgrade pip - pip install poetry - poetry install - - name: Lint - run: | - poetry run flake8 - poetry run mypy . - poetry run reuse lint - - name: Test - run: | - poetry run pytest - - deploy: - permissions: - contents: read - packages: write - needs: [test] - runs-on: ubuntu-latest - if: (github.repository == 'msys2/msys2-web' && github.event_name == 'push' && github.ref == 'refs/heads/main') - steps: - - uses: actions/checkout@v4 - - name: Log in - run: | - echo "$TOKEN" | docker login ghcr.io --username "$USERNAME" --password-stdin - env: - TOKEN: ${{ secrets.GITHUB_TOKEN }} - USERNAME: ${{ github.actor }} - - name: Build image - run: | - docker build --tag ghcr.io/msys2/msys2-web:latest . - - name: Deploy image - run: | - docker push ghcr.io/msys2/msys2-web:latest diff --git a/app/__init__.py b/app/__init__.py index 12c41b6..5bbc5fb 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -12,7 +12,7 @@ from fastapi.middleware.cors import CORSMiddleware from .web import webapp, check_is_ready from .api import api from .utils import logger -from .mcp import mcpapp +#from .mcp import mcpapp from .fetch.update import update_loop @@ -26,19 +26,19 @@ async def lifespan(app: FastAPI) -> AsyncIterator[None]: task = asyncio.create_task(update_loop()) _background_tasks.add(task) task.add_done_callback(_background_tasks.discard) - async with mcpapp.session_manager.run(): - yield +# async with mcpapp.session_manager.run(): + yield app = FastAPI(openapi_url=None, lifespan=lifespan) webapp.mount("/api", api, name="api") -mcpapp_mcp = mcpapp.streamable_http_app() -mcpapp_mcp.add_middleware( - CORSMiddleware, - allow_origins=["*"], - allow_methods=["GET", "POST", "OPTIONS"], -) -app.mount("/mcp", mcpapp_mcp, name="mcp") +#mcpapp_mcp = mcpapp.streamable_http_app() +#mcpapp_mcp.add_middleware( +# CORSMiddleware, +# allow_origins=["*"], +# allow_methods=["GET", "POST", "OPTIONS"], +#) +#app.mount("/mcp", mcpapp_mcp, name="mcp") app.mount("/", webapp) diff --git a/app/templates/layout.html b/app/templates/layout.html index a319d46..21f7ac2 100644 --- a/app/templates/layout.html +++ b/app/templates/layout.html @@ -11,12 +11,12 @@ - {% block title %}{% endblock %} - MSYS2 Packages + {% block title %}{% endblock %} - Befator Inc. MSYS2 Packages