Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Two Minor Issues With New Tools (CMake 3.31RC2; Python 3.13) #2978

Merged
merged 7 commits into from
Oct 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions .github/actions/setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,7 @@ runs:
steps:
- run: git fetch --tags
shell: bash
- name: Add Python bin to PATH
run: echo "/Library/Frameworks/Python.framework/Versions/Current/bin" >> $GITHUB_PATH
shell: bash
# Python path should be added at a higher level
- run: pip3 install setuptools_scm wheel urllib3
shell: bash
- run: pip3 install -U -r ${{ inputs.location }}/requirements.txt
Expand Down
9 changes: 9 additions & 0 deletions .github/workflows/build-test-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ jobs:
with:
fetch-depth: 0
submodules: true
- uses: actions/setup-python@v5
with:
python-version: '3.12'
- uses: ./.github/actions/setup
- name: F prime CI step
run: ./ci/tests/Framework.bash
Expand All @@ -51,6 +54,9 @@ jobs:
with:
fetch-depth: 0
submodules: true
- uses: actions/setup-python@v5
with:
python-version: '3.12'
- uses: ./.github/actions/setup
- name: F prime CI step
run: ./ci/tests/Ref.bash
Expand All @@ -74,6 +80,9 @@ jobs:
with:
fetch-depth: 0
submodules: true
- uses: actions/setup-python@v5
with:
python-version: '3.12'
- uses: ./.github/actions/setup
- name: Install coreutils
run: brew install coreutils
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Add codegen target to cache
set(CODEGEN_TARGET "codegen" CACHE INTERNAL "Target for codegen autocoder")
set(CODEGEN_TARGET "fprime_codegen" CACHE INTERNAL "Target for codegen autocoder")
set_property(GLOBAL PROPERTY CODEGEN_OUTPUTS)

# Create target for autocoder
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ Brotli==1.1.0
certifi==2024.8.30
chardet==5.2.0
charset-normalizer==3.4.0
Cheetah3==3.2.6.post1
click==8.1.7
colorlog==6.8.2
cookiecutter==2.6.0
CT3==3.3.3.post1
et-xmlfile==1.1.0
Flask==3.0.3
Flask-Compress==1.15
Expand Down
Loading