Skip to content

Commit

Permalink
Merge pull request #966 from rbuffat/fix_appveyor
Browse files Browse the repository at this point in the history
Fix maint-1.8 appveyor
  • Loading branch information
sgillies committed Oct 13, 2020
2 parents b17199c + 888085d commit 0517ead
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 8 deletions.
13 changes: 13 additions & 0 deletions pytest.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
[pytest]
filterwarnings =
ignore:.*Sequential read of iterator was interrupted*:RuntimeWarning
ignore:.*negative slices or start values other than zero may be slow*:RuntimeWarning
ignore:.*negative step size may be slow*:RuntimeWarning
ignore:.*is buggy and will be removed in Fiona 2.0.*

markers =
iconv: marks tests that require gdal to be compiled with iconv
network: marks tests that require a network connection
wheel: marks test that only works when installed from wheel

testpaths = tests
1 change: 1 addition & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ cligj==0.5.0
munch==2.3.2
six==1.11.0
enum34==1.1.6 ; python_version < '3.4'
certifi
7 changes: 0 additions & 7 deletions setup.cfg

This file was deleted.

5 changes: 4 additions & 1 deletion tests/test_fio_load.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
import os
import shutil

import pytest

import fiona
from fiona.fio.main import main_group

Expand Down Expand Up @@ -121,7 +123,8 @@ def test_fio_load_layer(tmpdir, runner):
shutil.rmtree(outdir)


def test_creation_optiona(tmpdir, runner, feature_seq):
@pytest.mark.iconv
def test_creation_options(tmpdir, runner, feature_seq):
tmpfile = str(tmpdir.mkdir("tests").join("test.shp"))
result = runner.invoke(
main_group,
Expand Down

0 comments on commit 0517ead

Please sign in to comment.