Skip to content

Commit 69c8289

Browse files
authored
Merge branch 'rai-opensource:master' into perf/lazy-sympy
2 parents 514a615 + 3332e9c commit 69c8289

18 files changed

Lines changed: 473 additions & 531 deletions

‎.github/workflows/master.yml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,12 @@ jobs:
7777
file: ./coverage.xml
7878
sphinx:
7979
# If the above worked:
80-
# Build docs and upload to GH Pages
80+
# Build docs and upload to GH Pages -- only on push (merge to master/future),
81+
# never on pull_request: a PR whose branch lives in a fork (including the
82+
# author's own fork) gets a read-only GITHUB_TOKEN by GitHub's own design,
83+
# so the gh-pages push step always fails there regardless of repo settings.
84+
# Publishing unreviewed PR content to the live docs site isn't desired
85+
# either way.
8186
needs: unittest
87+
if: ${{ github.event_name != 'pull_request' }}
8288
uses: ./.github/workflows/sphinx.yml

‎.github/workflows/sphinx.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ on:
66
jobs:
77
sphinx:
88
runs-on: ubuntu-22.04
9-
# if: ${{ github.event_name != 'pull_request' }}
109
steps:
1110
- uses: actions/checkout@v4
1211
- name: Set up Python 3.12

‎pyproject.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ dependencies = [
3737
"scipy",
3838
"matplotlib",
3939
"ansitable",
40-
"typing_extensions",
40+
"typing_extensions>=4.0.0",
4141
"pre-commit",
4242
]
4343

‎spatialmath/__init__.py‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,8 @@
5151
import importlib.metadata
5252

5353
__version__ = importlib.metadata.version("spatialmath-python")
54-
except:
55-
pass
54+
except importlib.metadata.PackageNotFoundError:
55+
# running from a source checkout without an installed/editable
56+
# spatialmath-python distribution -- e.g. importing straight from
57+
# the repo root
58+
__version__ = "unknown"

‎spatialmath/base/_types_311.py‎

Lines changed: 0 additions & 157 deletions
This file was deleted.

‎spatialmath/base/_types_35.py‎

Lines changed: 0 additions & 150 deletions
This file was deleted.

0 commit comments

Comments
 (0)