Skip to content

Commit

Permalink
Merge pull request #208 from AVSLab/feature/bsk-207-conan_2_0
Browse files Browse the repository at this point in the history
Restrict Basilisk to build using conan <= 1.59.0
  • Loading branch information
patkenneally authored Feb 23, 2023
2 parents 04ec9b3 + 20b6f13 commit 4f6c57d
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 2 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
- name: "Create virtual Environment"
run: python3 -m venv .venv
- name: "Install wheel and conan package"
run: source .venv/bin/activate && pip3 install wheel conan pytest datashader holoviews pytest-xdist
run: source .venv/bin/activate && pip3 install wheel conan==1.59.0 pytest datashader holoviews pytest-xdist
- name: "Build basilisk"
run: source .venv/bin/activate && python3 conanfile.py
- name: "Run Test"
Expand Down Expand Up @@ -99,7 +99,7 @@ jobs:
shell: pwsh
run: |
venv\Scripts\activate
pip install wheel conan parse six pytest-xdist
pip install wheel conan==1.59.0 parse six pytest-xdist
- name: "Add basilisk and cmake path to env path"
shell: pwsh
run: |
Expand Down
4 changes: 4 additions & 0 deletions conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,10 @@ class BasiliskConan(ConanFile):
print(failColor + "conan version " + conan_version + " is not compatible with Basilisk.")
print("use version 1.40.1+ to work with the conan repo changes from 2021." + endColor)
exit(0)
if conan_version > Version("1.59.0"):
print(failColor + "conan version " + conan_version + " is not compatible with Basilisk.")
print("use version 1.40.1 to 1.59.0 to work with the conan repo changes." + endColor)
exit(0)

# ensure latest pip is installed
if is_running_virtual_env() or platform.system() == "Windows":
Expand Down
1 change: 1 addition & 0 deletions docs/source/Support/bskReleaseNotes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ Version |release|
- Created a :ref:`prescribedMotionStateEffector` dynamics module for appending rigid bodies with prescribed motion
to the spacecraft hub.
- Added :ref:`solarArrayReference` to compute the reference angle and angle rate for a rotating solar array.
- Update python dependency documentation and check to not use ``conan`` version 2.0.0 for now

Version 2.1.6 (Jan. 21, 2023)
-----------------------------
Expand Down
1 change: 1 addition & 0 deletions docs/source/bskPkgRequired.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@
``pytest``
``Pillow``
``conan>=1.40.1``
``conan<=1.56.0``
``parse>=1.18.0``

0 comments on commit 4f6c57d

Please sign in to comment.