Mostly solved python path issues

cms-analysis · Jul 28, 2022 · 1f3a1d8 · 1f3a1d8
1 parent e3c185a
commit 1f3a1d8
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -52,7 +52,7 @@ jobs:
     - name: Install build environment
       shell: bash -l {0}
       run: |
-        mamba install -c conda-forge python==${{ matrix.python }} pip root==${{ matrix.root }} gsl tbb vdt boost pcre eigen
+        mamba install -c conda-forge python==${{ matrix.python }} pip pandas root==${{ matrix.root }} gsl tbb vdt boost pcre eigen
         cd HiggsAnalysis/CombinedLimit
         bash set_conda_env_vars.sh
     - name: Build

diff --git a/Makefile b/Makefile
@@ -51,7 +51,7 @@ ROOTLDFLAGS   = $(shell root-config --ldflags)
 DARWIN := $(shell uname|grep Darwin)
 ifdef DARWIN
 LDFLAGS       = $(ROOTLDFLAGS) -shared -install_name @rpath/$(SONAME) -fPIC
-EXELDFLAGS    = -undefined dynamic_lookup -Wl,-rpath,'@executable_path/../lib'
+EXELDFLAGS    = -Wl,-rpath,'@executable_path/../lib'
 else
 LDFLAGS       = $(ROOTLDFLAGS) -shared -Wl,-soname,$(SONAME) -Wl,-E -Wl,-z,defs -fPIC
 EXELDFLAGS    = 
@@ -77,7 +77,7 @@ PROGS = $(notdir $(wildcard ${PROG_DIR}/*.cpp))
 EXES = $(PROGS:.cpp=)
 
 #Makefile Rules ---------------------------------------------------------------
-.PHONY: clean dirs dict obj lib exe debug
+.PHONY: clean dirs dict obj lib exe debug python
 
 
 all: dirs dict obj lib exe python

diff --git a/conda_env.yml b/conda_env.yml
@@ -4,6 +4,7 @@ channels:
 dependencies:
   - python==3.8
   - pip
+  - pandas
   - root==6.22
   - gsl
   - tbb

diff --git a/set_conda_env_vars.sh b/set_conda_env_vars.sh
@@ -1,3 +1,3 @@
 conda env config vars set PATH=${PATH}:${PWD}/exe:${PWD}/scripts
 conda env config vars set LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${PWD}/lib
-conda env config vars set PYTHONPATH=${PYTHONPATH}:${PWD}/lib/python:${PWD}/lib
+conda env config vars set PYTHONPATH=${PYTHONPATH}:${PWD}/lib/python
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,7 @@ channels: @@
     dependencies:
       - python==3.8
       - pip
+      - pandas
       - root==6.22
       - gsl
       - tbb
@@ Expand Down @@