From b93d1b67d704248421263aac56db1a0d5f08a84c Mon Sep 17 00:00:00 2001 From: Andreas Albert Date: Thu, 17 Jun 2021 11:33:02 +0200 Subject: [PATCH 1/5] Test macos --- .github/workflows/tests.yml | 52 ++++++++++++++++++------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 3e7ee2ca..ebedb9b9 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -67,34 +67,34 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This is a job for macOS python3 tests -# macospy3: -# runs-on: macos-latest -# steps: -# - uses: actions/checkout@v2 + macospy3: + runs-on: macos-latest + steps: + - uses: actions/checkout@v2 -# # Install dependencies -# - name: Install dependencies -# run: | -# brew update -# brew install fontconfig gd gettext libffi glib jasper netpbm gts graphviz gsl libxml2 openblas numpy tbb xrootd || true -# brew install python@3.8 openssl@1.1 || true + # Install dependencies + - name: Install dependencies + run: | + brew update + brew install fontconfig gd gettext libffi glib jasper netpbm gts graphviz gsl libxml2 openblas numpy tbb xrootd root || true + brew install python@3.8 openssl@1.1 || true -# # Run pytest -# - name: Run pytest -# run: | -# ROOT_VERSION=6.20.04_1 -# curl -O https://clange.web.cern.ch/clange/root-v${ROOT_VERSION}.tar.gz -# tar xzf root-v${ROOT_VERSION}.tar.gz -# mkdir -p /usr/local/Cellar/root -# mv ${ROOT_VERSION} /usr/local/Cellar/root/ -# cd /usr/local/Cellar/root/${ROOT_VERSION} -# export PATH=${PWD}/bin:$(brew --cellar python@3.8)/$(ls $(brew --cellar python@3.8))/bin:${PATH} -# export PYTHONPATH=${PWD}/lib/root:${PYTHONPATH} -# export LD_LIBRARY_PATH=${PWD}/lib/root:${LD_LIBRARY_PATH} -# echo ${PYTHONPATH} -# cd - -# python3 -m pip install pytest ipykernel papermill jupyter_client nbconvert -# python3 setup.py test + # Run pytest + - name: Run pytest + run: | + # ROOT_VERSION=6.20.04_1 + # curl -O https://clange.web.cern.ch/clange/root-v${ROOT_VERSION}.tar.gz + # tar xzf root-v${ROOT_VERSION}.tar.gz + # mkdir -p /usr/local/Cellar/root + # mv ${ROOT_VERSION} /usr/local/Cellar/root/ + # cd /usr/local/Cellar/root/${ROOT_VERSION} + # export PATH=${PWD}/bin:$(brew --cellar python@3.8)/$(ls $(brew --cellar python@3.8))/bin:${PATH} + # export PYTHONPATH=${PWD}/lib/root:${PYTHONPATH} + # export LD_LIBRARY_PATH=${PWD}/lib/root:${LD_LIBRARY_PATH} + # echo ${PYTHONPATH} + # cd - + python3 -m pip install pytest ipykernel papermill jupyter_client nbconvert + python3 setup.py test # # Save notebooks # - name: Save notebooks From b06fdd4fddc2e71ec67e1d98014d70c0836352a1 Mon Sep 17 00:00:00 2001 From: Andreas Albert Date: Thu, 17 Jun 2021 11:40:52 +0200 Subject: [PATCH 2/5] macos simplify --- .github/workflows/tests.yml | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index ebedb9b9..c7fbd70a 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -69,30 +69,24 @@ jobs: # This is a job for macOS python3 tests macospy3: runs-on: macos-latest + strategy: + matrix: + python-version: [3.8] steps: - uses: actions/checkout@v2 - + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v2 + with: + python-version: ${{ matrix.python-version }} # Install dependencies - name: Install dependencies run: | brew update - brew install fontconfig gd gettext libffi glib jasper netpbm gts graphviz gsl libxml2 openblas numpy tbb xrootd root || true - brew install python@3.8 openssl@1.1 || true + brew install root || true # Run pytest - name: Run pytest run: | - # ROOT_VERSION=6.20.04_1 - # curl -O https://clange.web.cern.ch/clange/root-v${ROOT_VERSION}.tar.gz - # tar xzf root-v${ROOT_VERSION}.tar.gz - # mkdir -p /usr/local/Cellar/root - # mv ${ROOT_VERSION} /usr/local/Cellar/root/ - # cd /usr/local/Cellar/root/${ROOT_VERSION} - # export PATH=${PWD}/bin:$(brew --cellar python@3.8)/$(ls $(brew --cellar python@3.8))/bin:${PATH} - # export PYTHONPATH=${PWD}/lib/root:${PYTHONPATH} - # export LD_LIBRARY_PATH=${PWD}/lib/root:${LD_LIBRARY_PATH} - # echo ${PYTHONPATH} - # cd - python3 -m pip install pytest ipykernel papermill jupyter_client nbconvert python3 setup.py test From b42ebbf56f073487747c7f1d06009ac2cb6d8683 Mon Sep 17 00:00:00 2001 From: Andreas Albert Date: Thu, 17 Jun 2021 11:51:40 +0200 Subject: [PATCH 3/5] environemtn --- .github/workflows/tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index c7fbd70a..cfaff9ef 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -87,6 +87,7 @@ jobs: # Run pytest - name: Run pytest run: | + . $(brew --prefix)/bin/thisroot.sh python3 -m pip install pytest ipykernel papermill jupyter_client nbconvert python3 setup.py test From c67d7df9ca1f09c39036b61b83fa0e173d728317 Mon Sep 17 00:00:00 2001 From: Andreas Albert Date: Thu, 17 Jun 2021 12:00:04 +0200 Subject: [PATCH 4/5] test --- .github/workflows/tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index cfaff9ef..71f894b8 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -82,8 +82,8 @@ jobs: - name: Install dependencies run: | brew update - brew install root || true - + brew install python@3.8 openssl@1.1 || true + brew install fontconfig gd gettext libffi glib jasper netpbm gts graphviz gsl libxml2 openblas numpy tbb xrootd root || true # Run pytest - name: Run pytest run: | From bf0f73f0fc572e7b1816973335c32726e945cb6d Mon Sep 17 00:00:00 2001 From: Andreas Albert Date: Thu, 17 Jun 2021 12:40:08 +0200 Subject: [PATCH 5/5] test --- .github/workflows/tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 71f894b8..7e5217b9 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -88,8 +88,8 @@ jobs: - name: Run pytest run: | . $(brew --prefix)/bin/thisroot.sh - python3 -m pip install pytest ipykernel papermill jupyter_client nbconvert - python3 setup.py test + $(brew --prefix)/bin/python3 -m pip install pytest ipykernel papermill jupyter_client nbconvert + $(brew --prefix)/bin/python3 setup.py test # # Save notebooks # - name: Save notebooks