Skip to content

Commit

Permalink
Merge pull request #1 from gulfofmaine/v3-upgrade-gh-actions
Browse files Browse the repository at this point in the history
V3 upgrade gh actions
  • Loading branch information
abkfenris authored Mar 15, 2024
2 parents 70efa32 + d5a5c3e commit e9d1bee
Show file tree
Hide file tree
Showing 14 changed files with 1,431 additions and 134 deletions.
3 changes: 3 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# GitHub syntax highlighting
pixi.lock linguist-language=YAML

31 changes: 31 additions & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: Test

on:
pull_request:
push:
branches: [main]

jobs:
run:
# runs-on: ${{ matrix.os }}
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ["3.10", "3.11", "3.12"]
# os: [windows-latest, ubuntu-latest, macos-latest]

steps:
- uses: actions/checkout@v3

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}

- name: Install dependencies
run: |
python -m pip install --upgrade pip
python -m pip install tox tox-gh-actions
- name: Test with tox
run: tox
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -106,3 +106,6 @@ ENV/

#pytest
.pytest_cache
# pixi environments
.pixi

23 changes: 0 additions & 23 deletions .travis.yml

This file was deleted.

4 changes: 0 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,6 @@ urlpatterns = [

### Flask Integration:

Note that `flask-graphql` version `<2.0` is not supported. At the time of
writing this README, you must install `flask-graphql` with
`pip install --pre flask-graphql`

Simply import the modified view and create a new url rule on your app:

```python
Expand Down
2 changes: 1 addition & 1 deletion examples/flask/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,6 @@ class Mutation(graphene.ObjectType):
view_func=FileUploadGraphQLView.as_view(
'graphql',
graphiql=True,
schema=schema,
schema=schema.graphql_schema,
)
)
2 changes: 1 addition & 1 deletion graphene_file_upload/flask/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"""Apply multipart request spec to flask"""
from flask import request
from flask_graphql import GraphQLView
from graphql_server import load_json_body
from graphql_server.flask import GraphQLView

from ..utils import place_files_in_operations

Expand Down
Loading

0 comments on commit e9d1bee

Please sign in to comment.