Skip to content

Commit

Permalink
Merge branch 'hotfix/0.13.2'
Browse files Browse the repository at this point in the history
* hotfix/0.13.2:
  Version 0.13.2
  Update gitignore
  FCKIT_VENV: upgrade pip before installing packages (#48)
  Ensure eckit linked with latest libaec in downstream-ci
  • Loading branch information
wdeconinck committed Nov 12, 2024
2 parents 73e0e1b + 0157ccd commit 9e93eae
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 5 deletions.
1 change: 1 addition & 0 deletions .github/ci-config.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
dependencies: |
ecmwf/ecbuild
MathisRosenhauer/libaec@master
ecmwf/eckit
dependency_branch: develop
parallelism_factor: 8
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@ build
install/*
CMakeLists.txt.user
**/*.egg-info/
.vscode
__pycache__

2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
0.13.1
0.13.2

11 changes: 7 additions & 4 deletions cmake/fckit_install_venv.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,6 @@
macro( fckit_install_venv )

list( APPEND PIP_OPTIONS "--disable-pip-version-check" )
if( HAVE_FCKIT_VENV_EDITABLE )
# Use checked-out source instead of installing into venv
list( APPEND PIP_OPTIONS "-e" )
endif()

# Create a virtualenv
set( VENV_PATH ${CMAKE_CURRENT_BINARY_DIR}/fckit_venv )
Expand Down Expand Up @@ -45,6 +41,13 @@ macro( fckit_install_venv )
set( _pkg_name "fckit_yaml_reader/[tests]")
endif()

execute_process( COMMAND ${Python3_EXECUTABLE} -m pip install --upgrade ${PIP_OPTIONS} pip OUTPUT_QUIET )

if( HAVE_FCKIT_VENV_EDITABLE )
# Use checked-out source instead of installing into venv
list( APPEND PIP_OPTIONS "-e" )
endif()

ecbuild_info( "Install fckit_yaml_reader in virtual environment ${VENV_PATH}" )
execute_process( COMMAND ${Python3_EXECUTABLE} -m pip install ${PIP_OPTIONS} ${CMAKE_CURRENT_SOURCE_DIR}/src/fckit/${_pkg_name} OUTPUT_QUIET )

Expand Down

0 comments on commit 9e93eae

Please sign in to comment.