From b1040be44c7088e7703dafceeb0c2541b4b6fa6d Mon Sep 17 00:00:00 2001 From: iasonkrom Date: Tue, 6 Feb 2024 20:59:24 -0600 Subject: [PATCH 1/5] fix conda_env.yml --- conda_env.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conda_env.yml b/conda_env.yml index fb646053b3a..b79804036bc 100644 --- a/conda_env.yml +++ b/conda_env.yml @@ -2,10 +2,10 @@ name: combine channels: - conda-forge dependencies: - - python==3.8 + - python=3.8 - pip - pandas - - root==6.22 + - root=6.22 - gsl - tbb - vdt From 5eaebe69aa7f6d6633c087e9b30999288967a38a Mon Sep 17 00:00:00 2001 From: iasonkrom Date: Tue, 6 Feb 2024 23:11:40 -0600 Subject: [PATCH 2/5] perhaps this is better --- Makefile | 2 +- conda_env.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 3f077a271e6..1f6b48f821c 100644 --- a/Makefile +++ b/Makefile @@ -30,7 +30,7 @@ ROOTLIBS = $(shell root-config --libs --glibs) ROOTINC = $(shell root-config --incdir) # CMSSW CXXFLAGS plus -Wno-unused-local-typedefs (otherwise we get a flood of messages from BOOST) plus -Wno-unused-function -CCFLAGS = -D STANDALONE $(ROOTCFLAGS) -g -fPIC -O2 -pthread -pipe -Werror=main -Werror=pointer-arith -Werror=overlength-strings -Wno-vla -Werror=overflow -ftree-vectorize -Wstrict-overflow -Werror=array-bounds -Werror=format-contains-nul -Werror=type-limits -fvisibility-inlines-hidden -fno-math-errno --param vect-max-version-for-alias-checks=50 -Xassembler --compress-debug-sections -msse3 -felide-constructors -fmessage-length=0 -Wall -Wno-non-template-friend -Wno-long-long -Wreturn-type -Wunused -Wparentheses -Wno-deprecated -Werror=return-type -Werror=missing-braces -Werror=unused-value -Werror=address -Werror=format -Werror=sign-compare -Werror=write-strings -Werror=delete-non-virtual-dtor -Werror=strict-aliasing -Werror=narrowing -Werror=unused-but-set-variable -Werror=reorder -Werror=unused-variable -Werror=conversion-null -Werror=return-local-addr -Wnon-virtual-dtor -Werror=switch -fdiagnostics-show-option -Wno-unused-local-typedefs -Wno-attributes -Wno-psabi -Wno-error=unused-variable -DBOOST_DISABLE_ASSERTS -DGNU_GCC -D_GNU_SOURCE -DBOOST_SPIRIT_THREADSAFE -DPHOENIX_THREADSAFE +CCFLAGS = -D STANDALONE $(ROOTCFLAGS) -g -fPIC -O2 -pthread -pipe -Werror=main -Werror=pointer-arith -Werror=overlength-strings -Wno-vla -Werror=overflow -ftree-vectorize -Wstrict-overflow -Werror=array-bounds -Werror=format-contains-nul -Werror=type-limits -fvisibility-inlines-hidden -fno-math-errno --param vect-max-version-for-alias-checks=50 -Xassembler --compress-debug-sections -msse3 -felide-constructors -fmessage-length=0 -Wall -Wno-non-template-friend -Wno-long-long -Wreturn-type -Wunused -Wparentheses -Wno-deprecated -Werror=return-type -Werror=missing-braces -Werror=unused-value -Werror=address -Werror=format -Werror=sign-compare -Werror=write-strings -Werror=delete-non-virtual-dtor -Werror=strict-aliasing -Werror=narrowing -Werror=unused-but-set-variable -Werror=reorder -Werror=unused-variable -Werror=conversion-null -Werror=return-local-addr -Wnon-virtual-dtor -Werror=switch -fdiagnostics-show-option -Wno-unused-local-typedefs -Wno-attributes -Wno-psabi -Wno-error=unused-variable -DBOOST_DISABLE_ASSERTS -DGNU_GCC -D_GNU_SOURCE -DBOOST_SPIRIT_THREADSAFE -DPHOENIX_THREADSAFE -Wno-unused-but-set-variable LIBS = $(ROOTLIBS) -lgsl -lRooFit -lRooFitCore -lRooStats -lMinuit -lMathMore -lFoam -lHistFactory -lboost_filesystem -lboost_program_options -lboost_system -lvdt ifeq ($(CONDA), 1) diff --git a/conda_env.yml b/conda_env.yml index b79804036bc..b2b7b4f2396 100644 --- a/conda_env.yml +++ b/conda_env.yml @@ -2,10 +2,10 @@ name: combine channels: - conda-forge dependencies: - - python=3.8 + - python=3.10 - pip - pandas - - root=6.22 + - root=6.26 - gsl - tbb - vdt From f10361c1fedbf4811223b3ec3a6f01a4c64148d9 Mon Sep 17 00:00:00 2001 From: Iason Krommydas Date: Mon, 12 Feb 2024 09:19:04 -0600 Subject: [PATCH 3/5] Update conda_env.yml Co-authored-by: Andrzej Novak --- conda_env.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conda_env.yml b/conda_env.yml index b2b7b4f2396..db9924aa3a7 100644 --- a/conda_env.yml +++ b/conda_env.yml @@ -5,7 +5,7 @@ dependencies: - python=3.10 - pip - pandas - - root=6.26 + root=6.26.4 - gsl - tbb - vdt From aeab937665ae2a961986e733aa40f5e195fe6d28 Mon Sep 17 00:00:00 2001 From: iasonkrom Date: Mon, 12 Feb 2024 09:34:52 -0600 Subject: [PATCH 4/5] maybe update ci also --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 81a571f14a0..bec5ce53577 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,6 +27,7 @@ jobs: build: strategy: matrix: + os: [ubuntu-latest, macos-latest] python: ["3.8"] root: ["6.22"] include: @@ -39,7 +40,7 @@ jobs: # python 3.10 root 6.26 - python: "3.10" root: "6.26.4" - runs-on: ubuntu-latest + runs-on: ${{ matrix.os }} name: Compile (py${{ matrix.python }}, root${{ matrix.root }}) steps: From d9de2331735261faa5ff4c93312f7b3ced810f7b Mon Sep 17 00:00:00 2001 From: iasonkrom Date: Mon, 12 Feb 2024 10:07:22 -0600 Subject: [PATCH 5/5] include os in name --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bec5ce53577..a3029fdbb48 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -41,7 +41,7 @@ jobs: - python: "3.10" root: "6.26.4" runs-on: ${{ matrix.os }} - name: Compile (py${{ matrix.python }}, root${{ matrix.root }}) + name: Compile (os${{ matrix.os }} py${{ matrix.python }}, root${{ matrix.root }}) steps: - uses: actions/checkout@master