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

✨ Use Freecad from apt #2792

Draft
wants to merge 5 commits into
base: develop
Choose a base branch
from
Draft

✨ Use Freecad from apt #2792

wants to merge 5 commits into from

Conversation

je-cook
Copy link
Contributor

@je-cook je-cook commented Nov 10, 2023

Description

This only works with the python version apt uses which currently is 3.10. It is quite a lot of hacking of paths

Interface Changes

Checklist

I confirm that I have completed the following checks:

  • Tests run locally and pass pytest tests --reactor
  • Code quality checks run locally and pass pre-commit run --from-ref develop --to-ref HEAD
  • Documentation built locally and checked sphinx-build -W documentation/source documentation/build

@je-cook je-cook added cad Tasks relating to the cad module python Pull requests that update Python code labels Nov 10, 2023
Copy link

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 1 Code Smell

No Coverage information No Coverage information
0.0% 0.0% Duplication

Copy link

codecov bot commented Nov 10, 2023

Codecov Report

Merging #2792 (5882fb5) into develop (eb27970) will decrease coverage by 0.02%.
The diff coverage is 86.44%.

@@             Coverage Diff             @@
##           develop    #2792      +/-   ##
===========================================
- Coverage    79.98%   79.97%   -0.02%     
===========================================
  Files          222      222              
  Lines        24737    24752      +15     
===========================================
+ Hits         19786    19795       +9     
- Misses        4951     4957       +6     
Files Coverage Δ
bluemira/codes/__init__.py 100.00% <ø> (+5.00%) ⬆️
bluemira/codes/process/_run.py 71.11% <ø> (ø)
bluemira/display/auto_config.py 62.74% <100.00%> (+0.74%) ⬆️
bluemira/codes/_freecadapi.py 84.64% <88.88%> (-0.35%) ⬇️
bluemira/codes/_freecadconfig.py 91.13% <85.41%> (-8.87%) ⬇️

... and 1 file with indirect coverage changes

Copy link
Contributor

⚠️ Warning Report

Found 0 new warnings, 0 fixed warnings. 🎉

All warnings (10)

On collect

  • /usr/share/miniconda3/envs/bluemira/lib/python3.8/site-packages/shiboken2/files.dir/shibokensupport/feature.py:139: DeprecationWarning: The module 'bluemira.geometry.optimisation._optimisation_old' is deprecated and will be removed in v2.0.0. See https://bluemira.readthedocs.io/en/latest/optimisation/optimisation.html for documentation of the new optimisation module.
  • /usr/share/miniconda3/envs/bluemira/lib/python3.8/site-packages/shiboken2/files.dir/shibokensupport/feature.py:139: DeprecationWarning: The module 'bluemira.utilities.opt_tools' is deprecated and will be removed in v2.0.0. See https://bluemira.readthedocs.io/en/latest/optimisation/optimisation.html for documentation of the new optimisation module.
  • /usr/share/miniconda3/envs/bluemira/lib/python3.8/site-packages/shiboken2/files.dir/shibokensupport/feature.py:139: DeprecationWarning: The module 'bluemira.equilibria.opt_constraints' is deprecated and will be removed in v2.0.0. See https://bluemira.readthedocs.io/en/latest/optimisation/optimisation.html for documentation of the new optimisation module.
  • /usr/share/miniconda3/envs/bluemira/lib/python3.8/site-packages/shiboken2/files.dir/shibokensupport/feature.py:139: DeprecationWarning: The module 'bluemira.utilities.optimiser' is deprecated and will be removed in version 2.0.0. See https://bluemira.readthedocs.io/en/latest/optimisation/optimisation.html for documentation of the new optimisation module.
  • /usr/share/miniconda3/envs/bluemira/lib/python3.8/site-packages/shiboken2/files.dir/shibokensupport/feature.py:139: DeprecationWarning: The module 'bluemira.equilibria.opt_constraint_funcs' is deprecated and will be removed in v2.0.0. See https://bluemira.readthedocs.io/en/latest/optimisation/optimisation.html for documentation of the new optimisation module.
  • /usr/share/miniconda3/envs/bluemira/lib/python3.8/site-packages/shiboken2/files.dir/shibokensupport/feature.py:139: DeprecationWarning: The module 'bluemira.utilities.opt_problems' is deprecated and will be removed in v2.0.0. See https://bluemira.readthedocs.io/en/latest/optimisation/optimisation.html for documentation of the new optimisation module.
  • /usr/share/miniconda3/envs/bluemira/lib/python3.8/site-packages/shiboken2/files.dir/shibokensupport/feature.py:139: DeprecationWarning: The module 'bluemira.equilibria.opt_objectives' is deprecated and will be removed in v2.0.0. See https://bluemira.readthedocs.io/en/latest/optimisation/optimisation.html for documentation of the new optimisation module.
  • /usr/share/miniconda3/envs/bluemira/lib/python3.8/site-packages/shiboken2/files.dir/shibokensupport/feature.py:139: DeprecationWarning: The module 'bluemira.equilibria.opt_problems' is deprecated and will be removed in v2.0.0. See https://bluemira.readthedocs.io/en/latest/optimisation/optimisation.html for documentation of the new optimisation module.

On runtest

  • /home/runner/work/bluemira/bluemira/bluemira/base/reactor.py:678: DeprecationWarning: Using kwarg 'dim' is no longer supported. Simply pass in the dimensions you would like to show, e.g. show_cad('xz')
  • /home/runner/work/bluemira/bluemira/tests/builders/test_tf_coils.py:63: DeprecationWarning: RippleConstrainedLengthGOP API has changed, please specify how you want to constrain TF ripple by using one of the available RipplePointSelector classes. Defaulting to an EquispacedSelector with n_rip_points=3 for now.

@je-cook je-cook changed the title Use Freecad from apt ✨ Use Freecad from apt Nov 10, 2023
@je-cook je-cook marked this pull request as ready for review November 10, 2023 11:41
@je-cook je-cook requested review from a team as code owners November 10, 2023 11:41
@je-cook je-cook added the dependencies Pull requests that update a dependency file label Nov 10, 2023
@je-cook
Copy link
Contributor Author

je-cook commented Nov 10, 2023

I'm tempted to merge this (after review) as all the tests pass because we're using the conda freecad. Thoughts?

@je-cook je-cook marked this pull request as draft December 12, 2023 10:19
@je-cook je-cook force-pushed the develop branch 5 times, most recently from 5a50acb to 7574352 Compare May 15, 2024 08:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cad Tasks relating to the cad module dependencies Pull requests that update a dependency file python Pull requests that update Python code
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants