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.

Sign up for GitHub

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

Jump to bottom

CMake changes to clean up conda-forge dependencies #1748

Merged
merged 30 commits into from May 18, 2024
Merged

CMake changes to clean up conda-forge dependencies #1748

merged 30 commits into from May 18, 2024

Conversation

bennibbelink
Copy link
Contributor

See conda-forge/cyclus-feedstock#80 and conda-forge/cyclus-feedstock#81 for more dialogue about these changes. Notably:

  • remove pandas as a build-time dependency
  • update how we link against libxml++ libs
  • update how we find blas libs
  • use - consistently in install.py flags instead of _ (might necessitate some documentation updates in the website)

@bennibbelink
remove unused cmake modules
6551c1b
@bennibbelink
use targets instead of result variables for libxml2
7ed5ad9
@bennibbelink
print out cmake_prefix_path
2c4234d
@bennibbelink
revert libxml++ target
bbf3913
@bennibbelink
clean up argparse
72a73f9
@bennibbelink
changes to install.py
64c2198
@bennibbelink
use libxml_link_libraries
dd6ff1a
@bennibbelink
use imported target
fa7971b
@bennibbelink
revert libxmlxx_link_libraries to libxmlxx_libraries
2165557
@bennibbelink
remove debugging prints
9196bd0
@bennibbelink
reset install.py to main branch
6b29a74
@bennibbelink
convert all flags to use hyphens instead of underscores
9dcf153
@bennibbelink
comment out all rpath settings
933a364
@bennibbelink
just set cmake_install_rpath
db63c13
@bennibbelink
don't require pandas in cmakelists
6504f5c
@bennibbelink
revert some rpath changes and delete compilerroot rpath
f144d5a
@bennibbelink
remove pandas as build-time dependency
8fc68f4
@bennibbelink
dont link rpath to outside of build tree
f7aaaf9
@bennibbelink
remove root dir outputs; find blas correctly
827a2a9
@bennibbelink
revert rpath changes
e49034c
@bennibbelink
update --code-coverage flag
aba8040
@bennibbelink
no longer require agnostic python in env instead of python3
69dec41
@bennibbelink
update CHANGELOG
a4659ac
@bennibbelink
use Python3_EXECUTABLE for hdf5_back_gen.py
b9902ad
@bennibbelink
reference other PRs to show CI passing
7d17fcc
@bennibbelink
reference correct repos/branches
4d12fac
@bennibbelink
python3
e976886
@bennibbelink
Merge branch 'main' into cleanup-dependencies
b7cb361 
Signed-off-by: Ben Nibbelink <79653949+bennibbelink@users.noreply.github.com>
@github-actions GitHub Actions
Copy link

github-actions bot commented May 11, 2024 •
edited

Downstream Build Status Report - 7191318 - 2024-05-18 13:27:22 +0000

Build FROM cyclus_20.04_apt/cyclus
  • Cycamore: Success ✅
  • Cymetric: Success ✅
Build FROM cyclus_20.04_conda/cyclus
  • Cycamore: Success ✅
  • Cymetric: Success ✅
Build FROM cyclus_22.04_apt/cyclus
  • Cycamore: Success ✅
  • Cymetric: Success ✅
Build FROM cyclus_22.04_conda/cyclus
  • Cycamore: Success ✅
  • Cymetric: Success ✅

@coveralls
Copy link
Collaborator

coveralls commented May 11, 2024 •
edited

Pull Request Test Coverage Report for Build 9140234196

Details

  • 0 of 0 changed or added relevant lines in 0 files are covered.
  • No unchanged relevant lines lost coverage.
  • Overall coverage remained the same at 40.771%
Totals Coverage Status
Change from base Build 9009464448: 0.0%
Covered Lines: 53225
Relevant Lines: 130546
💛 - Coveralls

@bennibbelink
Update CHANGELOG.rst
c219ac3 
Signed-off-by: Ben Nibbelink <79653949+bennibbelink@users.noreply.github.com>
gonuke
gonuke reviewed May 12, 2024
View reviewed changes
CMakeLists.txt Show resolved Hide resolved
@bennibbelink bennibbelink marked this pull request as ready for review May 12, 2024 14:33
@bennibbelink bennibbelink linked an issue May 13, 2024 that may be closed by this pull request
Use - and _ consistently in install.py flags #1745
Closed
@bennibbelink bennibbelink requested a review from gonuke May 15, 2024 17:07
gonuke
gonuke requested changes May 17, 2024
View reviewed changes
Copy link
Member

@gonuke gonuke left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One question about messages

CMakeLists.txt Outdated Show resolved Hide resolved
@bennibbelink bennibbelink requested a review from gonuke May 18, 2024 13:46
gonuke
gonuke approved these changes May 18, 2024
View reviewed changes
Copy link
Member

@gonuke gonuke left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @bennibbelink - LGTM

@gonuke gonuke merged commit 4894eb4 into cyclus:main May 18, 2024
10 checks passed
@bennibbelink bennibbelink deleted the cleanup-dependencies branch May 18, 2024 16:44
@bennibbelink bennibbelink mentioned this pull request May 21, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gonuke gonuke gonuke approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Use - and _ consistently in install.py flags
3 participants
@bennibbelink @coveralls @gonuke