Skip to content

Commit

Permalink
fixup! [feature] Add support for fsspec backends
Browse files Browse the repository at this point in the history
  • Loading branch information
mxmlnkn committed Oct 6, 2024
1 parent c425ca3 commit 25c5125
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 12 deletions.
9 changes: 7 additions & 2 deletions .github/workflows/appimage-develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,15 +73,20 @@ jobs:
ratarmount --help
ratarmount --version
- uses: actions/checkout@v4

- name: Test Simple Mount
run: |
ratarmount tests/single-file.tar mimi
ls -la mimi
sleep 1s
ratarmount -u mimi
- name: Install pip Test Dependencies
run: |
python3 -m pip install -r tests/requirements-tests.txt
# Explicitly install pygit2 even on Python 3.13+ because we have set up libgit2 manually.
python3 -m pip install pygit2
python3 -c 'import pygit2'
- name: Regression Tests
run: |
# Starting up ratarmount for each very short test is quite slow, especially on the CI machine (3-5s).
Expand Down
16 changes: 14 additions & 2 deletions .github/workflows/appimage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,20 +62,32 @@ jobs:
# These are required for creating test files on the fly not for ratarmount!
sudo apt-get -y install bzip2 pixz zstd unar fuse
- name: Install pip Test Dependencies
run: |
python3 -m pip install -r tests/requirements-tests.txt
# Explicitly install pygit2 even on Python 3.13+ because we have set up libgit2 manually.
python3 -m pip install pygit2
python3 -c 'import pygit2'
- name: Test Simple Startup
run: |
ratarmount --help
ratarmount --version
- uses: actions/checkout@v4

- name: Test Simple Mount
run: |
ratarmount tests/single-file.tar mimi
ls -la mimi
sleep 1s
ratarmount -u mimi
- name: Install pip Test Dependencies
run: |
python3 -m pip install -r tests/requirements-tests.txt
# Explicitly install pygit2 even on Python 3.13+ because we have set up libgit2 manually.
python3 -m pip install pygit2
python3 -c 'import pygit2'
- name: Regression Tests
run: |
# Starting up ratarmount for each very short test is quite slow, especially on the CI machine (3-5s).
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -234,13 +234,6 @@ jobs:
# Segfaults (139) are not allowed but other exit codes are valid!
python3 ratarmount.py tests/simple.bz2 || [ $? != 139 ]
- name: Install pip Test Dependencies
run: |
python3 -m pip install -r tests/requirements-tests.txt
# Explicitly install pygit2 even on Python 3.13+ because we have set up libgit2 manually.
python3 -m pip install pygit2
python3 -c 'import pygit2'
- name: Unit Tests
run: |
python3 -m pip install pytest pytest-xdist
Expand Down Expand Up @@ -271,6 +264,13 @@ jobs:
done
python3 tests/tests.py
- name: Install pip Test Dependencies
run: |
python3 -m pip install -r tests/requirements-tests.txt
# Explicitly install pygit2 even on Python 3.13+ because we have set up libgit2 manually.
python3 -m pip install pygit2
python3 -c 'import pygit2'
- name: Regression Tests (FUSE 3)
if: ${{ !startsWith( matrix.os, 'macos' ) }}
run: |
Expand Down
5 changes: 4 additions & 1 deletion AppImage/build-ratarmount-appimage.sh
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,9 @@ function installAppImagePythonPackages()
# And we need to apply a patch for that.
"$APP_PYTHON_BIN" -I -m pip install --no-cache-dir pyfatfs
patch -u "$( find "$APP_DIR" -type f -name FatIO.py )" pyfatfs-issue-41.patch

# These are untested but small enough that we can just install them for now. Maybe they even work.
"$APP_PYTHON_BIN" -I -m pip install --no-cache-dir gcsfs adlfs dropboxdrivefs
}

function installAppImageSystemLibraries()
Expand Down Expand Up @@ -185,7 +188,7 @@ function trimAppImage()
"$APP_PYTHON_LIB/smtplib.py" \
"$APP_PYTHON_LIB/smtpd.py" \
"$APP_PYTHON_LIB/ensurepip" \
"$APP_PYTHON_LIB/html" \
#"$APP_PYTHON_LIB/html" \ # Needed by botocore
"$APP_PYTHON_LIB/idlelib" \
"$APP_PYTHON_LIB/pickletools.py" \
"$APP_PYTHON_LIB/pydoc_data" \
Expand Down

0 comments on commit 25c5125

Please sign in to comment.