Skip to content

Commit 514eaae

Browse files
committed
Added support for wheel distribution package
1 parent 41309d0 commit 514eaae

File tree

6 files changed

+34
-15
lines changed

6 files changed

+34
-15
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,3 +57,4 @@ deploy:
5757
tags: true
5858
password:
5959
secure: q0ey31cWljGB30l43aEd1KIPuAHRutzmsd2lBb/2zvD79ReBrzvCdFAkH2xcyo4Volk3aazQQTNUIurnTuvBxmtqja0e+gUaO5LdOcokVdOGyLABXh7qhd2kdvbTDWgSwA4EWneLGXn/SjXSe0f3pCcrwc6WDcLAHxtffMvO9gulpYQtUoOqXfMipMOkRD9iDWTJBsSo3trL70X1FHOVr6Yqi0mfkX2Y/imxn6wlTWRz28Ru94xrj27OmUnCv7qcG0taO8LNlUCquNFAr2sZ+l+U/GkQrrM1y+ehPz3pmI0cCCd7SX/7+EG9ViZ07BZ31nk4pgnqjmj3nFwqnCE/4IApGnduqtrMDF63C9TnB1TU8oJmbbUCu4ODwRpBPZMnwzaHsLnrpdrB89/98NtTfujdrh3U5bVB+t33yxrXVh+FjgLYj9PVeDixpFDn6V/Xcnv4BbRMNOhXIQT7a7/5b99RiXBjCk6KRu+Jdu5DZ+3G4Nbr4oim3kZFPUHa555qbzTlwAfkrQxKv3C3OdVJR7eGc9ADsbHyEJbdPNAh/T+xblXTXLS3hPYDvgM+WEGy3CytBDG3JVcXm25ZP96EDWjweJ7MyfylubhuKj/iR1Y1wiHeIsYq9CqRrFQUWL8gFJBfmgjs96xRXXXnvyLtKUKpKw3wFg5cR/6FnLeYZ8k=
60+
distributions: "sdist bdist_wheel"

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
Please read [UPGRADE-v1.0.md](https://github.com/graphql-python/graphene/blob/master/UPGRADE-v1.0.md)
2-
to learn how to upgrade to Graphene `1.0`.
1+
Please read [UPGRADE-v2.0.md](https://github.com/graphql-python/graphene/blob/master/UPGRADE-v2.0.md)
2+
to learn how to upgrade to Graphene `2.0`.
33

44
---
55

@@ -13,7 +13,7 @@ A [SQLAlchemy](http://www.sqlalchemy.org/) integration for [Graphene](http://gra
1313
For instaling graphene, just run this command in your shell
1414

1515
```bash
16-
pip install "graphene-sqlalchemy>=1.0"
16+
pip install "graphene-sqlalchemy>=2.0"
1717
```
1818

1919
## Examples
@@ -47,8 +47,8 @@ class User(SQLAlchemyObjectType):
4747
class Query(graphene.ObjectType):
4848
users = graphene.List(User)
4949

50-
def resolve_users(self, args, context, info):
51-
query = User.get_query(context) # SQLAlchemy query
50+
def resolve_users(self, info):
51+
query = User.get_query(info.context) # SQLAlchemy query
5252
return query.all()
5353

5454
schema = graphene.Schema(query=Query)

README.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Please read
2-
`UPGRADE-v1.0.md <https://github.com/graphql-python/graphene/blob/master/UPGRADE-v1.0.md>`__
3-
to learn how to upgrade to Graphene ``1.0``.
2+
`UPGRADE-v2.0.md <https://github.com/graphql-python/graphene/blob/master/UPGRADE-v2.0.md>`__
3+
to learn how to upgrade to Graphene ``2.0``.
44

55
--------------
66

@@ -17,7 +17,7 @@ For instaling graphene, just run this command in your shell
1717

1818
.. code:: bash
1919
20-
pip install "graphene-sqlalchemy>=1.0"
20+
pip install "graphene-sqlalchemy>=2.0"
2121
2222
Examples
2323
--------
@@ -53,8 +53,8 @@ following:
5353
class Query(graphene.ObjectType):
5454
users = graphene.List(User)
5555
56-
def resolve_users(self, args, context, info):
57-
query = User.get_query(context) # SQLAlchemy query
56+
def resolve_users(self, info):
57+
query = User.get_query(info.context) # SQLAlchemy query
5858
return query.all()
5959
6060
schema = graphene.Schema(query=Query)

graphene_sqlalchemy/__init__.py

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,12 @@
99
get_session
1010
)
1111

12-
__all__ = ['SQLAlchemyObjectType',
13-
'SQLAlchemyConnectionField',
14-
'get_query',
15-
'get_session']
12+
__version__ = '2.0.dev2017072601'
13+
14+
__all__ = [
15+
'__version__',
16+
'SQLAlchemyObjectType',
17+
'SQLAlchemyConnectionField',
18+
'get_query',
19+
'get_session'
20+
]

setup.cfg

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,6 @@ norecursedirs =
2424
filterwarnings =
2525
error
2626
ignore::DeprecationWarning
27+
28+
[bdist_wheel]
29+
universal=1

setup.py

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,18 @@
11
from setuptools import find_packages, setup
2+
import sys
3+
import ast
4+
import re
5+
6+
_version_re = re.compile(r'__version__\s+=\s+(.*)')
7+
8+
with open('graphene_django/__init__.py', 'rb') as f:
9+
version = str(ast.literal_eval(_version_re.search(
10+
f.read().decode('utf-8')).group(1)))
11+
212

313
setup(
414
name='graphene-sqlalchemy',
5-
version='2.0.dev2017072601',
15+
version=version,
616

717
description='Graphene SQLAlchemy integration',
818
long_description=open('README.rst').read(),

0 commit comments

Comments
 (0)