Merge pull request #24 from anikolaienko/feature/upgrade-dependencies-and-fix-ci

Moving away from poetry to simple pip, upgrading all dependencies

Author: anikolaienko

code-checks/.black.cfg renamed to .code_quality/.black.cfg

@@ -0,0 +1,12 @@
+[flake8]
+max-line-length = 120
+per-file-ignores =
+    **/__init__.py:F401,F403
+ignore =
+    ; E203 whitespace before ':'
+    E203
+    ; W503 line break before binary operator
+    W503
+    ; E704 multiple statements on one line
+    E704
+count = True

.code_quality/.flake8

@@ -1,6 +1,4 @@
 [mypy]
-plugins = sqlalchemy.ext.mypy.plugin
-
 disallow_any_generics = True
 disallow_subclassing_any = True 
 disallow_untyped_calls = True 

code-checks/.isort.cfg renamed to .code_quality/.isort.cfg

@@ -3,7 +3,6 @@ name: Run code checks
 on:
   push:
     branches: [main]
-    tags:
   pull_request:
     branches:
       - main
@@ -14,28 +13,25 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        python-version: ["3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
+          cache: 'pip'
 
-      - name: Install tools
-        run: pip install -r dev-requirements.txt
-
-      - name: Poetry install
-        run: poetry install
+      - name: Install dev and test dependencies
+        run: |
+          pip install .[dev]
+          pip install .[test]
 
       - name: Run code quality tools
-        run: poetry run pre-commit run --all-files
-
-      - name: Run unit tests
-        run: poetry run coverage run -m pytest tests/
+        run: pre-commit run --all-files
 
-      - name: Check unit test coverage
-        run: poetry run coverage report
+      - name: Run unit tests & code coverage checks
+        run: pytest

code-checks/.mypy.ini renamed to .code_quality/.mypy.ini

@@ -102,11 +102,7 @@ celerybeat.pid
 *.sage.py
 
 # Environments
-.env
-.venv
-env/
-venv/
-ENV/
+.venv*
 env.bak/
 venv.bak/
 
@@ -130,3 +126,6 @@ dmypy.json
 
 # Coming in future, but not yet
 sphinx-docs/
+
+# VS Code IDE
+.vscode

.flake8

@@ -3,8 +3,19 @@
 files: ".py$"
 exclude: "sphinx-docs/"
 repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.6.0
+    hooks:
+      - id: check-merge-conflict
+        name: Check that merge conflicts are not being committed
+      - id: trailing-whitespace
+        name: Remove trailing whitespace at end of line
+      - id: mixed-line-ending
+        name: Detect if mixed line ending is used (\r vs. \r\n)
+      - id: end-of-file-fixer
+        name: Make sure that there is an empty line at the end
   - repo: https://github.com/psf/black
-    rev: 22.10.0
+    rev: 24.4.2
     hooks:
       - id: black
         name: black
@@ -13,27 +24,16 @@ repos:
         language: python
         require_serial: true
         types_or: [python, pyi]
-        args: [--config=code-checks/.black.cfg]
+        args: [--config=.code_quality/.black.cfg]
   - repo: https://github.com/PyCQA/isort
-    rev: 5.10.1
+    rev: 5.13.2
     hooks:
       - id: isort
         name: Run isort to sort imports in Python files
         files: \.py$|\.pyi$
-        args: [--settings-path=code-checks/.isort.cfg]
-  - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.3.0
-    hooks:
-      - id: check-merge-conflict
-        name: Check that merge conflicts are not being committed
-      - id: trailing-whitespace
-        name: Remove trailing whitespace at end of line
-      - id: mixed-line-ending
-        name: Detect if mixed line ending is used (\r vs. \r\n)
-      - id: end-of-file-fixer
-        name: Make sure that there is an empty line at the end
+        args: [--settings-path=.code_quality/.isort.cfg]
   - repo: https://github.com/PyCQA/flake8
-    rev: 5.0.4
+    rev: 7.0.0
     hooks:
       - id: flake8
         name: flake8
@@ -42,14 +42,14 @@ repos:
         language: python
         types: [python]
         require_serial: true
-        args: [--config=code-checks/.flake8]
+        args: [--config=.code_quality/.flake8]
   - repo: local
     hooks:
       - id: mypy
         name: mypy
-        description: 'Optional static typing for Python (installed by Poetry)'
+        description: 'Optional static typing for Python (installed as [test] dependency)'
         entry: mypy
         language: python
         require_serial: true
         types_or: [python, pyi]
-        args: [--config-file=code-checks/.mypy.ini]
+        args: [--config-file=.code_quality/.mypy.ini]

.github/workflows/run_code_checks.yml

@@ -1,3 +1,10 @@
+
+2.0.0 - 2024/05/12
+* Moved away from poetry. Changed packaging system using pip, build and twine.
+* Upgraded all dependencies.
+* Add support for Python 3.12.
+* Migrated SQLAlchemy from 1.x to 2.x.
+
 1.2.3 - 2022/11/21
 * Added automated code checks for different Python versions.
 

.gitignore

@@ -7,13 +7,10 @@ Table of Contents:
 - [Run tests](#run-tests)
 
 # Dev environment
-* Install prerequisites from `dev-requirements.txt`:
+* Install all dependencies:
 ```bash
-pip install -r dev-requirements.txt
-```
-* Install `py-automapper` dependencies with poetry:
-```bash
-poetry install
+pip install .[dev]
+pip install .[test]
 ```
 
 # Pre-commit
@@ -23,18 +20,19 @@ pre-commit install
 ```
 After this code checks will run on `git commit` command.
 
-If some of the `pre-commit` dependencies are not found make sure to activate appropriate poetry virtualenv. To check path to virtual environment run:
-```bash
-poetry env info -p
-```
+If some of the `pre-commit` dependencies are not found make sure to activate appropriate virtual environment
 
-Or run pre-commit manually:
-```
-poetry run pre-commit run --all-files
+To run `pre-commit` manually use:
+```bash
+pre-commit run --all-files
 ```
 
 # Run tests
 To run unit tests use command:
+```bash
+make test
 ```
-poetry run pytest tests/
+or simply
+```bash
+pytest
 ```