update project, merge PRs

Signed-off-by: alexferl <[email protected]>

.editorconfig

@@ -0,0 +1,16 @@
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+charset = utf-8
+trim_trailing_whitespace = true
+indent_style = space
+indent_size = 2
+
+[*.py]
+indent_size = 4
+
+[Makefile]
+indent_style = tab
+indent_size = 4

.github/workflows/test.yaml

@@ -0,0 +1,71 @@
+name: Test
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+jobs:
+  build:
+    runs-on: '${{ matrix.os }}'
+    strategy:
+      matrix:
+        include:
+          - os: ubuntu-latest
+            python-version: '3.8'
+            FLASK: 3.0.2
+          - os: ubuntu-latest
+            python-version: '3.8'
+            FLASK: 2.3.3
+          - os: ubuntu-latest
+            python-version: '3.8'
+            FLASK: 2.2.5
+          - os: ubuntu-latest
+            python-version: '3.9'
+            FLASK: 3.0.2
+          - os: ubuntu-latest
+            python-version: '3.9'
+            FLASK: 2.3.3
+          - os: ubuntu-latest
+            python-version: '3.9'
+            FLASK: 2.2.5
+          - os: ubuntu-latest
+            python-version: '3.10'
+            FLASK: 3.0.2
+          - os: ubuntu-latest
+            python-version: '3.10'
+            FLASK: 2.3.3
+          - os: ubuntu-latest
+            python-version: '3.10'
+            FLASK: 2.2.5
+          - os: ubuntu-latest
+            python-version: '3.11'
+            FLASK: 3.0.2
+          - os: ubuntu-latest
+            python-version: '3.11'
+            FLASK: 2.3.3
+          - os: ubuntu-latest
+            python-version: '3.11'
+            FLASK: 2.2.5
+          - os: ubuntu-latest
+            python-version: '3.12'
+            FLASK: 3.0.2
+          - os: ubuntu-latest
+            python-version: '3.12'
+            FLASK: 2.3.3
+          - os: ubuntu-latest
+            python-version: '3.12'
+            FLASK: 2.2.5
+    steps:
+      - name: 'Set up Python ${{ matrix.python-version }}'
+        uses: actions/setup-python@v2
+        with:
+          python-version: '${{ matrix.python-version }}'
+      - uses: actions/checkout@v2
+      - run: pip install pytest Flask==$FLASK
+        env:
+          FLASK: '${{ matrix.FLASK }}'
+      - run: pip install -r requirements-dev.txt .
+      - run: pip install .
+      - run: pytest

.pre-commit-config.yaml

@@ -1,15 +1,21 @@
 repos:
-- repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v4.1.0
-  hooks:
-  - id: trailing-whitespace
-  - id: end-of-file-fixer
-  - id: mixed-line-ending
-    args: ['--fix=lf']
-    description: Forces to replace line ending by the UNIX 'lf' character.
-- repo: https://github.com/psf/black
-  rev: 22.1.0
-  hooks:
-  - id: black
-    language_version: python3
-    args: [-t, py310]
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.5.0
+    hooks:
+      - id: trailing-whitespace
+      - id: end-of-file-fixer
+      - id: mixed-line-ending
+        args: ['--fix=lf']
+        description: Forces to replace line ending by the UNIX 'lf' character.
+  - repo: https://github.com/psf/black
+    rev: 24.3.0
+    hooks:
+      - id: black
+        language_version: python3
+  - repo: https://github.com/d-ryzhykau/pipenv-lock-pre-commit
+    rev: 0.5.0
+    hooks:
+      - id: pipenv-lock
+      - id: pipenv-verify
+      - id: pipenv-requirements
+      - id: pipenv-requirements-dev

Makefile

@@ -1,47 +1,24 @@
-.PHONY: help dev clean update test lint pre-commit
-
-VENV_NAME?=venv
-VENV_ACTIVATE=. $(VENV_NAME)/bin/activate
-PYTHON=${VENV_NAME}/bin/python3
+.PHONY: help dev test lint pre-commit
 
 .DEFAULT: help
 help:
 	@echo "make dev"
-	@echo "       prepare development environment, use only once"
-	@echo "make clean"
-	@echo "       delete development environment"
-	@echo "make update"
-	@echo "       update dependencies"
+	@echo "	prepare development environment"
 	@echo "make test"
-	@echo "       run tests"
+	@echo "	run tests"
 	@echo "make lint"
-	@echo "       run black"
+	@echo "	run black"
 	@echo "make pre-commit"
-	@echo "       run pre-commit hooks"
+	@echo "	run pre-commit hooks"
 
 dev:
-	make venv
-
-venv: $(VENV_NAME)/bin/activate
-$(VENV_NAME)/bin/activate:
-	test -d $(VENV_NAME) || virtualenv -p python3 $(VENV_NAME)
-	${PYTHON} -m pip install -U pip
-	${PYTHON} -m pip install -r dev_requirements.txt
-	$(VENV_NAME)/bin/pre-commit install
-	touch $(VENV_NAME)/bin/activate
-
-clean:
-	rm -rf venv
-
-update:
-	${PYTHON} -m pip install -U -r dev_requirements.txt
-	$(VENV_NAME)/bin/pre-commit install
+	pipenv install --dev
 
-test: venv
-	${PYTHON} -m pytest
+test:
+	pipenv run pytest
 
-lint: venv
-	$(VENV_NAME)/bin/black -t py310 --exclude $(VENV_NAME) .
+lint:
+	pipenv run black .
 
-pre-commit: venv
-	$(VENV_NAME)/bin/pre-commit
+pre-commit:
+	pipenv run pre-commit

Pipfile

@@ -0,0 +1,13 @@
+[[source]]
+url = "https://pypi.org/simple"
+verify_ssl = true
+name = "pypi"
+
+[packages]
+flask = "==3.0.2"
+python-ldap = "==3.4.4"
+
+[dev-packages]
+black = "==24.3.0"
+pre-commit = "==3.5.0"
+pytest = "==8.1.1"