Skip to content

Commit 96d9c95

Browse files
no gtsam on python3.10
Squash this when sure it's working right GitOrigin-RevId: 63baccc03b779ce31b8a2ab1c5b03b5129101954
1 parent 38e54e2 commit 96d9c95

2 files changed

Lines changed: 11 additions & 7 deletions

File tree

.github/workflows/ci.yml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,14 @@ jobs:
7474
libgoogle-glog-dev \
7575
libeigen3-dev
7676
77+
# - Exact contents of dev_requirements.txt depends on python version, so we update
78+
# before installing. Also, dev_requirements.txt needs to be updated to avoid
79+
# failure of symforce_requirements_test.py when --update flag is not passed.
80+
# - $(pwd) is added to the python path to make symforce importable by the test.
7781
- name: Install python dependencies
78-
run: pip install -r dev_requirements.txt
82+
run: |
83+
PYTHONPATH=$(pwd):$PYTHONPATH ${{ matrix.python }} test/symforce_requirements_test.py --update
84+
pip install -r dev_requirements.txt
7985
8086
- name: Run cmake build
8187
run: |
@@ -87,14 +93,11 @@ jobs:
8793
cmake --build build -j $(nproc)
8894
8995
# - lcmtypes need to be available for tests
90-
# - Exact contents of dev_requirements.txt depend on python version. Need to update file to
91-
# match current python version to avoid failure of corresponding gen test. symforce needs
92-
# to be on the PYTHONPATH to run gen test in this manner.
96+
# - symforce needs to be on the PYTHONPATH to run gen test in this manner.
9397
- name: Run tests
9498
run: |
9599
pip install build/lcmtypes/python2.7
96100
export PYTHONPATH=$PYTHONPATH:$(pwd)
97-
${{ matrix.python }} test/symforce_requirements_test.py --update
98101
ctest --test-dir build -j $(nproc) || true
99102
ctest --test-dir build -j $(nproc) --rerun-failed --output-on-failure
100103

setup.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,6 @@ def fixed_readme() -> str:
385385
"argh",
386386
"black[jupyter]==21.12b0",
387387
"coverage",
388-
"gtsam",
389388
"isort",
390389
"jinja2~=3.0.3",
391390
"mypy==0.910",
@@ -397,7 +396,9 @@ def fixed_readme() -> str:
397396
"types-pygments",
398397
"types-requests",
399398
"types-setuptools",
400-
],
399+
]
400+
# NOTE(brad): gtsam isn't currently available on pypi for python3.10
401+
+ ["gtsam"] if sys.version_info < (3, 10) else [],
401402
"_setup": setup_requirements,
402403
},
403404
# Not okay to zip

0 commit comments

Comments
 (0)