Merge pull request #139 from graphql-python/feature/introduce-conftest

feat: support python 3.8 and introduce conftest.py
graphql-python · Mar 13, 2020 · 28ec7e5 · 28ec7e5
2 parents 67e8932 + d308ce3
commit 28ec7e5
Show file tree

Hide file tree

Showing 10 changed files with 5 additions and 12 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,6 +6,7 @@ _build/
 build/
 dist/
 graphene_mongo.egg-info/
+htmlcov/
 *.pyc
 *.swo
 *.swp

diff --git a/.travis.yml b/.travis.yml
@@ -4,6 +4,7 @@ python:
     - "3.4"
     - "3.5"
     - "3.6"
+    - "3.8"
 install:
     pip install -r requirements.txt
 script: make test

diff --git a/graphene_mongo/tests/setup.py → graphene_mongo/tests/conftest.py b/graphene_mongo/tests/setup.py → graphene_mongo/tests/conftest.py
diff --git a/graphene_mongo/tests/test_fields.py b/graphene_mongo/tests/test_fields.py
@@ -1,5 +1,4 @@
 from . import nodes
-from .setup import fixtures
 from ..fields import MongoengineConnectionField
 
 

diff --git a/graphene_mongo/tests/test_mutation.py b/graphene_mongo/tests/test_mutation.py
@@ -2,7 +2,6 @@
 
 from graphene.relay import Node
 
-from .setup import fixtures
 from .models import Article, Editor
 from .nodes import ArticleNode, EditorNode
 

diff --git a/graphene_mongo/tests/test_query.py b/graphene_mongo/tests/test_query.py
@@ -5,7 +5,6 @@
 
 from . import models
 from . import types
-from .setup import fixtures, fixtures_dirname
 
 
 def test_should_query_editor(fixtures, fixtures_dirname):

diff --git a/graphene_mongo/tests/test_relay_query.py b/graphene_mongo/tests/test_relay_query.py
@@ -1,15 +1,12 @@
 import os
 import json
-import pytest
 import base64
 import graphene
 
 from graphene.relay import Node
 
 from . import models
 from . import nodes
-from . import types
-from .setup import fixtures, fixtures_dirname
 from ..fields import MongoengineConnectionField
 from ..types import MongoengineObjectType
 

diff --git a/requirements.txt b/requirements.txt
@@ -1,5 +1,5 @@
 coveralls==1.2.0
-flake8==3.5.0
+flake8==3.7.9
 flake8-per-file-ignores==0.6
 future==0.17.1
 graphene>=2.1.3,<3

diff --git a/setup.cfg b/setup.cfg
@@ -4,11 +4,7 @@ description-file = README.md
 [flake8]
 exclude = setup.py,docs/*,examples/*
 max-line-length = 130
-per-file-ignores =
-    graphene_mongo/tests/test_mutation.py: F401, F811
-    graphene_mongo/tests/test_query.py: F401, F811
-    graphene_mongo/tests/test_relay_query.py: F401, F811
-    graphene_mongo/tests/test_fields.py: F401, F811
+
 [coverage:run]
 omit = */tests/*
 

diff --git a/setup.py b/setup.py
@@ -17,6 +17,7 @@
         "Programming Language :: Python :: 3.4",
         "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.6",
+        "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: Implementation :: PyPy",
         "License :: OSI Approved :: MIT License",
     ],
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,6 +6,7 @@ _build/ @@
     build/
     dist/
     graphene_mongo.egg-info/
+    htmlcov/
     *.pyc
     *.swo
     *.swp
@@ Expand Down @@