Merge pull request #402 from devsetgo/dev

Adding new base schema for database types

Author: devsetgo

.bumpversion.cfg

@@ -1,15 +1,15 @@
 [bumpversion]
-current_version = 0.11.2
+current_version = 0.12.0
 commit = False
 tag = False
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(-(?P<release>[a-z]+)(?P<num>\d+))?
-serialize =
+serialize = 
 	{major}.{minor}.{patch}-{release}{num}
 	{major}.{minor}.{patch}
 
 [bumpversion:part:release]
 optional_value = alpha
-values =
+values = 
 	alpha
 	beta
 	pre-release

.devcontainer/docker-compose.yml

@@ -11,7 +11,7 @@ services:
     networks:
       - app-network
 
-  postgresdb:
+  postgresdbTest:
     image: postgres:latest
     restart: unless-stopped
     volumes:
@@ -34,7 +34,7 @@ services:
     ports:
       - "5050:80"
     depends_on:
-      - postgresdb
+      - postgresdbTest
     networks:
       - app-network
 

.github/workflows/testing.yml

@@ -1,36 +1,49 @@
 name: Testing
 
-on: [push]
+on:
+  pull_request:
+  workflow_dispatch:
 
 jobs:
   build:
     env:
-      USING_COVERAGE: '3.12'
+      USING_COVERAGE: "3.12"
+      DATABASE_URL: "postgresql://postgres:postgres@localhost:5432/postgres"
     runs-on: ubuntu-latest
+    services:
+      postgresdbTest:
+        image: postgres:latest
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: postgres
+          POSTGRES_DB: postgres
+        ports:
+          - 5432:5432
+        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
     strategy:
       max-parallel: 10
       matrix:
         os: [ubuntu-latest, windows-latest]
-        python-version: ["3.9","3.10","3.11","3.12"]
-
+        python-version: ["3.12","3.9", "3.10", "3.11"]
     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 -r requirements.txt --use-deprecated=legacy-resolver
-    # - name: Lint with flake8
-    #   run: |
-    #     pip install flake8
-    #     # stop the build if there are Python syntax errors or undefined names
-    #     flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
-    #     # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
-    #     flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
-    - name: Test with pytest
-      run: |
-        pip install pytest
-        pytest
+      - uses: actions/checkout@v4
+      - name: Wait for PostgreSQL to become ready
+        run: |
+          for i in {1..30}; do
+            pg_isready -h localhost -p 5432 && echo Success && exit 0
+            echo -n .
+            sleep 2
+          done
+          echo Failed waiting for Postgres && exit 1
+      - 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 -r requirements.txt --use-deprecated=legacy-resolver
+      - name: Test with pytest
+        run: |
+          pip install pytest
+          pytest