Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixops-aws
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 78efaa19f379
Choose a base ref
...
head repository: NixOS/nixops-aws
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 14f6d61970e0
Choose a head ref
  • 1 commit
  • 3 files changed
  • 1 contributor

Commits on Jul 16, 2020

  1. Guard mypy_boto3_* imports with TYPE_CHECKING

    @adisbladis
    adisbladis committed Jul 16, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    14f6d61 View commit details
Showing with 14 additions and 5 deletions.
  1. +5 −1 nixops_aws/resources/ec2_common.py
  2. +4 −2 nixops_aws/resources/ec2_rds_dbsecurity_group.py
  3. +5 −2 nixops_aws/resources/efs_common.py
6 changes: 5 additions & 1 deletion nixops_aws/resources/ec2_common.py
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
from __future__ import annotations
import socket
import getpass

import boto3
import mypy_boto3_ec2
import nixops.util
import nixops.deployment
import nixops.resources
import nixops_aws.ec2_utils
from nixops.state import StateDict
from typing import Optional
from boto.ec2.connection import EC2Connection
from typing import TYPE_CHECKING

if TYPE_CHECKING:
import mypy_boto3_ec2


class EC2CommonState:
6 changes: 4 additions & 2 deletions nixops_aws/resources/ec2_rds_dbsecurity_group.py
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
import botocore.exceptions
import botocore.errorfactory
import boto3
import mypy_boto3_rds
import nixops.util
import nixops.resources
import nixops_aws.ec2_utils
from nixops_aws.resources.ec2_common import EC2CommonState
from nixops.diff import Handler
from typing import Optional
from typing import Optional, TYPE_CHECKING

from .types.ec2_rds_dbsecurity_group import Ec2RdsDbsecurityGroupOptions

if TYPE_CHECKING:
import mypy_boto3_rds


class EC2RDSDbSecurityGroupDefinition(nixops.resources.ResourceDefinition):

7 changes: 5 additions & 2 deletions nixops_aws/resources/efs_common.py
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
from __future__ import annotations
import boto3
import mypy_boto3_efs
from typing import Optional
from typing import Optional, TYPE_CHECKING
import nixops_aws.ec2_utils

if TYPE_CHECKING:
import mypy_boto3_efs


class EFSCommonState:
access_key_id: Optional[str]