Merge branch 'qmlcode-main'

Author: kvkarandashev

.coveragerc

@@ -0,0 +1,5 @@
+[report]
+exclude_also =
+    def __repr__
+    raise ValueError
+    raise NotImplementedError

.github/workflows/publish.yml

@@ -0,0 +1,31 @@
+name: Publish PyPI
+
+on:
+  release:
+    types:
+      - published
+
+jobs:
+
+  publish:
+    name: Publish Release
+    runs-on: "ubuntu-latest"
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Install the latest version of uv
+        uses: astral-sh/setup-uv@v5
+
+      - run: sudo apt-get install -y gcc libomp-dev libopenblas-dev
+
+      - run: make env_uv
+
+      - name: Build package
+        run: make build
+
+      - name: Publish package
+        env:
+          TWINE_USERNAME: __token__
+          TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }}
+        run: make upload

.github/workflows/test.macos.yml

@@ -0,0 +1,37 @@
+name: Test MacOS
+
+on:
+  push:
+    branches:
+      - '**'
+  pull_request:
+    branches: [ main ]
+
+jobs:
+
+  test:
+    name: Testing ${{matrix.os}} py-${{matrix.python-version}}
+    runs-on: ${{matrix.os}}
+
+    strategy:
+      matrix:
+        os: ['macos-latest']
+        python-version: ['3.11', '3.12']
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Install the latest version of uv
+        uses: astral-sh/setup-uv@v5
+
+      - run: which brew
+      - run: brew install gcc openblas lapack libomp
+      - run: ls /opt/homebrew/bin/
+      - run: which gfortran-14
+
+      - run: FC=gfortran-14 make env_uv python_version=${{ matrix.python-version }}
+
+      - run: make test
+      - run: make format
+      - run: FC=gfortran-14 make build
+      - run: make test-dist

.github/workflows/test.ubuntu.yml

@@ -0,0 +1,34 @@
+name: Test Ubuntu
+
+on:
+  push:
+    branches:
+      - '**'
+  pull_request:
+    branches: [ main ]
+
+jobs:
+
+  test:
+    name: Testing ${{matrix.os}} py-${{matrix.python-version}}
+    runs-on: ${{matrix.os}}
+
+    strategy:
+      matrix:
+        os: ['ubuntu-latest']
+        python-version: ['3.11', '3.12']
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Install the latest version of uv
+        uses: astral-sh/setup-uv@v5
+
+      - run: sudo apt-get install -y gcc libomp-dev libopenblas-dev
+
+      - run: make env_uv python_version=${{ matrix.python-version }}
+
+      - run: make test
+      - run: make format
+      - run: make build
+      - run: make test-dist

.github/workflows/test.yml

@@ -3,7 +3,7 @@
 repos:
 
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v3.4.0
+    rev: v5.0.0
     hooks:
       - id: trailing-whitespace
         exclude: ^tests/resources/
@@ -23,7 +23,7 @@ repos:
         args: ['--maxkb=3000']
 
   - repo: https://github.com/myint/autoflake
-    rev: v2.2.0
+    rev: v2.3.1
     hooks:
       - id: autoflake
         name: Removes unused variables
@@ -48,15 +48,15 @@ repos:
         ]
 
   - repo: https://github.com/psf/black
-    rev: 22.3.0
+    rev: 24.10.0
     hooks:
       - id: black
         name: Fixes formatting
         language_version: python3
         args: ["--line-length=99"]
 
   - repo: https://github.com/pycqa/flake8
-    rev: 7.0.0
+    rev: 7.1.1
     hooks:
       - id: flake8
         name: Checks pep8 style
@@ -71,7 +71,7 @@ repos:
           "--ignore=E501,E203,W503,E741",
         ]
 
-  - repo: https://github.com/pseewald/fprettify
+  - repo: https://github.com/fortran-lang/fprettify
     rev: v0.3.7
     hooks:
       - id: fprettify

