Skip to content

Commit db2c28c

Browse files
authored
changelog (#639)
* changelog * use mincondax * tr exact version * more * boost time * debug * auto creds
1 parent 5cb4479 commit db2c28c

File tree

6 files changed

+26
-18
lines changed

6 files changed

+26
-18
lines changed

.github/workflows/ci.yml

+9-11
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
test:
1111
name: Python ${{ matrix.python-version }}
1212
runs-on: ubuntu-latest
13-
timeout-minutes: 10
13+
timeout-minutes: 30
1414
strategy:
1515
fail-fast: false
1616
matrix:
@@ -20,27 +20,25 @@ jobs:
2020
- name: Checkout source
2121
uses: actions/checkout@v4
2222

23-
- name: Setup Conda Environment
24-
uses: mamba-org/setup-micromamba@v1
23+
- name: Setup conda
24+
uses: conda-incubator/setup-miniconda@v3
2525
with:
26-
cache-downloads: true
2726
environment-file: environment_gcsfs.yaml
28-
environment-name: gcsfs_test
29-
create-args: >-
30-
python=${{ matrix.PY }}
27+
python-version: ${{ matrix.PY }}
28+
activate-environment: gcsfs_test
3129

3230
- name: Conda info
3331
run: |
3432
conda list
3533
conda --version
3634
37-
- name: Install libfuse
38-
run: (sudo apt-get install -y fuse || echo "Error installing fuse.")
39-
35+
- name: install
36+
run: |
37+
pip install -e .
4038
- name: Run tests
4139
run: |
4240
export GOOGLE_APPLICATION_CREDENTIALS=$(pwd)/gcsfs/tests/fake-secret.json
43-
pytest -vv \
41+
pytest -vv -s \
4442
--log-format="%(asctime)s %(levelname)s %(message)s" \
4543
--log-date-format="%H:%M:%S" \
4644
gcsfs/

docs/source/changelog.rst

+5
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@ Changelog
44
Note: in some releases, there are no changes, because we always guarantee relasing in step
55
with fsspec.
66

7+
2024.9.0
8+
--------
9+
10+
* In case error in a pure string (#631)
11+
712
2024.6.1
813
--------
914

environment_gcsfs.yaml

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,17 @@ name: gcsfs_test
22
channels:
33
- conda-forge
44
dependencies:
5+
- python==3.11
56
- aiohttp
67
- crcmod
78
- decorator
89
- fsspec
9-
- fusepy<3
1010
- google-api-core
1111
- google-api-python-client
1212
- google-auth
1313
- google-auth-oauthlib
1414
- google-cloud-core
1515
- google-cloud-storage
16-
- libfuse<3
1716
- pytest
1817
- pytest-timeout
1918
- requests

gcsfs/tests/conftest.py

+7-3
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@
4646
c = TEST_BUCKET + "/tmp/test/c"
4747
d = TEST_BUCKET + "/tmp/test/d"
4848

49+
params = dict()
50+
4951

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

8790
@pytest.fixture
8891
def gcs_factory(docker_gcs):
92+
params["endpoint_url"] = docker_gcs
93+
8994
def factory(default_location=None):
9095
GCSFileSystem.clear_instance_cache()
91-
return fsspec.filesystem(
92-
"gcs", endpoint_url=docker_gcs, default_location=default_location
93-
)
96+
params["default_location"] = default_location
97+
return fsspec.filesystem("gcs", **params)
9498

9599
return factory
96100

gcsfs/tests/test_core.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -870,8 +870,10 @@ def test_bigger_than_block_read(gcs):
870870

871871

872872
def test_current(gcs):
873+
from gcsfs.tests import conftest
874+
873875
assert GCSFileSystem.current() is gcs
874-
gcs2 = GCSFileSystem(endpoint_url=gcs._endpoint, default_location=None)
876+
gcs2 = GCSFileSystem(**conftest.params)
875877
assert gcs2.session is gcs.session
876878

877879

requirements.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
aiohttp!=4.0.0a0, !=4.0.0a1
22
decorator>4.1.2
3-
fsspec==2024.6.1
3+
fsspec==2024.9.0
44
google-auth>=1.2
55
google-auth-oauthlib
66
google-cloud-storage

0 commit comments

Comments
 (0)