Skip to content

Commit

Permalink
changelog (#639)
Browse files Browse the repository at this point in the history
* changelog

* use mincondax

* tr exact version

* more

* boost time

* debug

* auto creds
  • Loading branch information
martindurant committed Sep 4, 2024
1 parent 5cb4479 commit db2c28c
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 18 deletions.
20 changes: 9 additions & 11 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
test:
name: Python ${{ matrix.python-version }}
runs-on: ubuntu-latest
timeout-minutes: 10
timeout-minutes: 30
strategy:
fail-fast: false
matrix:
Expand All @@ -20,27 +20,25 @@ jobs:
- name: Checkout source
uses: actions/checkout@v4

- name: Setup Conda Environment
uses: mamba-org/setup-micromamba@v1
- name: Setup conda
uses: conda-incubator/setup-miniconda@v3
with:
cache-downloads: true
environment-file: environment_gcsfs.yaml
environment-name: gcsfs_test
create-args: >-
python=${{ matrix.PY }}
python-version: ${{ matrix.PY }}
activate-environment: gcsfs_test

- name: Conda info
run: |
conda list
conda --version
- name: Install libfuse
run: (sudo apt-get install -y fuse || echo "Error installing fuse.")

- name: install
run: |
pip install -e .
- name: Run tests
run: |
export GOOGLE_APPLICATION_CREDENTIALS=$(pwd)/gcsfs/tests/fake-secret.json
pytest -vv \
pytest -vv -s \
--log-format="%(asctime)s %(levelname)s %(message)s" \
--log-date-format="%H:%M:%S" \
gcsfs/
Expand Down
5 changes: 5 additions & 0 deletions docs/source/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ Changelog
Note: in some releases, there are no changes, because we always guarantee relasing in step
with fsspec.

2024.9.0
--------

* In case error in a pure string (#631)

2024.6.1
--------

Expand Down
3 changes: 1 addition & 2 deletions environment_gcsfs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,17 @@ name: gcsfs_test
channels:
- conda-forge
dependencies:
- python==3.11
- aiohttp
- crcmod
- decorator
- fsspec
- fusepy<3
- google-api-core
- google-api-python-client
- google-auth
- google-auth-oauthlib
- google-cloud-core
- google-cloud-storage
- libfuse<3
- pytest
- pytest-timeout
- requests
Expand Down
10 changes: 7 additions & 3 deletions gcsfs/tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@
c = TEST_BUCKET + "/tmp/test/c"
d = TEST_BUCKET + "/tmp/test/d"

params = dict()


def stop_docker(container):
cmd = shlex.split('docker ps -a -q --filter "name=%s"' % container)
Expand All @@ -60,6 +62,7 @@ def docker_gcs():
# assume using real API or otherwise have a server already set up
yield os.getenv("STORAGE_EMULATOR_HOST")
return
params["token"] = "anon"
container = "gcsfs_test"
cmd = (
"docker run -d -p 4443:4443 --name gcsfs_test fsouza/fake-gcs-server:latest -scheme "
Expand All @@ -86,11 +89,12 @@ def docker_gcs():

@pytest.fixture
def gcs_factory(docker_gcs):
params["endpoint_url"] = docker_gcs

def factory(default_location=None):
GCSFileSystem.clear_instance_cache()
return fsspec.filesystem(
"gcs", endpoint_url=docker_gcs, default_location=default_location
)
params["default_location"] = default_location
return fsspec.filesystem("gcs", **params)

return factory

Expand Down
4 changes: 3 additions & 1 deletion gcsfs/tests/test_core.py
Original file line number Diff line number Diff line change
Expand Up @@ -870,8 +870,10 @@ def test_bigger_than_block_read(gcs):


def test_current(gcs):
from gcsfs.tests import conftest

assert GCSFileSystem.current() is gcs
gcs2 = GCSFileSystem(endpoint_url=gcs._endpoint, default_location=None)
gcs2 = GCSFileSystem(**conftest.params)
assert gcs2.session is gcs.session


Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
aiohttp!=4.0.0a0, !=4.0.0a1
decorator>4.1.2
fsspec==2024.6.1
fsspec==2024.9.0
google-auth>=1.2
google-auth-oauthlib
google-cloud-storage
Expand Down

0 comments on commit db2c28c

Please sign in to comment.