Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Graphene v3 following v3 graphql-core #1048

Merged
merged 9 commits into from
Aug 17, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@ __pycache__/

# Distribution / packaging
.Python
env/
venv/
.venv/
build/
develop-eggs/
dist/
Expand Down Expand Up @@ -47,7 +44,8 @@ htmlcov/
.pytest_cache
nosetests.xml
coverage.xml
*,cover
*.cover
.pytest_cache/

# Translations
*.mo
Expand All @@ -62,6 +60,14 @@ docs/_build/
# PyBuilder
target/

# VirtualEnv
.env
.venv
env/
venv/

# Typing
.mypy_cache/

/tests/django.sqlite

Expand Down
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ repos:
hooks:
- id: pyupgrade
- repo: https://github.com/ambv/black
rev: 18.9b0
rev: 19.3b0
hooks:
- id: black
language_version: python3
- repo: https://github.com/PyCQA/flake8
rev: 3.7.7
rev: 3.7.8
hooks:
- id: flake8
2 changes: 0 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ language: python
dist: xenial

python:
- "2.7"
- "3.5"
- "3.6"
- "3.7"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,21 +30,22 @@

snapshots[
"test_str_schema 1"
] = """schema {
query: Query
mutation: Mutation
}

] = '''"""A faction in the Star Wars saga"""
type Faction implements Node {
"""The ID of the object"""
id: ID!

"""The name of the faction."""
name: String
ships(before: String, after: String, first: Int, last: Int): ShipConnection

"""The ships used by the faction."""
ships(before: String = null, after: String = null, first: Int = null, last: Int = null): ShipConnection
}

input IntroduceShipInput {
shipName: String!
factionId: String!
clientMutationId: String
clientMutationId: String = null
}

type IntroduceShipPayload {
Expand All @@ -57,35 +58,60 @@
introduceShip(input: IntroduceShipInput!): IntroduceShipPayload
}

"""An object with an ID"""
interface Node {
"""The ID of the object"""
id: ID!
}

"""
The Relay compliant `PageInfo` type, containing data necessary to paginate this connection.
"""
type PageInfo {
"""When paginating forwards, are there more items?"""
hasNextPage: Boolean!

"""When paginating backwards, are there more items?"""
hasPreviousPage: Boolean!

"""When paginating backwards, the cursor to continue."""
startCursor: String

"""When paginating forwards, the cursor to continue."""
endCursor: String
}

type Query {
rebels: Faction
empire: Faction

"""The ID of the object"""
node(id: ID!): Node
}

"""A ship in the Star Wars saga"""
type Ship implements Node {
"""The ID of the object"""
id: ID!

"""The name of the ship."""
name: String
}

type ShipConnection {
"""Pagination data for this connection."""
pageInfo: PageInfo!

"""Contains the nodes in this connection."""
edges: [ShipEdge]!
}

"""A Relay edge containing a `Ship` and its cursor."""
type ShipEdge {
"""The item at the end of the edge"""
node: Ship

"""A cursor for use in pagination"""
cursor: String!
}
"""
'''
3 changes: 2 additions & 1 deletion graphene/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@
from .utils.module_loading import lazy_import


VERSION = (2, 1, 8, "final", 0)
VERSION = (3, 0, 0, "alpha", 0)


__version__ = get_version(VERSION)

Expand Down
21 changes: 0 additions & 21 deletions graphene/pyutils/compat.py

This file was deleted.

Loading