Merge pull request #12 from KiraPC/fix-after-merge

Fix after merge

Author: KiraPC

.github/workflows/ci.yml

@@ -1,12 +1,10 @@
-name: fastapi-router-controller
+name: Run Tests
 
-on: [push]
+on: [push, pull_request]
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
-
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python 3.8
@@ -17,13 +15,6 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         pip install -e .[tests]
-    # - name: Test with flake8
-    #   run: |
-    #     flake8 tests src
     - name: Test with pytest
       run: |
         pytest tests --cov fastapi_router_controller --cov-report term --cov-report html
-    # - name: Report coverage
-    #   run: |
-    #     codecov
-

.github/workflows/on_pr_tests.yml

@@ -28,7 +28,7 @@ jobs:
       - name: Create Distribution Package
         env:
           RELEASE_VERSION: ${{ steps.vars.outputs.tag }}
-        run: sed -i -r s"/VERSION = \"(.*)\"/VERSION = \"$FOO\"/"g setup.py && python setup.py sdist
+        run: sed -i -r s"/VERSION = \"(.*)\"/VERSION = \"$RELEASE_VERSION\"/"g setup.py && python setup.py sdist
       - name: Publish package
         uses: pypa/gh-action-pypi-publish@release/v1
         with:

.github/workflows/on_tag_release.yml

@@ -1,4 +1,3 @@
-import unittest
 from fastapi import FastAPI
 from fastapi.testclient import TestClient
 from fastapi_router_controller import ControllersTags
@@ -12,18 +11,3 @@
 
 app.include_router(SampleController.router())
 app.include_router(AnotherSampleController.router())
-
-class TestRoutes(unittest.TestCase):
-    def setUp(self):
-        self.client = TestClient(app)
-
-    def test_get_sample_controller(self):
-        response = self.client.get("/sample_controller/?id=1234")
-        self.assertEqual(response.status_code, 200)
-
-    def test_post_sample_controller(self):
-        response = self.client.post("/sample_controller/", json={"id": "test"})
-        self.assertEqual(response.status_code, 201)
-
-if __name__ == "__main__":
-    unittest.main()

example/requirements.txt

@@ -1,6 +1,4 @@
-import unittest
 from fastapi import FastAPI
-from fastapi.testclient import TestClient
 from fastapi_router_controller import Controller, ControllersTags
 
 # just import the main package to load all the controllers in
@@ -14,18 +12,3 @@
 
 for router in Controller.routers():
     app.include_router(router)
-
-class TestRoutes(unittest.TestCase):
-    def setUp(self):
-        self.client = TestClient(app)
-
-    def test_get_sample_extended_controller(self):
-        response = self.client.get("/sample_extended_controller/?id=1234")
-        self.assertEqual(response.status_code, 200)
-
-    def test_get_sample_extended_controller_parent_api(self):
-        response = self.client.get("/sample_extended_controller/parent_api")
-        self.assertEqual(response.status_code, 200)
-
-if __name__ == "__main__":
-    unittest.main()

example/sample_app/app.py

@@ -1,6 +1,5 @@
-# pylint: disable=line-too-long
 '''
-    :author: Pasquale Carmone Carbone
+    :author: Pasquale Carmine Carbone
 
     Setup module
 '''
@@ -12,10 +11,10 @@
 with open('requirements.txt', 'r') as fin:
     REQS = fin.read().splitlines()
 
-VERSION = "0.2.5"
+__VERSION__ = '0.2.5'
 
 setuptools.setup(
-    version=VERSION,
+    version=__VERSION__,
     name='fastapi-router-controller',
     author='Pasquale Carmine Carbone',
     author_email='[email protected]',

example/sample_app_with_auto_import/app.py

@@ -6,8 +6,7 @@
 from fastapi.testclient import TestClient
 
 router = APIRouter()
-
-controller = Controller(router, openapi_tag={"name": "sample_controller"})
+controller = Controller(router, openapi_tag={'name': 'sample_controller'})
 
 
 class SampleObject(BaseModel):
@@ -17,43 +16,43 @@ class SampleObject(BaseModel):
 def get_x():
     class Foo:
         def create(self):
-            return "XXX"
+            return 'XXX'
 
     return Foo()
 
 
 def get_y():
     try:
-        yield "get_y_dep"
+        yield 'get_y_dep'
     finally:
-        print("get_y done")
+        print('get_y done')
 
 
 class Filter(BaseModel):
     foo: str
 
 
-# With the "resource" decorator define the controller Class linked to the Controller router arguments
+# With the 'resource' decorator define the controller Class linked to the Controller router arguments
 @controller.resource()
 class SampleController:
     def __init__(self, x=Depends(get_x)):
         self.x = x
 
     @controller.route.get(
-        "/",
-        tags=["sample_controller"],
-        summary="return a sample object",
+        '/',
+        tags=['sample_controller'],
+        summary='return a sample object',
         response_model=SampleObject,
     )
     def root(
         self,
-        id: str = Query(..., title="itemId", description="The id of the sample object"),
+        id: str = Query(..., title='itemId', description='The id of the sample object'),
     ):
         id += self.x.create()
         return SampleObject(id=id)
 
     @controller.route.post(
-        "/hello", response_model=SampleObject,
+        '/hello', response_model=SampleObject,
     )
     def hello(self, f: Filter, y=Depends(get_y)):
         _id = f.foo
@@ -64,8 +63,8 @@ def hello(self, f: Filter, y=Depends(get_y)):
 
 def create_app():
     app = FastAPI(
-        title="A sample application using fastapi_router_controller",
-        version="0.1.0",
+        title='A sample application using fastapi_router_controller',
+        version='0.1.0',
         openapi_tags=ControllersTags,
     )
 
@@ -79,11 +78,11 @@ def setUp(self):
         self.client = TestClient(app)
 
     def test_root(self):
-        response = self.client.get("/?id=12")
+        response = self.client.get('/?id=12')
         self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.json(), {"id": "12XXX"})
+        self.assertEqual(response.json(), {'id': '12XXX'})
 
     def test_hello(self):
-        response = self.client.post("/hello", json={"foo": "WOW"})
+        response = self.client.post('/hello', json={'foo': 'WOW'})
         self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.json(), {"id": "WOWget_y_depXXX"})
+        self.assertEqual(response.json(), {'id': 'WOWget_y_depXXX'})