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(build): re-enable Windows build (#6) #16

Merged
merged 39 commits into from
Aug 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
5d3be8b
MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.36.2, and co…
geoffreygarrett Jul 10, 2024
bc8cf96
chore: update provider and build configurations for debugging
geoffreygarrett Jul 10, 2024
7a3627e
feat: Add configuration for OSX build
geoffreygarrett Jul 10, 2024
172d616
fix: Update git_rev to v0.8.0.dev8
geoffreygarrett Jul 10, 2024
406514d
fix: specify clang compilers explicitly
geoffreygarrett Jul 11, 2024
27d827a
fix(build): increase compiler heap allocation and optimize flags
geoffreygarrett Jul 11, 2024
c539fb3
fix(build): switch to Clang from MSVC
geoffreygarrett Jul 11, 2024
1b5be88
fix(build): switch to Clang syntax for flags
geoffreygarrett Jul 11, 2024
a5cc0d3
fix(build): added missing continuous line
geoffreygarrett Jul 11, 2024
45a6b71
feat: update linux_64_python3.12 configuration
geoffreygarrett Jul 11, 2024
190ffbf
fix: update build status URLs in README
geoffreygarrett Jul 11, 2024
6be7e10
feat: add build_steps.sh for conda configuration
geoffreygarrett Jul 11, 2024
5e33500
MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.36.2, and co…
geoffreygarrett Jul 11, 2024
2271895
MNT: Re-rendered with conda-build 24.5.1, conda-smithy 3.36.2, and co…
geoffreygarrett Jul 11, 2024
83b1b6d
fix(build): distutils removed from cpython 3.12
geoffreygarrett Jul 11, 2024
f9c1fb2
fix(build): add setuptools to build deps
geoffreygarrett Jul 11, 2024
540c304
fix(build): python include dirs cmake
geoffreygarrett Jul 11, 2024
2c30abc
fix(build): remove setuptools
geoffreygarrett Jul 11, 2024
e8f7471
chore(build): reduce template warnings
geoffreygarrett Jul 11, 2024
2447837
chore(build): reduce template warnings
geoffreygarrett Jul 11, 2024
59f585c
style: Add -Wunused-parameter flag to CXX_FLAGS_RELEASE
geoffreygarrett Jul 11, 2024
fad6265
fix(build): python lib dir for windows
geoffreygarrett Jul 11, 2024
d321c38
fix(build): patch file
geoffreygarrett Jul 11, 2024
d327496
Version update
DominicDirkx Aug 5, 2024
1b5a018
Undoing changes
DominicDirkx Aug 5, 2024
6a281bc
Re-adding changes; removing now absent example submodule
DominicDirkx Aug 5, 2024
35f696c
MNT: Re-rendered with conda-build 24.3.0, conda-smithy 3.37.2, and co…
DominicDirkx Aug 5, 2024
4569164
Re-adding arm64
DominicDirkx Aug 5, 2024
f15435b
MNT: Re-rendered with conda-build 24.3.0, conda-smithy 3.37.2, and co…
DominicDirkx Aug 5, 2024
e92bca6
Merged
DominicDirkx Aug 5, 2024
0fff9ed
MNT: Re-rendered with conda-build 24.3.0, conda-smithy 3.37.2, and co…
DominicDirkx Aug 6, 2024
9e5dd1d
MNT: Re-rendered with conda-build 24.3.0, conda-smithy 3.37.2, and co…
DominicDirkx Aug 6, 2024
1be9464
Update boost version, remove Python 3.12, add pip run dependency
DominicDirkx Aug 6, 2024
83be1ee
Removing Windows from pipelines
DominicDirkx Aug 6, 2024
b1920cf
MNT: Re-rendered with conda-build 24.3.0, conda-smithy 3.37.2, and co…
DominicDirkx Aug 6, 2024
fb4b54f
Removing Windows
DominicDirkx Aug 6, 2024
815baab
MNT: Re-rendered with conda-build 24.3.0, conda-smithy 3.37.2, and co…
DominicDirkx Aug 6, 2024
e2a479c
Manual removal of Windows build
DominicDirkx Aug 6, 2024
c7923b2
Update azure-pipelines.yml for Azure Pipelines
DominicDirkx Aug 6, 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
86 changes: 0 additions & 86 deletions .azure-pipelines/azure-pipelines-win.yml

This file was deleted.

4 changes: 2 additions & 2 deletions .ci_support/linux_64_python3.10.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
boost_cpp:
- 1.78.0
- 1.85.0
c_compiler:
- clang
c_compiler_version:
- '18'
cdt_name:
- cos6
- cos7
channel_sources:
- tudat-team/label/dev, tudat-team, conda-forge, defaults
channel_targets:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/linux_64_python3.11.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
boost_cpp:
- 1.78.0
- 1.85.0
c_compiler:
- clang
c_compiler_version:
- '18'
cdt_name:
- cos6
- cos7
channel_sources:
- tudat-team/label/dev, tudat-team, conda-forge, defaults
channel_targets:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/linux_64_python3.9.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
boost_cpp:
- 1.78.0
- 1.85.0
c_compiler:
- clang
c_compiler_version:
- '18'
cdt_name:
- cos6
- cos7
channel_sources:
- tudat-team/label/dev, tudat-team, conda-forge, defaults
channel_targets:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_python3.10.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET:
MACOSX_SDK_VERSION:
- '10.13'
boost_cpp:
- 1.78.0
- 1.85.0
c_compiler:
- clang
c_compiler_version:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_python3.11.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET:
MACOSX_SDK_VERSION:
- '10.13'
boost_cpp:
- 1.78.0
- 1.85.0
c_compiler:
- clang
c_compiler_version:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_64_python3.9.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET:
MACOSX_SDK_VERSION:
- '10.13'
boost_cpp:
- 1.78.0
- 1.85.0
c_compiler:
- clang
c_compiler_version:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_python3.10.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET:
MACOSX_SDK_VERSION:
- '11.0'
boost_cpp:
- 1.78.0
- 1.85.0
c_compiler:
- clang
c_compiler_version:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_python3.11.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET:
MACOSX_SDK_VERSION:
- '11.0'
boost_cpp:
- 1.78.0
- 1.85.0
c_compiler:
- clang
c_compiler_version:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_python3.9.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET:
MACOSX_SDK_VERSION:
- '11.0'
boost_cpp:
- 1.78.0
- 1.85.0
c_compiler:
- clang
c_compiler_version:
Expand Down
14 changes: 0 additions & 14 deletions .ci_support/win_64_python3.10.yaml

This file was deleted.

14 changes: 0 additions & 14 deletions .ci_support/win_64_python3.11.yaml

This file was deleted.

14 changes: 0 additions & 14 deletions .ci_support/win_64_python3.9.yaml

This file was deleted.

1 change: 0 additions & 1 deletion .scripts/build_steps.sh

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

2 changes: 1 addition & 1 deletion .scripts/run_osx_build.sh

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

2 changes: 1 addition & 1 deletion azure-pipelines.yml

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

4 changes: 2 additions & 2 deletions build-locally.py

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

10 changes: 4 additions & 6 deletions conda-forge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@ github:
provider:
linux: azure
osx: azure
win: azure
linux_ppc64le: None
linux_aarch64: None

build_platform:
osx_arm64: osx_64

appveyor:
secure:
BINSTAR_TOKEN: vWktDJSW9Rh2frmNkzdUHF2n4WzalOoKudWGdBLo6jcC/suzU+fViO/3/TxLOnmW
Expand All @@ -16,9 +18,5 @@ azure:
# toggle for storing the conda build_artifacts directory (including the
# built packages) as an Azure pipeline artifact that can be downloaded
store_build_artifacts: True
variables:
- group: "conda-smithy"

build_platform:
osx_arm64: osx_64
test_on_native_only: true
test: native_and_emulated
5 changes: 5 additions & 0 deletions recipe/bld.bat
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ cmake ^
-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 ../..
Expand All @@ -26,6 +28,9 @@ cmake ^
-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
Expand Down
1 change: 1 addition & 0 deletions recipe/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ cmake \
-DCMAKE_CXX_STANDARD=14 \
-DTUDATPY_CONDA_BUILD=on \
-D_GLIBCXX_USE_CXX11_ABI=1 \
-DCMAKE_CXX_FLAGS_RELEASE="-Wno-macro-redefined -Wunused-parameter" \
..

make
Expand Down
2 changes: 1 addition & 1 deletion recipe/conda_build_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ channel_targets:
channel_sources:
- tudat-team/label/dev, tudat-team, conda-forge, defaults
boost_cpp:
- 1.78.0
- 1.85.0
python:
- 3.9
- 3.10
Expand Down
7 changes: 5 additions & 2 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ 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.
Expand Down Expand Up @@ -71,6 +73,7 @@ requirements:
- {{ pin_compatible('tudat') }}
- {{ pin_compatible('pybind11') }}
- {{ pin_compatible('matplotlib') }}
- pip
- python
- astroquery
- astropy
Expand All @@ -96,10 +99,9 @@ test:
- tudatpy.kernel.numerical_simulation.environment_setup
- tudatpy.kernel.numerical_simulation.propagation_setup
- tudatpy.kernel.numerical_simulation.estimation_setup
- tudatpy.kernel.example
- tudatpy.plotting
- tudatpy.util
- tudatpy.io
- tudatpy.data

requires:
- pytest
Expand All @@ -116,6 +118,7 @@ test:
- 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"
#- python -c "from tudatpy.apps.satellite_propagator import single; single()"
Expand Down
Loading
Loading