.pre-commit-config.yaml

@@ -1,5 +1,7 @@
-python=./env/bin/python
-mamba=mamba
+env=env
+python=./${env}/bin/python
+python_version=3.12
+conda=mamba
 pkg=qmllib
 pip=./env/bin/pip
 pytest=pytest
@@ -9,14 +11,25 @@ version_file=src/qmllib/version.py
 
 .PHONY: build
 
-all: env
+all: ${env}
 
 ## Setup
 
 env:
-	${mamba} env create -f ./environment_dev.yaml -p ./env --quiet
-	${python} -m pre_commit install
+	echo "TODO"
+
+env_uv:
+	which uv
+	uv venv ${env} --python ${python_version}
+	uv pip install -r requirements.txt --python ${python}
+	uv pip install -e . --python ${python}
+	make .git/hooks/pre-commit python=${python}
+
+env_conda:
+	which ${conda}
+	${conda} env create -f ./environment.yaml -p ./${env} --quiet
 	${python} -m pip install -e .
+	make .git/hooks/pre-commit python=${python}
 
 ./.git/hooks/pre-commit:
 	${python} -m pre_commit install
@@ -29,12 +42,15 @@ format:
 test:
 	${python} -m pytest -rs ./tests
 
+test-dist:
+	${python} -m twine check dist/*
+
 types:
 	${python} -m monkeytype run $$(which ${pytest}) ./tests
-	${python} -m monkeytype list-modules | grep ${pkg} | parallel -j${j} "${python} -m monkeytype apply {}"
+	${python} -m monkeytype list-modules | grep ${pkg} | parallel -j${j} "${python} -m monkeytype apply {} > /dev/null && echo {}"
 
 cov:
-	${python} -m pytest -vrs --cov=${pkg} --cov-report html tests
+	${python} -m pytest --cov=${pkg} --cov-config .coveragerc --cov-report html tests
 
 compile:
 	${python} _compile.py
@@ -53,11 +69,16 @@ VERSION_MINOR=$(shell echo ${VERSION} | cut -d'.' -f2)
 VERSION_MAJOR=$(shell echo ${VERSION} | cut -d'.' -f1)
 GIT_COMMIT=$(shell git rev-parse --short HEAD)
 
+version:
+	echo ${VERSION}
+
+bump-version-auto:
+	test $(git diff HEAD^ HEAD tests | grep -q "+def") && make bump-version-minor || make bump-version-patch
+
 bump-version-dev:
 	test ! -z "${VERSION}"
 	test ! -z "${GIT_COMMIT}"
-	exit 1
-	# Not Implemented
+	exit 1 # Not Implemented
 
 bump-version-patch:
 	test ! -z "${VERSION_PATCH}"
@@ -72,17 +93,31 @@ bump-version-major:
 	echo "__version__ = \"$(shell awk 'BEGIN{print ${VERSION_MAJOR}+1}').0.0\"" > ${version_file}
 
 commit-version-tag:
-	git tag --list | grep -qix "${VERSION}"
+	# git tag --list | grep -qix "${VERSION}"
 	git commit -m "Release ${VERSION}" --no-verify ${version_file}
 	git tag 'v${VERSION}'
 
+gh-release:
+	gh release create "v${VERSION}" \
+	--repo="$${GITHUB_REPOSITORY}" \
+	--title="$${GITHUB_REPOSITORY#*/} ${VERSION}" \
+	--generate-notes
+
+gh-has-src-changed:
+	git diff HEAD^ HEAD src | grep -q "+"
+
+gh-cancel:
+	gh run cancel $${GH_RUN_ID}
+	gh run watch $${GH_RUN_ID}
+
 ## Clean
 
 clean:
 	find ./src/ -type f \
 		-name "*.so" \
 		-name "*.pyc" \
 		-name ".pyo" \
+		-name ".mod" \
 		-delete
 	rm -rf ./src/*.egg-info/
 	rm -rf *.whl