Skip to content

Workaround mypy bug by moving Sweepable into its own file #388

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 8, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion cirq/study/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,11 @@
ParamResolver,
)
from cirq.study.study import (
Sweepable,
TrialResult,
)
from cirq.study.sweepable import (
Sweepable,
)
from cirq.study.sweeps import (
Points,
Sweep,
Expand Down
12 changes: 1 addition & 11 deletions cirq/study/study.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

"""Defines a study.
"""

from typing import Iterable, Union

from cirq.study.resolver import ParamResolver
from cirq.study.sweeps import Sweep
"""Defines a study."""


class TrialResultMeta(type):
Expand Down Expand Up @@ -49,7 +43,3 @@ class TrialResult(metaclass=TrialResultMeta):
the first index running over the repetitions, and the second index
running over the qubits for the corresponding measurements.
"""


Sweepable = Union[
ParamResolver, Iterable[ParamResolver], Sweep, Iterable[Sweep]]
24 changes: 24 additions & 0 deletions cirq/study/sweepable.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# Copyright 2018 The Cirq Developers
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

"""Defines which types are Sweepable."""

from typing import Iterable, Union

from cirq.study.resolver import ParamResolver
from cirq.study.sweeps import Sweep


Sweepable = Union[
ParamResolver, Iterable[ParamResolver], Sweep, Iterable[Sweep]]