Merge branch 'master' into master

Author: tahsinkose

.github/CODEOWNERS

@@ -0,0 +1,2 @@
+# Global Owners
+* @petercorke @jhavl @myeatman-bdai

.github/workflows/master.yml

@@ -7,8 +7,8 @@ name: build
 on:
   push:
     branches: [ master, future ]
-#   pull_request:
-#     branches: [ master ]
+  pull_request:
+
 
 jobs:
   # Run tests on different versions of python
@@ -17,20 +17,21 @@ jobs:
     strategy:
       matrix:
         os: [windows-latest, ubuntu-latest, macos-latest]
-        python-version: [3.9, '3.10']
+        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
+        exclude:
+          - os: macos-latest
+            python-version: "3.7"
 
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v1
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
         pip install .[dev]
-        pip install pytest-timeout
-        pip install pytest-xvfb
     - name: Test with pytest
       env:
         MPLBACKEND: TkAgg
@@ -45,20 +46,18 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python 3.7
-      uses: actions/setup-python@v1
+      uses: actions/setup-python@v5
       with:
         python-version: 3.7
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
+        pip install .[dev]
     - name: Run coverage
       run: |
-        pip install .[dev]
-        pip install pytest-xvfb
-        pip install pytest-timeout
-        pytest --cov --cov-config=./spatialmath/.coveragerc --cov-report xml
-        #pytest --cov=spatialmath --cov-report xml
+        coverage run --omit='tests/*.py,tests/base/*.py' -m pytest
         coverage report
+        coverage xml 
     - name: upload coverage to Codecov
       uses: codecov/codecov-action@v3
       with:
@@ -67,41 +66,4 @@ jobs:
     # If the above worked:
     # Build docs and upload to GH Pages
     needs: unittest
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python 3.7
-      uses: actions/setup-python@v1
-      with:
-        python-version: 3.7
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install .[dev,docs]
-        pip install git+https://github.com/petercorke/sphinx-autorun.git
-        pip install sympy
-        sudo apt-get install graphviz
-    - name: Build docs
-      run: |
-        cd docs
-        make html
-        # Tell GitHub not to use jekyll to compile the docs
-        touch build/html/.nojekyll
-        cd ../
-    - name: Commit documentation changes
-      run: |
-        git clone https://github.com/petercorke/spatialmath-python.git --branch gh-pages --single-branch gh-pages
-        cp -r docs/build/html/* gh-pages/
-        cd gh-pages
-        git config --local user.email "action@github.com"
-        git config --local user.name "GitHub Action"
-        git add .
-        git commit -m "Update documentation" -a || true
-        # The above command will fail if no changes were present, so we ignore
-        # that.
-    - name: Push changes
-      uses: ad-m/github-push-action@master
-      with:
-        branch: gh-pages
-        directory: gh-pages
-        github_token: ${{ secrets.GITHUB_TOKEN }}
+    uses: ./.github/workflows/sphinx.yml

.github/workflows/publish.yml

@@ -21,19 +21,19 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install -U setuptools wheel twine
+        pip install -U setuptools wheel twine build
     - name: Build and publish
       env:
         TWINE_USERNAME: __token__
         TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
       run: |
-        python setup.py sdist bdist_wheel
+        python -m build
         ls ./dist/*.whl
         twine upload dist/*.gz
         twine upload dist/*.whl

.github/workflows/sphinx.yml

@@ -0,0 +1,46 @@
+name: Sphinx
+
+on:
+  workflow_call:
+
+jobs:
+  sphinx:
+    runs-on: ubuntu-latest
+    if: ${{ github.event_name != 'pull_request' }}
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python 3.7
+      uses: actions/setup-python@v5
+      with:
+        python-version: 3.7
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install .[dev,docs]
+        pip install git+https://github.com/petercorke/sphinx-autorun.git
+        pip install sympy
+        sudo apt-get install graphviz
+    - name: Build docs
+      run: |
+        cd docs
+        make html
+        # Tell GitHub not to use jekyll to compile the docs
+        touch build/html/.nojekyll
+        cd ../
+    - name: Commit documentation changes
+      run: |
+        git clone https://github.com/petercorke/spatialmath-python.git --branch gh-pages --single-branch gh-pages
+        cp -r docs/build/html/* gh-pages/
+        cd gh-pages
+        git config --local user.email "action@github.com"
+        git config --local user.name "GitHub Action"
+        git add .
+        git commit -m "Update documentation" -a || true
+        # The above command will fail if no changes were present, so we ignore
+        # that.
+    - name: Push changes
+      uses: ad-m/github-push-action@master
+      with:
+        branch: gh-pages
+        directory: gh-pages
+        github_token: ${{ secrets.GITHUB_TOKEN }}

.pre-commit-config.yaml

@@ -0,0 +1,20 @@
+repos:
+# - repo: https://github.com/charliermarsh/ruff-pre-commit
+#   # Ruff version.
+#   rev: 'v0.1.0'
+#   hooks:
+#     - id: ruff
+#       args: ['--fix', '--config', 'pyproject.toml']
+
+- repo: https://github.com/psf/black
+  rev: 23.10.0
+  hooks:
+    - id: black
+      language_version: python3.10
+      args: ['--config', 'pyproject.toml']
+      verbose: true
+
+# - repo: https://github.com/pre-commit/mirrors-mypy
+#   rev: v1.6.1
+#   hooks:
+#   -   id: mypy

MANIFEST.in

@@ -7,7 +7,6 @@ help:
 	@echo "$(BLUE) make test - run all unit tests"
 	@echo " make coverage - run unit tests and coverage report"
 	@echo " make docs - build Sphinx documentation"
-	@echo " make docupdate - upload Sphinx documentation to GitHub pages"
 	@echo " make dist - build dist files"
 	@echo " make upload - upload to PyPI"
 	@echo " make clean - remove dist and docs build files"
@@ -17,21 +16,27 @@ test:
 	pytest
 
 coverage:
-	coverage run --omit=\*/test_\* -m unittest
+	coverage run --source='spatialmath' -m pytest
 	coverage report
+	coverage html
+	open htmlcov/index.html
 
 docs: .FORCE
 	(cd docs; make html)
 
+view:
+	open docs/build/html/index.html
+
 dist: .FORCE
 	#$(MAKE) test
 	python -m build
+	ls -lh dist
 
 upload: .FORCE
 	twine upload dist/*
 
 clean: .FORCE
 	(cd docs; make clean)
 	-rm -r *.egg-info
-	-rm -r dist
+	-rm -r dist build