Commit 140bc773 authored by Henderson, Shane's avatar Henderson, Shane
Browse files

Update Python version

parent 9b3ee973

.gitlab-ci.yml

+7 −3
Original line number Diff line number Diff line
@@ -13,14 +13,16 @@ stages: 
#Primarily concerned with setting up micromamba for the appropriate platforms

#All the build requirements excepting some compiler magic is there

.bash_before: &bash_before

  - export PATH=/projects/gcc-8.3.0/toolset/gcc-8.3.0/bin:$PATH       

  - export LD_LIBRARY_PATH=/projects/gcc-8.3.0/toolset/gcc-8.3.0/lib64

  - export MAMBA_ROOT_PREFIX="$CI_PROJECT_DIR/tools/micromamba"

  - source ./ci/setup_mamba.sh

  - micromamba activate saline_build

  - micromamba activate saline_39



.powershell_before: &powershell_before

  - $env:MAMBA_ROOT_PREFIX="$CI_PROJECT_DIR/tools/micromamba"

  - . $CI_PROJECT_DIR/ci/setup_mamba.ps1

  - micromamba activate saline_build

  - micromamba activate saline_39



build_macos:

  stage: build
@@ -93,10 +95,12 @@ build_linux: 
    - cmake -S $CI_PROJECT_DIR -B build -DCMAKE_BUILD_TYPE=RELEASE

      -Dsaline_ENABLE_Fortran=ON -DCMAKE_Fortran_FLAGS:STRING="-ffree-line-length-none"

      -Dsaline_ENABLE_Python=ON

      -DCMAKE_CXX_COMPILER=/projects/gcc-8.3.0/toolset/gcc-8.3.0/bin/g++

      -DCMAKE_Fortran_COMPILER=/projects/gcc-8.3.0/toolset/gcc-8.3.0/bin/gfortran

    - cmake --build build

    - ctest --test-dir build

    - cmake --install build --prefix install

    - auditwheel repair -w ${CI_PROJECT_DIR}/install/wheelhouse --plat manylinux_2_34_x86_64 ${CI_PROJECT_DIR}/build/src/python/dist/SalinePy*.whl

    - auditwheel repair -w ${CI_PROJECT_DIR}/install/wheelhouse --plat manylinux_2_24_x86_64 ${CI_PROJECT_DIR}/build/src/python/dist/SalinePy*.whl

  artifacts:

    name: linux_x86

    expire_in: 1 week

CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ cmake_minimum_required(VERSION 3.16 FATAL_ERROR) 


#First pass automated version increment

project(saline

  VERSION 0.1.0

  VERSION 0.2.0

  DESCRIPTION "MSTDB-TP API"

  LANGUAGES CXX

)

ci/build_env.yml

+3 −5
Original line number Diff line number Diff line 
name: saline_build

name: saline_39

channels:

  - conda-forge

dependencies:

  - cmake

  - cxx-compiler

  - fortran-compiler

  - python=3.8

  - cmake=3.23

  - python=3.9

  - build

  - swig=4.2.1

  - setuptools

ci/setup_mamba.ps1

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ if ( !(Test-Path $CI_PROJECT_DIR/tools/micromamba.exe -PathType Leaf) ) 
}



Invoke-Expression "$CI_PROJECT_DIR\tools\micromamba.exe shell hook -s powershell" | Out-String | Invoke-Expression

if (micromamba info | Select-String "saline_build" )

if (micromamba info | Select-String "saline_39" )

{

    echo "env already exists"

}

ci/setup_mamba.sh

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ fi 
eval "$($CI_PROJECT_DIR/tools/bin/micromamba shell hook --shell bash --root-prefix $MAMBA_ROOT_PREFIX)"



# Ensure we have the environment built| grep -q base; then echo "base already exists"; fi

if micromamba info --envs | grep -q saline_build; then

if micromamba info --envs | grep -q saline_39; then

    echo "env already exists"

else

    # Since it wasn't installed create the environment while we are here