diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cdd6baf..8bb9108 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,7 +14,7 @@ jobs: name: Check Manifest runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-python@v4 with: python-version: "3.x" @@ -35,7 +35,7 @@ jobs: with: access_token: ${{ github.token }} - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v4 @@ -63,7 +63,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python uses: actions/setup-python@v4 @@ -96,7 +96,7 @@ jobs: # concurrency: release # steps: - # - uses: actions/checkout@v3 + # - uses: actions/checkout@v4 # with: # fetch-depth: 0 diff --git a/.github/workflows/cron.yml b/.github/workflows/cron.yml index 773fb4c..cb6725b 100644 --- a/.github/workflows/cron.yml +++ b/.github/workflows/cron.yml @@ -20,7 +20,7 @@ jobs: platform: [ubuntu-latest, macos-latest, windows-latest] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v4 diff --git a/src/raman_analysis/loading.py b/src/raman_analysis/loading.py index 4b454f4..21db8a5 100644 --- a/src/raman_analysis/loading.py +++ b/src/raman_analysis/loading.py @@ -5,7 +5,9 @@ import xarray as xr -def ds2df(ds: xr.Dataset, fov: int, cell_index_start: int = 0, filename=None) -> pd.DataFrame: +def ds2df( + ds: xr.Dataset, fov: int, cell_index_start: int = 0, filename=None +) -> pd.DataFrame: """ Convert a single dataset into a dataframe. @@ -53,8 +55,6 @@ def ds2df(ds: xr.Dataset, fov: int, cell_index_start: int = 0, filename=None) -> return df - - def glob2df( files: Union[Iterable[str], str], conditions, @@ -64,6 +64,106 @@ def glob2df( verbose: bool = True, ) -> pd.DataFrame: """ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Parameters ---------- files : iterable, str