Skip to content

Commit

Permalink
Adjust dep ordering
Browse files Browse the repository at this point in the history
  • Loading branch information
mattdawkins committed Jul 27, 2023
1 parent 36d97c4 commit 53412db
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1029,4 +1029,4 @@ else()
)
install( SCRIPT ${CMAKE_BINARY_DIR}/viame-install-fixup.cmake )
endif()
endif()
endif()
6 changes: 2 additions & 4 deletions cmake/add_project_python_deps.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
# ------------------------------ ADD ANY BASIC PYTHON DEPS HERE ----------------------------------
# Basic dependencies are installed jointly in one local pip installation call

set( VIAME_PYTHON_BASIC_DEPS "wheel" )
# Core requirements used for building certain libraries
set( VIAME_PYTHON_BASIC_DEPS "wheel" "ordered_set" "Cython" )

if( VIAME_FIXUP_BUNDLE )
list( APPEND VIAME_PYTHON_BASIC_DEPS "numpy==1.19.3" )
Expand All @@ -30,9 +31,6 @@ if( ( WIN32 OR Python_VERSION VERSION_LESS "3.8" )
list( APPEND VIAME_PYTHON_BASIC_DEPS "setuptools==57.5.0" )
endif()

# Installation requirement for some dependencies
list( APPEND VIAME_PYTHON_BASIC_DEPS "Cython" "ordered_set" )

# For scoring and plotting
list( APPEND VIAME_PYTHON_BASIC_DEPS "kiwisolver==1.2.0" )
list( APPEND VIAME_PYTHON_BASIC_DEPS "matplotlib<=3.5.1" )
Expand Down

0 comments on commit 53412db

Please sign in to comment.