Skip to content

Commit

Permalink
🔖 0.11.0 (#180)
Browse files Browse the repository at this point in the history
* Update README.md

* Bump argx to 0.2.10

* Add Dockerfile for codesandbox

* Bump pandas to v2

* Fix linting

* 🔖 0.11.0

* Update CHANGELOG.md

* Fix CI
  • Loading branch information
pwwang authored Oct 8, 2023
1 parent 6247c3c commit a581093
Show file tree
Hide file tree
Showing 8 changed files with 345 additions and 344 deletions.
7 changes: 7 additions & 0 deletions .codesandbox/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
FROM python:3.10.12

RUN apt-get update && apt-get install -y fish && \
pip install -U pip && \
pip install poetry && \
poetry config virtualenvs.create false && \
chsh -s /usr/bin/fish
60 changes: 30 additions & 30 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,33 +32,33 @@ jobs:
mkdocs gh-deploy --clean --force
if: success()

fix-index:
needs: docs
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ["3.10"]
steps:
- uses: actions/checkout@v3
with:
ref: gh-pages
- name: Fix index.html
run: |
echo ':: head of index.html - before ::'
head index.html
sed -i '1,5{/^$/d}' index.html
echo ':: head of index.html - after ::'
head index.html
if: success()
- name: Commit changes
run: |
git config --local user.email "[email protected]"
git config --local user.name "GitHub Action"
git commit -m "Add changes" -a
if: success()
- name: Push changes
uses: ad-m/github-push-action@master
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
branch: gh-pages
if: success()
# fix-index:
# needs: docs
# runs-on: ubuntu-latest
# strategy:
# matrix:
# python-version: ["3.10"]
# steps:
# - uses: actions/checkout@v3
# with:
# ref: gh-pages
# - name: Fix index.html
# run: |
# echo ':: head of index.html - before ::'
# head index.html
# sed -i '1,5{/^$/d}' index.html
# echo ':: head of index.html - after ::'
# head index.html
# if: success()
# - name: Commit changes
# run: |
# git config --local user.email "[email protected]"
# git config --local user.name "GitHub Action"
# git commit -m "Add changes" -a
# if: success()
# - name: Push changes
# uses: ad-m/github-push-action@master
# with:
# github_token: ${{ secrets.GITHUB_TOKEN }}
# branch: gh-pages
# if: success()
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,11 @@ if __name__ == "__main__":
06-09 23:15:29 I core _ ____/__/ / _ ____/_ /___ _ /| /
06-09 23:15:29 I core /_/ /___/ /_/ /_____/ /_/ |_/
06-09 23:15:29 I core
06-09 23:15:29 I core version: 0.10.2
06-09 23:15:29 I core version: 0.11.0
06-09 23:15:29 I core
06-09 23:15:29 I core ╔══════════════════════════════════════════════════════════════════
06-09 23:15:29 I core ╔═══════════════════════════════════════════════════╗
06-09 23:15:29 I core ║ MYPIPELINE ║
06-09 23:15:29 I core ╚══════════════════════════════════════════════════════════════════
06-09 23:15:29 I core ╚═══════════════════════════════════════════════════╝
06-09 23:15:29 I core plugins : verbose v0.7.0
06-09 23:15:29 I core # procs : 2
06-09 23:15:29 I core profile : default
Expand All @@ -87,9 +87,9 @@ if __name__ == "__main__":
06-09 23:15:29 I core plugin_opts :
06-09 23:15:29 I core template_opts :
06-09 23:15:31 I core
06-09 23:15:31 I core ╭─────────────────────────────── P1 ───────────────────────────────╮
06-09 23:15:31 I core ╭──────────────────────── P1 ───────────────────────╮
06-09 23:15:31 I core │ Sort input file │
06-09 23:15:31 I core ╰──────────────────────────────────────────────────────────────────
06-09 23:15:31 I core ╰──────────────────────────────────────────────────╯
06-09 23:15:31 I core P1: Workdir: '/home/pwwang/github/pipen/.pipen/MyPipeline/P1'
06-09 23:15:31 I core P1: <<< [START]
06-09 23:15:31 I core P1: >>> ['P2']
Expand All @@ -99,9 +99,9 @@ if __name__ == "__main__":
/home/pwwang/github/pipen/.pipen/MyPipeline/P1/0/output/intermediate.txt
06-09 23:15:33 I verbose P1: Time elapsed: 00:00:02.018s
06-09 23:15:33 I core
06-09 23:15:33 I core ╭═══════════════════════════════ P2 ═══════════════════════════════╮
06-09 23:15:33 I core ╭════════════════════════ P2 ═══════════════════════╮
06-09 23:15:33 I core ║ Paste line number ║
06-09 23:15:33 I core ╰══════════════════════════════════════════════════════════════════
06-09 23:15:33 I core ╰══════════════════════════════════════════════════╯
06-09 23:15:33 I core P2: Workdir: '/home/pwwang/github/pipen/.pipen/MyPipeline/P2'
06-09 23:15:33 I core P2: <<< ['P1']
06-09 23:15:33 I core P2: >>> [END]
Expand Down
6 changes: 6 additions & 0 deletions docs/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Change Log

## 0.11.0

- Add Dockerfile for codesandbox
- Bump pandas to v2
- Bump argx to 0.2.10

## 0.10.6

- 🐛 Fix "DeprecationWarning: np.find_common_type is deprecated" from pandas (due to numpy 1.25 update)
Expand Down
11 changes: 8 additions & 3 deletions pipen/channel.py
Original file line number Diff line number Diff line change
Expand Up @@ -184,9 +184,14 @@ def expand_dir(
assert data.shape[0] == 1, "Can only expand a single row DataFrame."
col_loc = col if isinstance(col, int) else data.columns.get_loc(col)
full_pattern = f"{data.iloc[0, col_loc]}/{pattern}"
expanded = Channel.from_glob(full_pattern, ftype, sortby, reverse)
ret = pandas.concat([data] * expanded.size, axis=0)
ret[data.columns[col_loc]] = expanded.values
expanded = Channel.from_glob(
full_pattern,
ftype,
sortby,
reverse,
).iloc[:, 0]
ret = pandas.concat([data] * expanded.size, axis=0, ignore_index=True)
ret.loc[:, col_loc] = expanded.values
return ret.reset_index(drop=True)


Expand Down
2 changes: 1 addition & 1 deletion pipen/version.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
"""Provide version of pipen"""

__version__ = "0.10.6"
__version__ = "0.11.0"
Loading

0 comments on commit a581093

Please sign in to comment.