-
Notifications
You must be signed in to change notification settings - Fork 3
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
Compatibility with submodules and docstrings #18
base: develop
Are you sure you want to change the base?
Changes from all commits
2894487
9a44cdd
6a458a5
48d60a2
c366daf
8ca6378
7605237
cb0a407
1759a7b
d9f6257
acc3525
f9ce535
03a9dd2
d1b5341
12d407e
34661b1
369daaf
db037fe
14a7c37
2f27524
2e9240d
be3ccd6
042414d
b8fb224
4b4abab
3c9bf15
e911ccf
62c8bca
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -29,4 +29,3 @@ cmake \ | |
make | ||
|
||
make install | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -10,8 +10,6 @@ package: | |
source: | ||
git_url: https://github.com/tudat-team/tudatpy.git | ||
git_rev: {{ git_rev }} | ||
patches: | ||
- use_sysconfig_for_python_paths.patch | ||
|
||
build: | ||
# A non-negative integer representing the build number of the package. | ||
|
@@ -35,7 +33,7 @@ requirements: | |
# or native when not cross-compiling), and any source pre-processors. | ||
- {{ compiler('cxx') }} # [not win] | ||
- {{ compiler('c') }} # [not win] | ||
- {{ compiler('clang') }} # [win] | ||
- {{ compiler('clang') }} # [win] | ||
- cmake | ||
- python # [build_platform != target_platform] | ||
- cross-python_{{ target_platform }} # [build_platform != target_platform] | ||
|
@@ -82,23 +80,22 @@ requirements: | |
test: | ||
imports: | ||
- tudatpy | ||
- tudatpy.kernel | ||
- tudatpy.kernel.math | ||
- tudatpy.kernel.math.interpolators | ||
- tudatpy.kernel.math.numerical_integrators | ||
- tudatpy.kernel.math.root_finders | ||
- tudatpy.kernel.interface | ||
- tudatpy.kernel.interface.spice | ||
- tudatpy.kernel.astro | ||
- tudatpy.kernel.astro.frame_conversion | ||
- tudatpy.kernel.astro.element_conversion | ||
- tudatpy.kernel.astro.gravitation | ||
- tudatpy.kernel.astro.two_body_dynamics | ||
- tudatpy.kernel.constants | ||
- tudatpy.kernel.numerical_simulation | ||
- tudatpy.kernel.numerical_simulation.environment_setup | ||
- tudatpy.kernel.numerical_simulation.propagation_setup | ||
- tudatpy.kernel.numerical_simulation.estimation_setup | ||
- tudatpy.math | ||
- tudatpy.math.interpolators | ||
- tudatpy.math.numerical_integrators | ||
- tudatpy.math.root_finders | ||
- tudatpy.interface | ||
- tudatpy.interface.spice | ||
- tudatpy.astro | ||
- tudatpy.astro.frame_conversion | ||
- tudatpy.astro.element_conversion | ||
- tudatpy.astro.gravitation | ||
- tudatpy.astro.two_body_dynamics | ||
- tudatpy.constants | ||
- tudatpy.numerical_simulation | ||
- tudatpy.numerical_simulation.environment_setup | ||
- tudatpy.numerical_simulation.propagation_setup | ||
- tudatpy.numerical_simulation.estimation_setup | ||
- tudatpy.plotting | ||
- tudatpy.util | ||
- tudatpy.data | ||
|
@@ -109,23 +106,23 @@ test: | |
- tests/test_constants.py | ||
- tests/test_interface_spice.py | ||
- tests/test_io.py | ||
- tests/test_hybrid_module_exposure.py | ||
# - tests/test_hybrid_module_exposure.py | ||
- tests/test_time_conversions.py | ||
- tests/test_dependent_variable_dictionary.py | ||
- tests/test_data_mpc.py | ||
# - tests/test_dependent_variable_dictionary.py | ||
# - tests/test_data_mpc.py | ||
- tests/test_data_horizons.py | ||
- tests/test_data_biases.py | ||
|
||
commands: | ||
- pip install astroquery==0.4.8.dev9321 | ||
- python -c "from tudatpy.io import get_resource_path; print(get_resource_path())" | ||
- python -c "from tudatpy.io import save2txt" | ||
Comment on lines
-121
to
-122
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I know someone is going to be happy about this change. @DominicDirkx |
||
- python -c "from tudatpy.data import get_resource_path; print(get_resource_path())" | ||
- python -c "from tudatpy.data import save2txt" | ||
#- python -c "from tudatpy.apps.satellite_propagator import single; single()" | ||
- python -m pytest -v tests/test_constants.py | ||
- python -m pytest -v tests/test_io.py | ||
- python -m pytest -v tests/test_hybrid_module_exposure.py | ||
# - python -m pytest -v tests/test_hybrid_module_exposure.py | ||
- python -m pytest -v tests/test_time_conversions.py | ||
- python -m pytest -v tests/test_dependent_variable_dictionary.py | ||
# - python -m pytest -v tests/test_dependent_variable_dictionary.py | ||
# - python -m pytest -v tests/test_data_mpc.py | ||
- python -m pytest -v tests/test_data_horizons.py | ||
- python -m pytest -v tests/test_data_biases.py | ||
|
This file was deleted.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is Python 3.12 passing without this now, or has this been added to the tudatpy source?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I increased the minimum required CMake version for tudatpy to be able to use the "new" method for finding Python, so we don't need that part of the YACMASetup script anymore
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
When you say 3.12 I assume you refer to the one that is used to generate the macOS distributions, right? Because we only support 3.9 to 3.11 right now (until I figure out why pydantic does not support 3.12 or why are we forcing the use of a version that doesn't)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sorry, I'm not up to date on what you're working towards with CMake at the moment, but I added that patch so that Python 3.12 was supported by tudatpy and found using YACMA.
Feel free to provide links and a summary of what you're fixing.