mirror of
				https://github.com/graphql-python/graphene-django.git
				synced 2025-11-04 18:08:01 +03:00 
			
		
		
		
	Upgrade github actions versions, default python and dev dependencies (#1407)
* Use Python 3.10 for deployments on PyPi * Update gh-action-pypi-publish version * Update python version * Update checkout and setup-python versions * Upgrade dev dependencies * fromat examples and few files to follow black new version * Upgrade pytest version --------- Co-authored-by: Firas Kafri <firaskafri@Firass-MacBook-Pro-2.local>
This commit is contained in:
		
							parent
							
								
									c1a22bfd91
								
							
						
					
					
						commit
						af8888f58e
					
				
							
								
								
									
										10
									
								
								.github/workflows/deploy.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										10
									
								
								.github/workflows/deploy.yml
									
									
									
									
										vendored
									
									
								
							| 
						 | 
					@ -10,17 +10,17 @@ jobs:
 | 
				
			||||||
    runs-on: ubuntu-latest
 | 
					    runs-on: ubuntu-latest
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    steps:
 | 
					    steps:
 | 
				
			||||||
    - uses: actions/checkout@v2
 | 
					    - uses: actions/checkout@v3
 | 
				
			||||||
    - name: Set up Python 3.9
 | 
					    - name: Set up Python 3.10
 | 
				
			||||||
      uses: actions/setup-python@v2
 | 
					      uses: actions/setup-python@v4
 | 
				
			||||||
      with:
 | 
					      with:
 | 
				
			||||||
        python-version: 3.9
 | 
					        python-version: '3.10'
 | 
				
			||||||
    - name: Build wheel and source tarball
 | 
					    - name: Build wheel and source tarball
 | 
				
			||||||
      run: |
 | 
					      run: |
 | 
				
			||||||
        pip install wheel
 | 
					        pip install wheel
 | 
				
			||||||
        python setup.py sdist bdist_wheel
 | 
					        python setup.py sdist bdist_wheel
 | 
				
			||||||
    - name: Publish a Python distribution to PyPI
 | 
					    - name: Publish a Python distribution to PyPI
 | 
				
			||||||
      uses: pypa/gh-action-pypi-publish@v1.1.0
 | 
					      uses: pypa/gh-action-pypi-publish@v1.8.6
 | 
				
			||||||
      with:
 | 
					      with:
 | 
				
			||||||
        user: __token__
 | 
					        user: __token__
 | 
				
			||||||
        password: ${{ secrets.pypi_password }}
 | 
					        password: ${{ secrets.pypi_password }}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										8
									
								
								.github/workflows/lint.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										8
									
								
								.github/workflows/lint.yml
									
									
									
									
										vendored
									
									
								
							| 
						 | 
					@ -7,11 +7,11 @@ jobs:
 | 
				
			||||||
    runs-on: ubuntu-latest
 | 
					    runs-on: ubuntu-latest
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    steps:
 | 
					    steps:
 | 
				
			||||||
    - uses: actions/checkout@v2
 | 
					    - uses: actions/checkout@v3
 | 
				
			||||||
    - name: Set up Python 3.9
 | 
					    - name: Set up Python 3.10
 | 
				
			||||||
      uses: actions/setup-python@v2
 | 
					      uses: actions/setup-python@v4
 | 
				
			||||||
      with:
 | 
					      with:
 | 
				
			||||||
        python-version: 3.9
 | 
					        python-version: '3.10'
 | 
				
			||||||
    - name: Install dependencies
 | 
					    - name: Install dependencies
 | 
				
			||||||
      run: |
 | 
					      run: |
 | 
				
			||||||
        python -m pip install --upgrade pip
 | 
					        python -m pip install --upgrade pip
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										4
									
								
								.github/workflows/tests.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								.github/workflows/tests.yml
									
									
									
									
										vendored
									
									
								
							| 
						 | 
					@ -14,9 +14,9 @@ jobs:
 | 
				
			||||||
          - django: "3.2"
 | 
					          - django: "3.2"
 | 
				
			||||||
            python-version: "3.7"
 | 
					            python-version: "3.7"
 | 
				
			||||||
    steps:
 | 
					    steps:
 | 
				
			||||||
    - uses: actions/checkout@v2
 | 
					    - uses: actions/checkout@v3
 | 
				
			||||||
    - name: Set up Python ${{ matrix.python-version }}
 | 
					    - name: Set up Python ${{ matrix.python-version }}
 | 
				
			||||||
      uses: actions/setup-python@v2
 | 
					      uses: actions/setup-python@v4
 | 
				
			||||||
      with:
 | 
					      with:
 | 
				
			||||||
        python-version: ${{ matrix.python-version }}
 | 
					        python-version: ${{ matrix.python-version }}
 | 
				
			||||||
    - name: Install dependencies
 | 
					    - name: Install dependencies
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,8 +1,8 @@
 | 
				
			||||||
default_language_version:
 | 
					default_language_version:
 | 
				
			||||||
  python: python3.9
 | 
					  python: python3.10
 | 
				
			||||||
repos:
 | 
					repos:
 | 
				
			||||||
-   repo: https://github.com/pre-commit/pre-commit-hooks
 | 
					-   repo: https://github.com/pre-commit/pre-commit-hooks
 | 
				
			||||||
    rev: v4.3.0
 | 
					    rev: v4.4.0
 | 
				
			||||||
    hooks:
 | 
					    hooks:
 | 
				
			||||||
    -   id: check-merge-conflict
 | 
					    -   id: check-merge-conflict
 | 
				
			||||||
    -   id: check-json
 | 
					    -   id: check-json
 | 
				
			||||||
| 
						 | 
					@ -16,15 +16,15 @@ repos:
 | 
				
			||||||
    -   id: trailing-whitespace
 | 
					    -   id: trailing-whitespace
 | 
				
			||||||
        exclude: README.md
 | 
					        exclude: README.md
 | 
				
			||||||
-   repo: https://github.com/asottile/pyupgrade
 | 
					-   repo: https://github.com/asottile/pyupgrade
 | 
				
			||||||
    rev: v3.2.0
 | 
					    rev: v3.3.2
 | 
				
			||||||
    hooks:
 | 
					    hooks:
 | 
				
			||||||
    -   id: pyupgrade
 | 
					    -   id: pyupgrade
 | 
				
			||||||
        args: [--py37-plus]
 | 
					        args: [--py37-plus]
 | 
				
			||||||
-   repo: https://github.com/psf/black
 | 
					-   repo: https://github.com/psf/black
 | 
				
			||||||
    rev: 22.10.0
 | 
					    rev: 23.3.0
 | 
				
			||||||
    hooks:
 | 
					    hooks:
 | 
				
			||||||
    -   id: black
 | 
					    -   id: black
 | 
				
			||||||
-   repo: https://github.com/PyCQA/flake8
 | 
					-   repo: https://github.com/PyCQA/flake8
 | 
				
			||||||
    rev: 5.0.4
 | 
					    rev: 6.0.0
 | 
				
			||||||
    hooks:
 | 
					    hooks:
 | 
				
			||||||
    -   id: flake8
 | 
					    -   id: flake8
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -5,7 +5,6 @@ from django.db import migrations, models
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class Migration(migrations.Migration):
 | 
					class Migration(migrations.Migration):
 | 
				
			||||||
 | 
					 | 
				
			||||||
    initial = True
 | 
					    initial = True
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    dependencies = []
 | 
					    dependencies = []
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -4,7 +4,6 @@ from django.db import migrations, models
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class Migration(migrations.Migration):
 | 
					class Migration(migrations.Migration):
 | 
				
			||||||
 | 
					 | 
				
			||||||
    dependencies = [
 | 
					    dependencies = [
 | 
				
			||||||
        ("ingredients", "0001_initial"),
 | 
					        ("ingredients", "0001_initial"),
 | 
				
			||||||
    ]
 | 
					    ]
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -4,7 +4,6 @@ from django.db import migrations
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class Migration(migrations.Migration):
 | 
					class Migration(migrations.Migration):
 | 
				
			||||||
 | 
					 | 
				
			||||||
    dependencies = [
 | 
					    dependencies = [
 | 
				
			||||||
        ("ingredients", "0002_auto_20161104_0050"),
 | 
					        ("ingredients", "0002_auto_20161104_0050"),
 | 
				
			||||||
    ]
 | 
					    ]
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -5,7 +5,6 @@ from django.db import migrations, models
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class Migration(migrations.Migration):
 | 
					class Migration(migrations.Migration):
 | 
				
			||||||
 | 
					 | 
				
			||||||
    initial = True
 | 
					    initial = True
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    dependencies = [
 | 
					    dependencies = [
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -4,7 +4,6 @@ from django.db import migrations, models
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class Migration(migrations.Migration):
 | 
					class Migration(migrations.Migration):
 | 
				
			||||||
 | 
					 | 
				
			||||||
    dependencies = [
 | 
					    dependencies = [
 | 
				
			||||||
        ("recipes", "0001_initial"),
 | 
					        ("recipes", "0001_initial"),
 | 
				
			||||||
    ]
 | 
					    ]
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -4,7 +4,6 @@ from django.db import migrations, models
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class Migration(migrations.Migration):
 | 
					class Migration(migrations.Migration):
 | 
				
			||||||
 | 
					 | 
				
			||||||
    dependencies = [
 | 
					    dependencies = [
 | 
				
			||||||
        ("recipes", "0002_auto_20161104_0106"),
 | 
					        ("recipes", "0002_auto_20161104_0106"),
 | 
				
			||||||
    ]
 | 
					    ]
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -5,7 +5,6 @@ from django.db import migrations, models
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class Migration(migrations.Migration):
 | 
					class Migration(migrations.Migration):
 | 
				
			||||||
 | 
					 | 
				
			||||||
    initial = True
 | 
					    initial = True
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    dependencies = []
 | 
					    dependencies = []
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -4,7 +4,6 @@ from django.db import migrations, models
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class Migration(migrations.Migration):
 | 
					class Migration(migrations.Migration):
 | 
				
			||||||
 | 
					 | 
				
			||||||
    dependencies = [
 | 
					    dependencies = [
 | 
				
			||||||
        ("ingredients", "0001_initial"),
 | 
					        ("ingredients", "0001_initial"),
 | 
				
			||||||
    ]
 | 
					    ]
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -5,7 +5,6 @@ from django.db import migrations, models
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class Migration(migrations.Migration):
 | 
					class Migration(migrations.Migration):
 | 
				
			||||||
 | 
					 | 
				
			||||||
    initial = True
 | 
					    initial = True
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    dependencies = [
 | 
					    dependencies = [
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -4,7 +4,6 @@ from django.db import migrations, models
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class Migration(migrations.Migration):
 | 
					class Migration(migrations.Migration):
 | 
				
			||||||
 | 
					 | 
				
			||||||
    dependencies = [
 | 
					    dependencies = [
 | 
				
			||||||
        ("recipes", "0001_initial"),
 | 
					        ("recipes", "0001_initial"),
 | 
				
			||||||
    ]
 | 
					    ]
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -87,7 +87,6 @@ def Query(EventType):
 | 
				
			||||||
        events = DjangoFilterConnectionField(EventType)
 | 
					        events = DjangoFilterConnectionField(EventType)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        def resolve_events(self, info, **kwargs):
 | 
					        def resolve_events(self, info, **kwargs):
 | 
				
			||||||
 | 
					 | 
				
			||||||
            events = [
 | 
					            events = [
 | 
				
			||||||
                Event(name="Live Show", tags=["concert", "music", "rock"]),
 | 
					                Event(name="Live Show", tags=["concert", "music", "rock"]),
 | 
				
			||||||
                Event(name="Musical", tags=["movie", "music"]),
 | 
					                Event(name="Musical", tags=["movie", "music"]),
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -82,7 +82,6 @@ class DjangoFormMutation(BaseDjangoFormMutation):
 | 
				
			||||||
    def __init_subclass_with_meta__(
 | 
					    def __init_subclass_with_meta__(
 | 
				
			||||||
        cls, form_class=None, only_fields=(), exclude_fields=(), **options
 | 
					        cls, form_class=None, only_fields=(), exclude_fields=(), **options
 | 
				
			||||||
    ):
 | 
					    ):
 | 
				
			||||||
 | 
					 | 
				
			||||||
        if not form_class:
 | 
					        if not form_class:
 | 
				
			||||||
            raise Exception("form_class is required for DjangoFormMutation")
 | 
					            raise Exception("form_class is required for DjangoFormMutation")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -129,7 +128,6 @@ class DjangoModelFormMutation(BaseDjangoFormMutation):
 | 
				
			||||||
        exclude_fields=(),
 | 
					        exclude_fields=(),
 | 
				
			||||||
        **options,
 | 
					        **options,
 | 
				
			||||||
    ):
 | 
					    ):
 | 
				
			||||||
 | 
					 | 
				
			||||||
        if not form_class:
 | 
					        if not form_class:
 | 
				
			||||||
            raise Exception("form_class is required for DjangoModelFormMutation")
 | 
					            raise Exception("form_class is required for DjangoModelFormMutation")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -72,7 +72,6 @@ class SerializerMutation(ClientIDMutation):
 | 
				
			||||||
        _meta=None,
 | 
					        _meta=None,
 | 
				
			||||||
        **options
 | 
					        **options
 | 
				
			||||||
    ):
 | 
					    ):
 | 
				
			||||||
 | 
					 | 
				
			||||||
        if not serializer_class:
 | 
					        if not serializer_class:
 | 
				
			||||||
            raise Exception("serializer_class is required for the SerializerMutation")
 | 
					            raise Exception("serializer_class is required for the SerializerMutation")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -5,7 +5,6 @@ from .mutations import PetFormMutation, PetMutation
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class QueryRoot(ObjectType):
 | 
					class QueryRoot(ObjectType):
 | 
				
			||||||
 | 
					 | 
				
			||||||
    thrower = graphene.String(required=True)
 | 
					    thrower = graphene.String(required=True)
 | 
				
			||||||
    request = graphene.String(required=True)
 | 
					    request = graphene.String(required=True)
 | 
				
			||||||
    test = graphene.String(who=graphene.String())
 | 
					    test = graphene.String(who=graphene.String())
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -780,7 +780,6 @@ def test_should_query_promise_connectionfields():
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
def test_should_query_connectionfields_with_last():
 | 
					def test_should_query_connectionfields_with_last():
 | 
				
			||||||
 | 
					 | 
				
			||||||
    r = Reporter.objects.create(
 | 
					    r = Reporter.objects.create(
 | 
				
			||||||
        first_name="John", last_name="Doe", email="johndoe@example.com", a_choice=1
 | 
					        first_name="John", last_name="Doe", email="johndoe@example.com", a_choice=1
 | 
				
			||||||
    )
 | 
					    )
 | 
				
			||||||
| 
						 | 
					@ -818,7 +817,6 @@ def test_should_query_connectionfields_with_last():
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
def test_should_query_connectionfields_with_manager():
 | 
					def test_should_query_connectionfields_with_manager():
 | 
				
			||||||
 | 
					 | 
				
			||||||
    r = Reporter.objects.create(
 | 
					    r = Reporter.objects.create(
 | 
				
			||||||
        first_name="John", last_name="Doe", email="johndoe@example.com", a_choice=1
 | 
					        first_name="John", last_name="Doe", email="johndoe@example.com", a_choice=1
 | 
				
			||||||
    )
 | 
					    )
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										10
									
								
								setup.py
									
									
									
									
									
								
							
							
						
						
									
										10
									
								
								setup.py
									
									
									
									
									
								
							| 
						 | 
					@ -14,7 +14,7 @@ rest_framework_require = ["djangorestframework>=3.6.3"]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
tests_require = [
 | 
					tests_require = [
 | 
				
			||||||
    "pytest>=7.1.3",
 | 
					    "pytest>=7.3.1",
 | 
				
			||||||
    "pytest-cov",
 | 
					    "pytest-cov",
 | 
				
			||||||
    "pytest-random-order",
 | 
					    "pytest-random-order",
 | 
				
			||||||
    "coveralls",
 | 
					    "coveralls",
 | 
				
			||||||
| 
						 | 
					@ -26,10 +26,10 @@ tests_require = [
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
dev_requires = [
 | 
					dev_requires = [
 | 
				
			||||||
    "black==22.8.0",
 | 
					    "black==23.3.0",
 | 
				
			||||||
    "flake8==5.0.4",
 | 
					    "flake8==6.0.0",
 | 
				
			||||||
    "flake8-black==0.3.3",
 | 
					    "flake8-black==0.3.6",
 | 
				
			||||||
    "flake8-bugbear==22.9.11",
 | 
					    "flake8-bugbear==23.3.23",
 | 
				
			||||||
    "pre-commit",
 | 
					    "pre-commit",
 | 
				
			||||||
] + tests_require
 | 
					] + tests_require
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue
	
	Block a user