Feature/servc

.coveragerc

@@ -1,4 +1,3 @@
 [run]
 omit = 
-  tests/*
-  servc/com/bus/rabbitmq/rpc.py
+  tests/*

.github/workflows/version.yml → .github/workflows/pypi.yml

@@ -1,9 +1,9 @@
-name: 'Changelong'
+name: 'Package Publish'
 on: 
   - push
 
 jobs: 
-  version:
+  packagepublish:
     runs-on: ubuntu-latest
     steps:
       - uses: https://git.yusufali.ca/actions/commit@main

.github/workflows/servc.yml

@@ -1,11 +1,58 @@
 name: 'Serv-C Unit Test'
 on:
-  - push
+  - pull_request
 
 jobs:
   servc:
     runs-on: ubuntu-latest
 
+    strategy:
+      matrix:
+        python-version: 
+          - 3.13
+
+    services:
+      rabbitmq:
+        image: rabbitmq:3
+        env:
+          RABBITMQ_DEFAULT_USER: guest
+          RABBITMQ_DEFAULT_PASS: guest
+        ports:
+          - 5672/tcp
+
+      redis:
+        image: redis
+        options: >-
+          --health-cmd "redis-cli ping"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          - 6379/tcp
+
     steps:
+      - if: github.server_url != 'https://github.com'
+        run: sleep 20s
+
+      - uses: actions/checkout@v4
+        with:
+          submodules: true
+
+      - uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Install dependencies
+        run: pip install -r requirements.txt
+
+      - name: Set Environment Variables
+        run: |
+          echo "CURRENT_PATH=$(pwd)" >> $GITHUB_ENV
+          echo "CACHE_URL=redis://redis" >> $GITHUB_ENV
+          echo "BUS_URL=amqp://guest:guest@rabbitmq" >> $GITHUB_ENV
+          chmod +x start.sh
+
       - name: Run Servc Tests
-        uses: serv-c/docs@0.2.12
+        uses: serv-c/docs@0.2.14
+        with:
+          startcmd: ${{ env.CURRENT_PATH }}/start.sh

.github/workflows/test.yml

@@ -29,19 +29,6 @@ jobs:
         ports:
           - 6379/tcp
 
-      postgres:
-        image: postgres
-        env:
-          POSTGRES_PASSWORD: postgres
-          POSTGRES_DB: postgres
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-        ports:
-          - 5432/tcp
-
     steps:
       - if: github.server_url != 'https://github.com'
         run: sleep 20s
@@ -54,14 +41,11 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
 
-      - name: Lint
+      - name: Type check
         run: |
-          pip install isort black flake8 coverage
-          isort servc
-          black servc
-          flake8 --ignore=E501,W503 servc
-          git status
-          git diff --exit-code servc
+          pip install mypy
+          pip install types-PyYAML types-simplejson types-redis
+          mypy servc
 
       - name: Install dependencies
         run: |
@@ -76,10 +60,9 @@ jobs:
 
       - name: Run tests
         env:
-          DATABASE_URL: postgres://postgres:postgres@postgres/postgres
           CACHE_URL: redis://redis
           BUS_URL: amqp://guest:guest@rabbitmq
         run: |
-          coverage run --concurrency=multiprocessing -m unittest tests/*.py
-          coverage combine
+          pip install coverage
+          coverage run -m unittest tests/**/*.py
           coverage report -m --fail-under=60

README.md

@@ -2,6 +2,7 @@
 
 Serv-C implmentation for Python. Documentation can be found https://docs.servc.io
 
+[![PyPI version](https://badge.fury.io/py/servc.svg)](https://badge.fury.io/py/servc)
 ![Serv-C](https://git.yusufali.ca/serv-c/servc-python/actions/workflows/servc.yml/badge.svg)
 
 ## Example

docker-compose.yml

@@ -8,14 +8,13 @@ services:
     command: sleep infinity
     environment:
       CACHE_URL: redis://redis:6379/0
-      BUS_URL: amqp://rabbitmq:rabbitmq@rabbitmq
+      BUS_URL: amqp://rabbitmq:rabbitmq@rabbitmq/
     links:
       - rabbitmq
       - redis
 
   redis:
     image: redis
-    container_name: redis
     restart: unless-stopped
     expose:
       - "6379"
@@ -24,11 +23,10 @@ services:
 
   rabbitmq:
     image: rabbitmq:3-management
-    container_name: rabbitmq
     environment:
       RABBITMQ_DEFAULT_USER: rabbitmq
       RABBITMQ_DEFAULT_PASS: rabbitmq
-      RABBITMQ_DEFAULT_VHOST: / 
+      RABBITMQ_DEFAULT_VHOST: /
     ports:
       - "5672:5672"
       - "15672:15672"

main.py

@@ -1,10 +1,12 @@
-from servc.com.server.server import start_server
+from servc.server import start_server
+
 
 def main():
     return start_server(
         resolver={},
-        eventResolver={},
+        # route="test",
     )
 
+
 if __name__ == '__main__':
-    main()
+    main()

requirements.txt

@@ -3,3 +3,4 @@ pika==1.3.2
 redis==5.2.0
 simplejson==3.19.2
 flask==3.0.1
+pyyaml==6.0.2