From 5b7b0fcb8ef61f58344ca4dbc3e9ceb2dd2f207e Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Tue, 9 Oct 2018 07:33:38 -0400 Subject: [PATCH] cleanups --- app.py | 17 ++---- g.py | 13 ----- responder/api.py | 2 +- setup.py | 137 ----------------------------------------------- 4 files changed, 4 insertions(+), 165 deletions(-) delete mode 100644 g.py delete mode 100644 setup.py diff --git a/app.py b/app.py index fd8cae0..ed7e3e6 100644 --- a/app.py +++ b/app.py @@ -15,7 +15,7 @@ def hello(req, resp): class ThingsResource: def on_request(self, req, resp): resp.status = responder.status.HTTP_200 - resp.media = ["ylolo"] + resp.media = ["yolo"] class Query(graphene.ObjectType): @@ -27,27 +27,16 @@ class Query(graphene.ObjectType): schema = graphene.Schema(query=Query) - -class GraphQLResource(responder.GraphQLSchema): - import graphene - - def on_request(self, req, resp): - resp.status = responder.status.HTTP_200 - print(schema.execute("{ hello }").data) - - resp.media = ["yolo"] - - # Alerntatively, -api.add_route("/2", GraphQLResource) api.add_route("/graph", schema) print( api.session() .get( - "http://app/graph?query={ hello }", + "http://app/graph?q={ hello }", headers={"Accept": "application/x-yaml"}, # data="hello", ) .text ) +# {hello: Hello stranger} diff --git a/g.py b/g.py deleted file mode 100644 index fce592c..0000000 --- a/g.py +++ /dev/null @@ -1,13 +0,0 @@ -import graphene - - -class Query(graphene.ObjectType): - hello = graphene.String(name=graphene.String(default_value="stranger")) - - def resolve_hello(self, info, name): - return "Hello " + name - - -schema = graphene.Schema(query=Query) -result = schema.execute("{ hello }") -print(result.data["hello"]) diff --git a/responder/api.py b/responder/api.py index 90b087d..411b992 100644 --- a/responder/api.py +++ b/responder/api.py @@ -140,7 +140,7 @@ class API(BaseAPI): if "query" in req.params: return req.params["query"][0] if "q" in req.params: - return req.parama["q"][0] + return req.params["q"][0] # Otherwise, the request text is used (typical). # TODO: Make some assertions about content-type here. diff --git a/setup.py b/setup.py deleted file mode 100644 index c49bd7e..0000000 --- a/setup.py +++ /dev/null @@ -1,137 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- -import codecs -import os -import sys -from shutil import rmtree - -from setuptools import find_packages, setup, Command - -here = os.path.abspath(os.path.dirname(__file__)) - -with codecs.open(os.path.join(here, "README.md"), encoding="utf-8") as f: - long_description = "\n" + f.read() - -about = {} - -with open(os.path.join(here, "responder", "__version__.py")) as f: - exec(f.read(), about) - -if sys.argv[-1] == "publish": - os.system("python setup.py sdist bdist_wheel upload") - sys.exit() - -required = [] - - -# https://pypi.python.org/pypi/stdeb/0.8.5#quickstart-2-just-tell-me-the-fastest-way-to-make-a-deb -class DebCommand(Command): - """Support for setup.py deb""" - - description = "Build and publish the .deb package." - user_options = [] - - @staticmethod - def status(s): - """Prints things in bold.""" - print("\033[1m{0}\033[0m".format(s)) - - def initialize_options(self): - pass - - def finalize_options(self): - pass - - def run(self): - try: - self.status("Removing previous builds…") - rmtree(os.path.join(here, "deb_dist")) - except FileNotFoundError: - pass - self.status(u"Creating debian mainfest…") - os.system( - "python setup.py --command-packages=stdeb.command sdist_dsc -z artful --package3=pipenv --depends3=python3-virtualenv-clone" - ) - self.status(u"Building .deb…") - os.chdir("deb_dist/pipenv-{0}".format(about["__version__"])) - os.system("dpkg-buildpackage -rfakeroot -uc -us") - - -class UploadCommand(Command): - """Support setup.py publish.""" - - description = "Build and publish the package." - user_options = [] - - @staticmethod - def status(s): - """Prints things in bold.""" - print("\033[1m{0}\033[0m".format(s)) - - def initialize_options(self): - pass - - def finalize_options(self): - pass - - def run(self): - try: - self.status("Removing previous builds…") - rmtree(os.path.join(here, "dist")) - except FileNotFoundError: - pass - self.status("Building Source distribution…") - os.system("{0} setup.py sdist bdist_wheel".format(sys.executable)) - self.status("Uploading the package to PyPI via Twine…") - os.system("twine upload dist/*") - self.status("Pushing git tags…") - os.system("git tag v{0}".format(about["__version__"])) - os.system("git push --tags") - sys.exit() - - -setup( - name="responder", - version=about["__version__"], - description="A sorta familiar HTTP framework.", - long_description=long_description, - long_description_content_type="text/markdown", - author="Kenneth Reitz", - author_email="me@kennethreitz.org", - url="https://github.com/kennethreitz/responder", - packages=find_packages(exclude=["tests", "tests.*", "tasks", "tasks.*"]), - # entry_points={ - # "console_scripts": ["pipenv=pipenv:cli", "pipenv-resolver=pipenv.resolver:main"] - # }, - package_data={ - # "": ["LICENSE", "NOTICES"], - # "pipenv.vendor.requests": ["*.pem"], - # "pipenv.vendor.certifi": ["*.pem"], - # "pipenv.vendor.click_completion": ["*.j2"], - # "pipenv.patched.notpip._vendor.certifi": ["*.pem"], - # "pipenv.patched.notpip._vendor.requests": ["*.pem"], - # "pipenv.patched.notpip._vendor.distlib._backport": ["sysconfig.cfg"], - # "pipenv.patched.notpip._vendor.distlib": [ - # "t32.exe", - # "t64.exe", - # "w32.exe", - # "w64.exe", - # ], - }, - python_requires=">=3.6", - setup_requires=[], - install_requires=required, - extras_require={}, - include_package_data=True, - license="Apache 2.0", - classifiers=[ - "License :: OSI Approved :: MIT License", - "Programming Language :: Python", - "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.6", - "Programming Language :: Python :: 3.7", - "Programming Language :: Python :: Implementation :: CPython", - "Programming Language :: Python :: Implementation :: PyPy", - ], - cmdclass={"upload": UploadCommand, "deb": DebCommand}, -)