From 289448741c6cf72f4302b03fe0a7e5cab3ecb610 Mon Sep 17 00:00:00 2001 From: alfonso Date: Sun, 22 Sep 2024 17:43:00 +0200 Subject: [PATCH 01/28] pip --- recipe/meta.yaml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 16a4945..82c8a18 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -9,9 +9,10 @@ package: source: git_url: https://github.com/tudat-team/tudatpy.git - git_rev: {{ git_rev }} - patches: - - use_sysconfig_for_python_paths.patch + git_rev: 4f5cedc31fba124309aaf4c30ac43240b7c9f783 + # git_rev: {{ git_rev }} + # patches: + # - use_sysconfig_for_python_paths.patch build: # A non-negative integer representing the build number of the package. @@ -21,6 +22,7 @@ build: # new builds that contain bug fixes for the way a package is built may be # added to a repository. number: {{ build }} + script: "{{ PYTHON }} -m pip install . -v" run_exports: - {{ pin_compatible('cspice-cmake', max_pin='x.x') }} - {{ pin_compatible('tudat-resources', max_pin='x.x') }} @@ -35,7 +37,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] @@ -115,7 +117,7 @@ test: - 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())" From 9a44cddd32475c5f9a04b26e57afb722bc51ab8b Mon Sep 17 00:00:00 2001 From: alfonso Date: Sun, 22 Sep 2024 17:49:45 +0200 Subject: [PATCH 02/28] Remove build script --- recipe/bld.bat | 39 --------------------------------------- recipe/build.sh | 32 -------------------------------- 2 files changed, 71 deletions(-) delete mode 100644 recipe/bld.bat delete mode 100644 recipe/build.sh diff --git a/recipe/bld.bat b/recipe/bld.bat deleted file mode 100644 index b5feecc..0000000 --- a/recipe/bld.bat +++ /dev/null @@ -1,39 +0,0 @@ -mkdir build -cd build -SET TUDATPY_BUILD_DIR=%cd% - -git clone https://github.com/pybind/pybind11.git -cd pybind11 -git checkout d159a563383d10c821ba7b2a71905d1207db6de4 -mkdir build -cd build -cmake ^ - -G "Ninja" ^ - -DPYBIND11_TEST=NO ^ - -DCMAKE_INSTALL_PREFIX=%TUDATPY_BUILD_DIR% ^ - -DCMAKE_PREFIX_PATH=%TUDATPY_BUILD_DIR% ^ - -DCMAKE_BUILD_TYPE=Release ^ - -DCMAKE_C_COMPILER=clang.exe ^ - -DCMAKE_CXX_COMPILER=clang++.exe ^ - .. -cmake --build . --target install -cd ../.. - -cmake ^ - -G "NMake Makefiles" ^ - -DCMAKE_CXX_STANDARD=14 ^ - -DCMAKE_PREFIX_PATH=%LIBRARY_PREFIX% ^ - -DCMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% ^ - -D_ENABLE_EXTENDED_ALIGNED_STORAGE=on ^ - -DBoost_NO_BOOST_CMAKE=ON ^ - -DCMAKE_BUILD_TYPE=Release ^ - -Dpybind11_DIR=%TUDATPY_BUILD_DIR%\share\cmake\pybind11\ ^ - -DCMAKE_CXX_FLAGS_RELEASE="-O2 -Wall -Wextra -Wno-macro-redefined -Wunused-parameter" ^ - -DCMAKE_C_COMPILER=clang.exe ^ - -DCMAKE_CXX_COMPILER=clang++.exe ^ - .. -if errorlevel 1 exit 1 -cmake --build . --verbose --config Release --target install -- VERBOSE=1 -if errorlevel 1 exit 1 -ctest --verbose -if errorlevel 1 exit 1 diff --git a/recipe/build.sh b/recipe/build.sh deleted file mode 100644 index 5e66142..0000000 --- a/recipe/build.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env bash - -echo "OS is:" -echo "`uname`" - -if [ "`uname`" = "Linux" ] -then - conda install jinja2 pydantic=1.10.9 pyyaml numpydoc -y - - python docs/source/build_docstrings.py -fi -# conda install boost-cpp=1.72 -y - -mkdir build -cd build -export TUDATPY_BUILD_DIR=`pwd` - -cmake \ - -DBoost_NO_BOOST_CMAKE=ON \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=$PREFIX \ - -DCMAKE_PREFIX_PATH=$PREFIX \ - -DCMAKE_CXX_STANDARD=14 \ - -DTUDATPY_CONDA_BUILD=on \ - -D_GLIBCXX_USE_CXX11_ABI=1 \ - -DCMAKE_CXX_FLAGS_RELEASE="-Wno-macro-redefined -Wunused-parameter" \ - .. - -make - -make install - From 6a458a5305b4ef9eec3095fff4d8b58c0284b22a Mon Sep 17 00:00:00 2001 From: alfonso Date: Sun, 22 Sep 2024 18:03:58 +0200 Subject: [PATCH 03/28] build script --- recipe/bld.bat | 39 +++++++++++++++++++++++++++++++++++++++ recipe/build.sh | 33 +++++++++++++++++++++++++++++++++ recipe/meta.yaml | 1 - 3 files changed, 72 insertions(+), 1 deletion(-) create mode 100644 recipe/bld.bat create mode 100644 recipe/build.sh diff --git a/recipe/bld.bat b/recipe/bld.bat new file mode 100644 index 0000000..b5feecc --- /dev/null +++ b/recipe/bld.bat @@ -0,0 +1,39 @@ +mkdir build +cd build +SET TUDATPY_BUILD_DIR=%cd% + +git clone https://github.com/pybind/pybind11.git +cd pybind11 +git checkout d159a563383d10c821ba7b2a71905d1207db6de4 +mkdir build +cd build +cmake ^ + -G "Ninja" ^ + -DPYBIND11_TEST=NO ^ + -DCMAKE_INSTALL_PREFIX=%TUDATPY_BUILD_DIR% ^ + -DCMAKE_PREFIX_PATH=%TUDATPY_BUILD_DIR% ^ + -DCMAKE_BUILD_TYPE=Release ^ + -DCMAKE_C_COMPILER=clang.exe ^ + -DCMAKE_CXX_COMPILER=clang++.exe ^ + .. +cmake --build . --target install +cd ../.. + +cmake ^ + -G "NMake Makefiles" ^ + -DCMAKE_CXX_STANDARD=14 ^ + -DCMAKE_PREFIX_PATH=%LIBRARY_PREFIX% ^ + -DCMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% ^ + -D_ENABLE_EXTENDED_ALIGNED_STORAGE=on ^ + -DBoost_NO_BOOST_CMAKE=ON ^ + -DCMAKE_BUILD_TYPE=Release ^ + -Dpybind11_DIR=%TUDATPY_BUILD_DIR%\share\cmake\pybind11\ ^ + -DCMAKE_CXX_FLAGS_RELEASE="-O2 -Wall -Wextra -Wno-macro-redefined -Wunused-parameter" ^ + -DCMAKE_C_COMPILER=clang.exe ^ + -DCMAKE_CXX_COMPILER=clang++.exe ^ + .. +if errorlevel 1 exit 1 +cmake --build . --verbose --config Release --target install -- VERBOSE=1 +if errorlevel 1 exit 1 +ctest --verbose +if errorlevel 1 exit 1 diff --git a/recipe/build.sh b/recipe/build.sh new file mode 100644 index 0000000..c3b2292 --- /dev/null +++ b/recipe/build.sh @@ -0,0 +1,33 @@ +#!/usr/bin/env bash + +echo "OS is:" +echo "`uname`" + +{{ PYTHON }} -m pip install . -v + +# if [ "`uname`" = "Linux" ] +# then +# conda install jinja2 pydantic=1.10.9 pyyaml numpydoc -y + +# python docs/source/build_docstrings.py +# fi +# # conda install boost-cpp=1.72 -y + +# mkdir build +# cd build +# export TUDATPY_BUILD_DIR=`pwd` + +# cmake \ +# -DBoost_NO_BOOST_CMAKE=ON \ +# -DCMAKE_BUILD_TYPE=Release \ +# -DCMAKE_INSTALL_PREFIX=$PREFIX \ +# -DCMAKE_PREFIX_PATH=$PREFIX \ +# -DCMAKE_CXX_STANDARD=14 \ +# -DTUDATPY_CONDA_BUILD=on \ +# -D_GLIBCXX_USE_CXX11_ABI=1 \ +# -DCMAKE_CXX_FLAGS_RELEASE="-Wno-macro-redefined -Wunused-parameter" \ +# .. + +# make + +# make install diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 82c8a18..6f6a3c4 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -22,7 +22,6 @@ build: # new builds that contain bug fixes for the way a package is built may be # added to a repository. number: {{ build }} - script: "{{ PYTHON }} -m pip install . -v" run_exports: - {{ pin_compatible('cspice-cmake', max_pin='x.x') }} - {{ pin_compatible('tudat-resources', max_pin='x.x') }} From 48d60a2ee57417fae5e8d9e7d351a6f24a07a2fc Mon Sep 17 00:00:00 2001 From: alfonso Date: Sun, 22 Sep 2024 18:12:43 +0200 Subject: [PATCH 04/28] Check if pip was causing problems --- .scripts/build_steps.sh | 6 +++++- .scripts/run_osx_build.sh | 13 ++++++++----- recipe/build.sh | 2 +- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index cd9b205..e99667d 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -33,6 +33,10 @@ solver: libmamba CONDARC export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 +# mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ +# pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" +# mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ +# pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ @@ -90,4 +94,4 @@ fi ( startgroup "Final checks" ) 2> /dev/null -touch "${FEEDSTOCK_ROOT}/build_artifacts/conda-forge-build-done-${CONFIG}" \ No newline at end of file +touch "${FEEDSTOCK_ROOT}/build_artifacts/conda-forge-build-done-${CONFIG}" diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index b9cecc2..30dcf3f 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -25,11 +25,14 @@ conda activate base export CONDA_SOLVER="libmamba" export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 -mamba install --update-specs --quiet --yes --channel conda-forge --strict-channel-priority \ - pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" +# mamba install --update-specs --quiet --yes --channel conda-forge --strict-channel-priority \ +# pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" +# mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ +# pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" +mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ + mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" - + mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" echo -e "\n\nSetting up the condarc and mangling the compiler." @@ -100,4 +103,4 @@ else fi ( endgroup "Uploading packages" ) 2> /dev/null -fi \ No newline at end of file +fi diff --git a/recipe/build.sh b/recipe/build.sh index c3b2292..0e334fb 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -3,7 +3,7 @@ echo "OS is:" echo "`uname`" -{{ PYTHON }} -m pip install . -v +python -m pip install . -v # if [ "`uname`" = "Linux" ] # then From c366dafea2d02502a482990855d6cbc11dde0952 Mon Sep 17 00:00:00 2001 From: alfonso Date: Sun, 22 Sep 2024 18:22:13 +0200 Subject: [PATCH 05/28] pip dependency --- .scripts/run_osx_build.sh | 4 ++-- recipe/meta.yaml | 16 +++++----------- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh index 30dcf3f..13f2da1 100755 --- a/.scripts/run_osx_build.sh +++ b/.scripts/run_osx_build.sh @@ -30,9 +30,9 @@ export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 # mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ # pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ - mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" + pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" echo -e "\n\nSetting up the condarc and mangling the compiler." diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 6f6a3c4..561f810 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -38,30 +38,24 @@ requirements: - {{ compiler('c') }} # [not win] - {{ compiler('clang') }} # [win] - cmake - - python # [build_platform != target_platform] - - cross-python_{{ target_platform }} # [build_platform != target_platform] - - numpy # [build_platform != target_platform] - - pybind11 # [build_platform != target_platform] - - python # [build_platform != target_platform] - - cross-python_{{ target_platform }} # [build_platform != target_platform] - - numpy # [build_platform != target_platform] - - pybind11 # [build_platform != target_platform] - make # [unix] - - boost-cpp {{ boost_cpp }} host: # Packages that need to be specific to the target platform when the # target platform is not necessarily the same as the native build # platform + - python + - pip + - pybind11 + - numpy - tudat - tudat-resources - cspice-cmake - nrlmsise-00 - sofa-cmake - - python - eigen - - pybind11 + - boost-cpp {{ boost_cpp }} - mypy run: From 8ca63782de6ad9643a70a5c2c31631408aefe0ca Mon Sep 17 00:00:00 2001 From: alfonso Date: Sun, 22 Sep 2024 18:29:56 +0200 Subject: [PATCH 06/28] Add scikit-build-core dependency --- .scripts/build_steps.sh | 4 ---- recipe/meta.yaml | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh index e99667d..2821a9e 100755 --- a/.scripts/build_steps.sh +++ b/.scripts/build_steps.sh @@ -33,10 +33,6 @@ solver: libmamba CONDARC export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1 -# mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ -# pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -# mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ -# pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \ diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 561f810..031fc96 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -40,13 +40,13 @@ requirements: - cmake - make # [unix] - host: # Packages that need to be specific to the target platform when the # target platform is not necessarily the same as the native build # platform - python - pip + - scikit_build_core - pybind11 - numpy - tudat From 760523723049ae12b177bd097b75cab68a5c78e4 Mon Sep 17 00:00:00 2001 From: alfonso Date: Sun, 22 Sep 2024 18:47:48 +0200 Subject: [PATCH 07/28] scikit-build-core --- .ci_support/osx_arm64_python3.10.yaml | 12 +++++++++ recipe/meta.yaml | 36 +++++++++++++-------------- 2 files changed, 30 insertions(+), 18 deletions(-) diff --git a/.ci_support/osx_arm64_python3.10.yaml b/.ci_support/osx_arm64_python3.10.yaml index 72358bd..893552c 100644 --- a/.ci_support/osx_arm64_python3.10.yaml +++ b/.ci_support/osx_arm64_python3.10.yaml @@ -29,3 +29,15 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version +build_platform: +- osx-64 + +CONDA_BUILD_SYSROOT: +- /Users/alfonso/home/code/tudat-dev/tudatpy-feedstock/SDKs/MacOSX11.0.sdk + +build_platform: +- osx-64 + +CONDA_BUILD_SYSROOT: +- /Users/alfonso/home/code/tudat-dev/tudatpy-feedstock/SDKs/MacOSX11.0.sdk + diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 031fc96..35c57f2 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -46,7 +46,7 @@ requirements: # platform - python - pip - - scikit_build_core + - scikit-build-core - pybind11 - numpy - tudat @@ -77,23 +77,23 @@ 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 + - 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 From cb0a407323e243aa2a9147dc6cdb4c0cf05f4636 Mon Sep 17 00:00:00 2001 From: alfonso Date: Mon, 23 Sep 2024 00:00:09 +0200 Subject: [PATCH 08/28] Please YACMA --- recipe/build.sh | 54 +++++++++++++++++++++++------------------------- recipe/meta.yaml | 13 ++++++------ 2 files changed, 32 insertions(+), 35 deletions(-) diff --git a/recipe/build.sh b/recipe/build.sh index 0e334fb..62117e0 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -3,31 +3,29 @@ echo "OS is:" echo "`uname`" -python -m pip install . -v - -# if [ "`uname`" = "Linux" ] -# then -# conda install jinja2 pydantic=1.10.9 pyyaml numpydoc -y - -# python docs/source/build_docstrings.py -# fi -# # conda install boost-cpp=1.72 -y - -# mkdir build -# cd build -# export TUDATPY_BUILD_DIR=`pwd` - -# cmake \ -# -DBoost_NO_BOOST_CMAKE=ON \ -# -DCMAKE_BUILD_TYPE=Release \ -# -DCMAKE_INSTALL_PREFIX=$PREFIX \ -# -DCMAKE_PREFIX_PATH=$PREFIX \ -# -DCMAKE_CXX_STANDARD=14 \ -# -DTUDATPY_CONDA_BUILD=on \ -# -D_GLIBCXX_USE_CXX11_ABI=1 \ -# -DCMAKE_CXX_FLAGS_RELEASE="-Wno-macro-redefined -Wunused-parameter" \ -# .. - -# make - -# make install +if [ "`uname`" = "Linux" ] +then + conda install jinja2 pydantic=1.10.9 pyyaml numpydoc -y + + python docs/source/build_docstrings.py +fi +# conda install boost-cpp=1.72 -y + +mkdir build +cd build +export TUDATPY_BUILD_DIR=`pwd` + +cmake \ + -DBoost_NO_BOOST_CMAKE=ON \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=$PREFIX \ + -DCMAKE_PREFIX_PATH=$PREFIX \ + -DCMAKE_CXX_STANDARD=14 \ + -DTUDATPY_CONDA_BUILD=on \ + -D_GLIBCXX_USE_CXX11_ABI=1 \ + -DCMAKE_CXX_FLAGS_RELEASE="-Wno-macro-redefined -Wunused-parameter" \ + .. + +make + +make install diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 35c57f2..353bc45 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -9,10 +9,10 @@ package: source: git_url: https://github.com/tudat-team/tudatpy.git - git_rev: 4f5cedc31fba124309aaf4c30ac43240b7c9f783 + git_rev: 3e9643f235cdfc09dfd8519dc19fbc672c305300 # git_rev: {{ git_rev }} - # patches: - # - use_sysconfig_for_python_paths.patch + patches: + - use_sysconfig_for_python_paths.patch build: # A non-negative integer representing the build number of the package. @@ -46,7 +46,6 @@ requirements: # platform - python - pip - - scikit-build-core - pybind11 - numpy - tudat @@ -106,8 +105,8 @@ test: - tests/test_io.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 @@ -120,7 +119,7 @@ test: - python -m pytest -v tests/test_io.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 From 1759a7b4d49004d1f31e9b197101645c5a34a3c7 Mon Sep 17 00:00:00 2001 From: alfonso Date: Mon, 23 Sep 2024 17:23:09 +0200 Subject: [PATCH 09/28] Find python include + fix tests --- recipe/meta.yaml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 353bc45..c03f24d 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -9,7 +9,7 @@ package: source: git_url: https://github.com/tudat-team/tudatpy.git - git_rev: 3e9643f235cdfc09dfd8519dc19fbc672c305300 + git_rev: a3aa65b7260881ca50451c5acd42d737e2b5df69 # git_rev: {{ git_rev }} patches: - use_sysconfig_for_python_paths.patch @@ -75,7 +75,6 @@ requirements: test: imports: - - tudatpy - tudatpy - tudatpy.math - tudatpy.math.interpolators @@ -112,8 +111,8 @@ test: 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" + - 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 From d9f6257663033664e8d557ee53a97989f03204ec Mon Sep 17 00:00:00 2001 From: alfonso Date: Mon, 23 Sep 2024 17:31:29 +0200 Subject: [PATCH 10/28] Don't use patch --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index c03f24d..b5219ba 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -11,8 +11,8 @@ source: git_url: https://github.com/tudat-team/tudatpy.git git_rev: a3aa65b7260881ca50451c5acd42d737e2b5df69 # git_rev: {{ git_rev }} - patches: - - use_sysconfig_for_python_paths.patch + # patches: + # - use_sysconfig_for_python_paths.patch build: # A non-negative integer representing the build number of the package. From acc3525e0bc3989b71e08423fd662a672ada7247 Mon Sep 17 00:00:00 2001 From: alfonso Date: Mon, 23 Sep 2024 18:21:57 +0200 Subject: [PATCH 11/28] Update installation + stubs --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index b5219ba..a604635 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -9,7 +9,7 @@ package: source: git_url: https://github.com/tudat-team/tudatpy.git - git_rev: a3aa65b7260881ca50451c5acd42d737e2b5df69 + git_rev: 6eeb0b4cc6631c67cd2b94796d5e79e6b786af4f # git_rev: {{ git_rev }} # patches: # - use_sysconfig_for_python_paths.patch From f9ce535ea8163aa5f6ac2e93e0fbff3b798681ee Mon Sep 17 00:00:00 2001 From: alfonso Date: Mon, 23 Sep 2024 18:52:10 +0200 Subject: [PATCH 12/28] Remove test for hybrid modules --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index a604635..42421fc 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -102,7 +102,7 @@ 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 @@ -116,7 +116,7 @@ test: #- 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_data_mpc.py From 03a9dd208a2d991f7fc2999c7e7d6ccb1fb4cacb Mon Sep 17 00:00:00 2001 From: alfonso Date: Mon, 30 Sep 2024 09:18:34 +0200 Subject: [PATCH 13/28] Also look for python with pybind11 --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 42421fc..3d04cda 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -9,7 +9,7 @@ package: source: git_url: https://github.com/tudat-team/tudatpy.git - git_rev: 6eeb0b4cc6631c67cd2b94796d5e79e6b786af4f + git_rev: 05ed975f25e5b8a8e3f53cf398e013fa245bd7ae # git_rev: {{ git_rev }} # patches: # - use_sysconfig_for_python_paths.patch From d1b534173de9642254a170ad02f26317f2150601 Mon Sep 17 00:00:00 2001 From: alfonso Date: Mon, 30 Sep 2024 09:30:35 +0200 Subject: [PATCH 14/28] Remove python version check --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 3d04cda..12bc183 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -9,7 +9,7 @@ package: source: git_url: https://github.com/tudat-team/tudatpy.git - git_rev: 05ed975f25e5b8a8e3f53cf398e013fa245bd7ae + git_rev: f9bcfcae57af428f82569453c16b886192619dac # git_rev: {{ git_rev }} # patches: # - use_sysconfig_for_python_paths.patch From 12d407e8620c90ec96516be234acd169bcb1d9a0 Mon Sep 17 00:00:00 2001 From: alfonso Date: Mon, 30 Sep 2024 09:39:55 +0200 Subject: [PATCH 15/28] Remove python version check --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 12bc183..c251a3e 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -9,7 +9,7 @@ package: source: git_url: https://github.com/tudat-team/tudatpy.git - git_rev: f9bcfcae57af428f82569453c16b886192619dac + git_rev: d943004f4d38778e996c60fc69da16c28262256f # git_rev: {{ git_rev }} # patches: # - use_sysconfig_for_python_paths.patch From 34661b10b243ac8814ba26cacf0b224f9fd930b0 Mon Sep 17 00:00:00 2001 From: alfonso Date: Mon, 30 Sep 2024 12:07:51 +0200 Subject: [PATCH 16/28] Use tudat dev16 --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index c251a3e..076cf9e 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -48,7 +48,7 @@ requirements: - pip - pybind11 - numpy - - tudat + - tudat=2.13.0.dev16 - tudat-resources - cspice-cmake - nrlmsise-00 From 369daaf4de75b1898b44ba304b07582efcb14e1c Mon Sep 17 00:00:00 2001 From: alfonso Date: Mon, 30 Sep 2024 14:52:02 +0200 Subject: [PATCH 17/28] Use pythonSetup --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 076cf9e..4009735 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -9,7 +9,7 @@ package: source: git_url: https://github.com/tudat-team/tudatpy.git - git_rev: d943004f4d38778e996c60fc69da16c28262256f + git_rev: 9a4a04b098f60c90ab2107d14ffb52d01a79cbce # git_rev: {{ git_rev }} # patches: # - use_sysconfig_for_python_paths.patch From db037fed336a1a356f834a8a49f3ca333a4b1da8 Mon Sep 17 00:00:00 2001 From: alfonso Date: Mon, 30 Sep 2024 14:59:44 +0200 Subject: [PATCH 18/28] Bump cmake version --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 4009735..d0aa765 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -9,7 +9,7 @@ package: source: git_url: https://github.com/tudat-team/tudatpy.git - git_rev: 9a4a04b098f60c90ab2107d14ffb52d01a79cbce + git_rev: 522eee6bb16cefcd7f56d0a7af1106f9ae2ec558 # git_rev: {{ git_rev }} # patches: # - use_sysconfig_for_python_paths.patch From 14a7c37834fa90320755b5dbf3163c300b9478b5 Mon Sep 17 00:00:00 2001 From: alfonso Date: Mon, 30 Sep 2024 15:15:07 +0200 Subject: [PATCH 19/28] I'm adorable --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index d0aa765..6c2a56d 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -45,6 +45,7 @@ requirements: # target platform is not necessarily the same as the native build # platform - python + - cross-python_{{ target_platform }} - pip - pybind11 - numpy From 2f27524aeea34113635d2d22a02a8bd07a851995 Mon Sep 17 00:00:00 2001 From: alfonso Date: Mon, 30 Sep 2024 15:22:34 +0200 Subject: [PATCH 20/28] I'm adorable v2 --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 6c2a56d..d57331f 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -39,13 +39,13 @@ requirements: - {{ compiler('clang') }} # [win] - cmake - make # [unix] + - cross-python_{{ target_platform }} host: # Packages that need to be specific to the target platform when the # target platform is not necessarily the same as the native build # platform - python - - cross-python_{{ target_platform }} - pip - pybind11 - numpy From 2e9240d1c6ff590151fe29fa26f1522550e0de36 Mon Sep 17 00:00:00 2001 From: alfonso Date: Mon, 30 Sep 2024 15:31:25 +0200 Subject: [PATCH 21/28] Original meta configuration --- recipe/meta.yaml | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index d57331f..f60af20 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -9,7 +9,7 @@ package: source: git_url: https://github.com/tudat-team/tudatpy.git - git_rev: 522eee6bb16cefcd7f56d0a7af1106f9ae2ec558 + git_rev: f21ba841d6edf4da2de3bb044295227a6a67a57a # git_rev: {{ git_rev }} # patches: # - use_sysconfig_for_python_paths.patch @@ -38,24 +38,30 @@ requirements: - {{ compiler('c') }} # [not win] - {{ compiler('clang') }} # [win] - cmake + - python # [build_platform != target_platform] + - cross-python_{{ target_platform }} # [build_platform != target_platform] + - numpy # [build_platform != target_platform] + - pybind11 # [build_platform != target_platform] + - python # [build_platform != target_platform] + - cross-python_{{ target_platform }} # [build_platform != target_platform] + - numpy # [build_platform != target_platform] + - pybind11 # [build_platform != target_platform] - make # [unix] - - cross-python_{{ target_platform }} + - boost-cpp {{ boost_cpp }} + host: # Packages that need to be specific to the target platform when the # target platform is not necessarily the same as the native build # platform - - python - - pip - - pybind11 - - numpy - - tudat=2.13.0.dev16 + - tudat - tudat-resources - cspice-cmake - nrlmsise-00 - sofa-cmake + - python - eigen - - boost-cpp {{ boost_cpp }} + - pybind11 - mypy run: From be3ccd6d654acb75acc1f22d02dcde7504beae8f Mon Sep 17 00:00:00 2001 From: alfonso Date: Mon, 30 Sep 2024 15:39:23 +0200 Subject: [PATCH 22/28] Don't find python with pybind11 --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index f60af20..7c40a9b 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -9,7 +9,7 @@ package: source: git_url: https://github.com/tudat-team/tudatpy.git - git_rev: f21ba841d6edf4da2de3bb044295227a6a67a57a + git_rev: 8c398841113c576819a81d4a1ad68b5fc90c8ff8 # git_rev: {{ git_rev }} # patches: # - use_sysconfig_for_python_paths.patch From 042414d2bf072343bc314bb38356d6e30234d2a4 Mon Sep 17 00:00:00 2001 From: alfonso Date: Mon, 30 Sep 2024 15:55:02 +0200 Subject: [PATCH 23/28] tudat dev16 --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 7c40a9b..e837c03 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -54,7 +54,7 @@ requirements: # Packages that need to be specific to the target platform when the # target platform is not necessarily the same as the native build # platform - - tudat + - tudat=2.13.0.dev16 - tudat-resources - cspice-cmake - nrlmsise-00 From b8fb224abf92034c3df3f60668a8575a1c1eefed Mon Sep 17 00:00:00 2001 From: alfonso Date: Mon, 30 Sep 2024 16:38:40 +0200 Subject: [PATCH 24/28] Undesired entries in arm310 ci_support due to local build attempt --- .ci_support/osx_arm64_python3.10.yaml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/.ci_support/osx_arm64_python3.10.yaml b/.ci_support/osx_arm64_python3.10.yaml index 893552c..72358bd 100644 --- a/.ci_support/osx_arm64_python3.10.yaml +++ b/.ci_support/osx_arm64_python3.10.yaml @@ -29,15 +29,3 @@ target_platform: zip_keys: - - c_compiler_version - cxx_compiler_version -build_platform: -- osx-64 - -CONDA_BUILD_SYSROOT: -- /Users/alfonso/home/code/tudat-dev/tudatpy-feedstock/SDKs/MacOSX11.0.sdk - -build_platform: -- osx-64 - -CONDA_BUILD_SYSROOT: -- /Users/alfonso/home/code/tudat-dev/tudatpy-feedstock/SDKs/MacOSX11.0.sdk - From 4b4abab8e65636a35439fb749536cc543e30de13 Mon Sep 17 00:00:00 2001 From: alfonso Date: Mon, 30 Sep 2024 16:43:22 +0200 Subject: [PATCH 25/28] Remove distutils patch --- recipe/meta.yaml | 2 - recipe/use_sysconfig_for_python_paths.patch | 54 --------------------- 2 files changed, 56 deletions(-) delete mode 100644 recipe/use_sysconfig_for_python_paths.patch diff --git a/recipe/meta.yaml b/recipe/meta.yaml index e837c03..f90ea65 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -11,8 +11,6 @@ source: git_url: https://github.com/tudat-team/tudatpy.git git_rev: 8c398841113c576819a81d4a1ad68b5fc90c8ff8 # git_rev: {{ git_rev }} - # patches: - # - use_sysconfig_for_python_paths.patch build: # A non-negative integer representing the build number of the package. diff --git a/recipe/use_sysconfig_for_python_paths.patch b/recipe/use_sysconfig_for_python_paths.patch deleted file mode 100644 index 3399d57..0000000 --- a/recipe/use_sysconfig_for_python_paths.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff --git a/cmake/YACMAPythonSetup.cmake b/cmake/YACMAPythonSetup.cmake -index 0387c37..7f6af84 100644 ---- a/cmake/YACMAPythonSetup.cmake -+++ b/cmake/YACMAPythonSetup.cmake -@@ -24,7 +24,7 @@ if(_YACMA_PYTHON_MODULE_NEED_LINK) - else() - # NOTE: we need to determine the include dir on our own. - if(NOT YACMA_PYTHON_INCLUDE_DIR) -- execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "from __future__ import print_function\nfrom distutils import sysconfig\nprint(sysconfig.get_python_inc())" -+ execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "from sysconfig import get_paths as gp; print(gp()['include'])" - OUTPUT_VARIABLE _YACMA_PYTHON_INCLUDE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE) - if(_YACMA_PYTHON_INCLUDE_DIR) - set(YACMA_PYTHON_INCLUDE_DIR "${_YACMA_PYTHON_INCLUDE_DIR}" CACHE PATH "Path to the Python include dir.") -@@ -64,10 +64,12 @@ if(UNIX) - message(STATUS "Generic UNIX platform detected.") - endif() - if(NOT YACMA_PYTHON_MODULES_INSTALL_PATH) -- # NOTE: here we use this contraption (instead of the simple method below for Win32) because like this we can -- # support installation into the CMake prefix (e.g., in the user's home dir). -- execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "from __future__ import print_function\nimport distutils.sysconfig\nimport os\nprint(os.path.split(distutils.sysconfig.get_python_lib())[-1])" -- OUTPUT_VARIABLE _YACMA_PY_PACKAGES_DIR OUTPUT_STRIP_TRAILING_WHITESPACE) -+ # Using sysconfig instead of distutils.sysconfig -+ execute_process( -+ COMMAND ${PYTHON_EXECUTABLE} -c "from sysconfig import get_paths; import os; print(os.path.split(get_paths()['purelib'])[-1])" -+ OUTPUT_VARIABLE _YACMA_PY_PACKAGES_DIR -+ OUTPUT_STRIP_TRAILING_WHITESPACE -+ ) - message(STATUS "Python packages dir is: ${_YACMA_PY_PACKAGES_DIR}") - set(YACMA_PYTHON_MODULES_INSTALL_PATH "lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/${_YACMA_PY_PACKAGES_DIR}" CACHE PATH "Install path for Python modules.") - mark_as_advanced(YACMA_PYTHON_MODULES_INSTALL_PATH) -@@ -77,9 +79,12 @@ elseif(WIN32) - message(STATUS "Output extension for compiled modules will be '.pyd'.") - set(_YACMA_PY_MODULE_EXTENSION "pyd") - if(NOT YACMA_PYTHON_MODULES_INSTALL_PATH) -- # On Windows, we will install directly into the install path of the Python interpreter. -- execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())" -- OUTPUT_VARIABLE _YACMA_PYTHON_MODULES_INSTALL_PATH OUTPUT_STRIP_TRAILING_WHITESPACE) -+ # Using sysconfig instead of distutils.sysconfig -+ execute_process( -+ COMMAND ${PYTHON_EXECUTABLE} -c "from sysconfig import get_paths; print(get_paths()['purelib'])" -+ OUTPUT_VARIABLE _YACMA_PYTHON_MODULES_INSTALL_PATH -+ OUTPUT_STRIP_TRAILING_WHITESPACE -+ ) - set(YACMA_PYTHON_MODULES_INSTALL_PATH "${_YACMA_PYTHON_MODULES_INSTALL_PATH}" CACHE PATH "Install path for Python modules.") - mark_as_advanced(YACMA_PYTHON_MODULES_INSTALL_PATH) - endif() -@@ -87,6 +92,7 @@ else() - message(FATAL_ERROR "Platform not supported.") - endif() - -+ - # Check the install path was actually detected. - if("${YACMA_PYTHON_MODULES_INSTALL_PATH}" STREQUAL "") - message(FATAL_ERROR "Python module install path not detected correctly.") From 3c9bf15ea1c8c1dacbb2cb714e3157d4d422f73c Mon Sep 17 00:00:00 2001 From: alfonso Date: Tue, 1 Oct 2024 14:47:48 +0200 Subject: [PATCH 26/28] Submodules & docstrings: v1.0 --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index f90ea65..92473a4 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -9,7 +9,7 @@ package: source: git_url: https://github.com/tudat-team/tudatpy.git - git_rev: 8c398841113c576819a81d4a1ad68b5fc90c8ff8 + git_rev: 228601aa1f6efba0f2443f0621cd8bf8dc939a31 # git_rev: {{ git_rev }} build: From e911ccff287b90901d1d7eb0af6f258c1b38fc92 Mon Sep 17 00:00:00 2001 From: alfonso Date: Tue, 1 Oct 2024 14:51:43 +0200 Subject: [PATCH 27/28] Submodules & docstrings: v1.0 - Git rev --- recipe/meta.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 92473a4..9e4c4e9 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -9,8 +9,7 @@ package: source: git_url: https://github.com/tudat-team/tudatpy.git - git_rev: 228601aa1f6efba0f2443f0621cd8bf8dc939a31 - # git_rev: {{ git_rev }} + git_rev: {{ git_rev }} build: # A non-negative integer representing the build number of the package. From 62c8bca4d3b9a370493089861025d84001c7daa8 Mon Sep 17 00:00:00 2001 From: alfonso Date: Tue, 1 Oct 2024 15:50:17 +0200 Subject: [PATCH 28/28] Free up tudat version --- recipe/meta.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 9e4c4e9..09becdc 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -51,7 +51,7 @@ requirements: # Packages that need to be specific to the target platform when the # target platform is not necessarily the same as the native build # platform - - tudat=2.13.0.dev16 + - tudat - tudat-resources - cspice-cmake - nrlmsise-00