Merge pull request #4 from loft-orbital/users/thomas/update-for-v3

feat!: make graphene-federation compatible with graphene v3

Author: tcleonard

.github/workflows/lint.yml

@@ -7,14 +7,16 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v1
-    - name: Set up Python 3.8
-      uses: actions/setup-python@v1
+    - uses: actions/checkout@v3
+    - name: Set up Python 3.10
+      uses: actions/setup-python@v4
       with:
-        python-version: 3.8
+        python-version: 3.10.5
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
         pip install -e ".[dev]"
     - name: Run lint 💅
-      run: black graphene_federation --check
+      run: |
+        black graphene_federation --check
+        mypy graphene_federation

.github/workflows/tests.yml

@@ -8,7 +8,7 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        python-version: ["3.6", "3.7", "3.8"]
+        python-version: ["3.9", "3.10"]
 
     steps:
     - uses: actions/checkout@v1

.gitignore

@@ -1,3 +1,5 @@
+.DS_Store
+
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]
@@ -104,4 +106,4 @@ venv.bak/
 .mypy_cache/
 
 .idea
-node_modules
+node_modules

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.8-slim
+FROM python:3.10-alpine
 
 # Disable Python buffering in order to see the logs immediatly
 ENV PYTHONUNBUFFERED=1

Makefile

@@ -2,22 +2,45 @@
 # Integration testing
 # -------------------------
 
-.PHONY: integration-build ## Build environment for integration tests
-integration-build:
+integration-build: ## Build environment for integration tests
 	cd integration_tests && docker-compose build
+.PHONY: integration-build
 
-.PHONY: integration-test ## Run integration tests
-integration-test:
+integration-tests: ## Run integration tests
 	cd integration_tests && docker-compose down && docker-compose run --rm tests
+.PHONY: integration-test
 
 # -------------------------
 # Development and unit testing
 # -------------------------
 
-.PHONY: dev-setup ## Install development dependencies
-dev-setup:
+dev-setup: ## Install development dependencies
 	docker-compose up -d && docker-compose exec graphene_federation bash
+.PHONY: dev-setup
 
-.PHONY: tests ## Run unit tests
-tests:
+tests: ## Run unit tests
 	docker-compose run graphene_federation py.test graphene_federation --cov=graphene_federation -vv
+.PHONY: tests
+
+check-style: ## Run linting
+	docker-compose run graphene_federation black graphene_federation --check
+.PHONY: check-style
+
+check-types: ## Run typing check
+	docker-compose run graphene_federation mypy graphene_federation
+.PHONY: check-types
+
+# -------------------------
+# Help
+# -------------------------
+
+help: ## Show help
+	@grep -E '^[0-9a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
+.PHONY: help
+
+.DEFAULT_GOAL := help
+
+.EXPORT_ALL_VARIABLES:
+DOCKER_BUILDKIT = 1
+COMPOSE_DOCKER_CLI_BUILD = 1
+

Pipfile

@@ -16,6 +16,8 @@ Federation support for ![Graphene Logo](http://graphene-python.org/favicon.png)
 
 Based on discussion: https://github.com/graphql-python/graphene/issues/953#issuecomment-508481652
 
+WARNING: This version is not compatible with graphene version below v3. If you need to use a version compatible with graphene v2 I recommend using the version 1.0.0 of graphene_federation.
+
 ------------------------
 
 ## Supported Features
@@ -180,4 +182,5 @@ The tests are automatically run on Travis CI on push to GitHub.
 
 ---------------------------
 
-Also, you can read about how we've come to federation at Preply [here](https://medium.com/preply-engineering/apollo-federation-support-in-graphene-761a0512456d)
+This repository is heavily inspired by the repo it was forked from... Huge thanks to [Preply for setting up the foundations](https://medium.com/preply-engineering/apollo-federation-support-in-graphene-761a0512456d).
+Hopefully one day we can merge it into the original repository that doesn't seem maintained anymore.

Pipfile.lock

@@ -3,6 +3,7 @@ version: '3.5'
 services:
 
   graphene_federation:
+    container_name: graphene_federation
     build:
       context: .
     volumes: