Preliminary SQLAlchemy 2.0 support (#14)

* SQLAlchemy 2.0 support.

* Makefile updates.

* Bump version: 0.6.4 → 0.7.0.

* Added way to run Docker tests manually (to test compatiblity with PostgreSQL).

* Tweak CI/CD test pipeline.

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.6.4
+current_version = 0.7.1
 commit = True
 tag = False
 

.github/workflows/build.yml → .github/workflows/test.yml

@@ -1,18 +1,16 @@
-name: Build
+name: Tests
 
 on:
   push:
     branches: [ main ]
   pull_request:
-    branches: [ main ]
+    branches: [ main, "*" ]
   workflow_dispatch:
 
 jobs:
   test:
     runs-on: ubuntu-20.04
-    # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v3
       - name: Build Docker image
         run: |

Makefile

@@ -1,12 +1,17 @@
 sources = sqlalchemy_easy_softdelete
 
-.PHONY: lint test coverage clean
+.PHONY: lint test docker_test coverage clean dev pg bump_patch bump_minor bump_major
+
 lint:
 	pre-commit run --all-files
 
 test:
 	pytest
 
+docker_test: clean
+	docker compose build tests-with-coverage
+	docker compose --env-file .env.docker run tests
+
 coverage:
 	pytest --cov=$(sources) --cov-branch --cov-report=term-missing --cov-report=xml tests
 
@@ -15,10 +20,24 @@ clean:
 	rm -rf *.egg-info
 	rm -rf .tox dist site
 	rm -rf coverage.xml .coverage
+	docker compose down -v
 
 dev:
+	poetry install -E dev -E test
+
+
+pg:
 	# Start Postgres Instance
 	docker compose up -d pg
 
+# 0.0.X
 bump_patch:
 	bump2version patch --no-tag
+
+# 0.X.0
+bump_minor:
+	bump2version minor --no-tag
+
+# X.0.0
+bump_major:
+	bump2version major --no-tag

README.md

@@ -2,7 +2,7 @@
 
 [![pypi](https://img.shields.io/pypi/v/sqlalchemy-easy-softdelete.svg)](https://pypi.org/project/sqlalchemy-easy-softdelete/)
 [![python](https://img.shields.io/pypi/pyversions/sqlalchemy-easy-softdelete.svg)](https://pypi.org/project/sqlalchemy-easy-softdelete/)
-[![Build Status](https://github.com/flipbit03/sqlalchemy-easy-softdelete/actions/workflows/build.yml/badge.svg)](https://github.com/flipbit03/sqlalchemy-easy-softdelete/actions/workflows/build.yml)
+[![Build Status](https://github.com/flipbit03/sqlalchemy-easy-softdelete/actions/workflows/test.yml/badge.svg)](https://github.com/flipbit03/sqlalchemy-easy-softdelete/actions/workflows/test.yml)
 
 [//]: # ([![codecov](https://codecov.io/gh/flipbit03/sqlalchemy-easy-softdelete/branch/main/graphs/badge.svg)](https://codecov.io/github/flipbit03/sqlalchemy-easy-softdelete))