diff --git a/.github/workflows/linux_gpu.yml b/.github/workflows/linux_gpu.yml index 50c351c..5f23824 100644 --- a/.github/workflows/linux_gpu.yml +++ b/.github/workflows/linux_gpu.yml @@ -17,14 +17,26 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: + # Create a Conda env and install a newer git there for git clone + - name: Create Conda environment + run: | + conda create -n _github_runner -c conda-forge -y python=3.7 \ + pyfftw pyqt=5 numpy scipy matplotlib pillow h5py posix_ipc databroker openmpi mpi4py numba + source $HOME/miniconda3/bin/activate _github_runner + conda install -c conda-forge -y git + which git + git --version + + # Check out the main - name: Chekout # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it uses: actions/checkout@v2 - + + - name: Init submodule + run: | + git submodule update --init with: - submodules: true - # a personal access token is added as a secret to this repo - token: ${{ secrets.GH_ACTIONS_TOKEN }} + token: ${{ secrets.GH_ACTIONS_TOKEN }} # only GITHUB_TOKEN can be used by forked repos # Runs a single command using the runners shell - name: Ensure the right machine @@ -33,9 +45,6 @@ jobs: # Runs a set of commands using the runners shell - name: Test Conda environment run: | - conda create -n _github_runner -c conda-forge -y python=3.7 \ - pyfftw pyqt=5 numpy scipy matplotlib pillow h5py posix_ipc databroker openmpi mpi4py numba - source $HOME/miniconda3/bin/activate _github_runner conda list python --version pip install -v . diff --git a/nsls2ptycho/ptycho_gui.py b/nsls2ptycho/ptycho_gui.py index 0e8e3f5..08df4d5 100644 --- a/nsls2ptycho/ptycho_gui.py +++ b/nsls2ptycho/ptycho_gui.py @@ -21,6 +21,7 @@ from nsls2ptycho.roi_gui import RoiWindow from nsls2ptycho.scan_pt import ScanWindow + import h5py import numpy as np from numpy import pi