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

Compatibility with submodules and docstrings #18

Open
wants to merge 28 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
2894487
pip
alfonsoSR Sep 22, 2024
9a44cdd
Remove build script
alfonsoSR Sep 22, 2024
6a458a5
build script
alfonsoSR Sep 22, 2024
48d60a2
Check if pip was causing problems
alfonsoSR Sep 22, 2024
c366daf
pip dependency
alfonsoSR Sep 22, 2024
8ca6378
Add scikit-build-core dependency
alfonsoSR Sep 22, 2024
7605237
scikit-build-core
alfonsoSR Sep 22, 2024
cb0a407
Please YACMA
alfonsoSR Sep 22, 2024
1759a7b
Find python include + fix tests
alfonsoSR Sep 23, 2024
d9f6257
Don't use patch
alfonsoSR Sep 23, 2024
acc3525
Update installation + stubs
alfonsoSR Sep 23, 2024
f9ce535
Remove test for hybrid modules
alfonsoSR Sep 23, 2024
03a9dd2
Also look for python with pybind11
alfonsoSR Sep 30, 2024
d1b5341
Remove python version check
alfonsoSR Sep 30, 2024
12d407e
Remove python version check
alfonsoSR Sep 30, 2024
34661b1
Use tudat dev16
alfonsoSR Sep 30, 2024
369daaf
Use pythonSetup
alfonsoSR Sep 30, 2024
db037fe
Bump cmake version
alfonsoSR Sep 30, 2024
14a7c37
I'm adorable
alfonsoSR Sep 30, 2024
2f27524
I'm adorable v2
alfonsoSR Sep 30, 2024
2e9240d
Original meta configuration
alfonsoSR Sep 30, 2024
be3ccd6
Don't find python with pybind11
alfonsoSR Sep 30, 2024
042414d
tudat dev16
alfonsoSR Sep 30, 2024
b8fb224
Undesired entries in arm310 ci_support due to local build attempt
alfonsoSR Sep 30, 2024
4b4abab
Remove distutils patch
alfonsoSR Sep 30, 2024
3c9bf15
Submodules & docstrings: v1.0
alfonsoSR Oct 1, 2024
e911ccf
Submodules & docstrings: v1.0 - Git rev
alfonsoSR Oct 1, 2024
62c8bca
Free up tudat version
alfonsoSR Oct 1, 2024
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
2 changes: 1 addition & 1 deletion .scripts/build_steps.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 6 additions & 3 deletions .scripts/run_osx_build.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion recipe/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,3 @@ cmake \
make

make install

53 changes: 25 additions & 28 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Member

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?

Copy link
Author

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

Copy link
Author

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)

Copy link
Member

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.


build:
# A non-negative integer representing the build number of the package.
Expand All @@ -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]
Expand Down Expand Up @@ -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
Expand All @@ -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
Copy link
Member

Choose a reason for hiding this comment

The 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
Expand Down
54 changes: 0 additions & 54 deletions recipe/use_sysconfig_for_python_paths.patch

This file was deleted.

Loading