From 5d3cb70c442e4bdb6ee0636f52774da125422484 Mon Sep 17 00:00:00 2001
From: QC Ware Ci Bot <cicd@qcware.com>
Date: Tue, 15 Mar 2022 20:49:11 +0000
Subject: [PATCH] automated push from d6f3095527106c0b51a6ee0e44ff915ccf29363c

---
 pyproject.toml                                | 11 +++++--
 qcware/forge/__init__.py                      |  2 +-
 qcware/forge/config/config.py                 | 30 +++++++++----------
 qcware/forge/qml/types/__init__.py            | 10 +++----
 .../transforms/transform_params.py            |  8 ++---
 .../transforms/transform_results.py           |  6 ++--
 .../optimization/results/results_types.py     |  5 ++--
 qcware/types/qml/fit_data.py                  |  4 +--
 tox.ini                                       | 12 ++++++++
 9 files changed, 53 insertions(+), 35 deletions(-)
 create mode 100644 tox.ini

diff --git a/pyproject.toml b/pyproject.toml
index 6ed6330..3df8465 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "qcware"
-version = "7.4.0"
+version = "7.4.1"
 description = "The python client for QC Ware's Forge SaaS quantum computing product"
 authors = ["Vic Putz <vic.putz@qcware.com>","Bryan Burr <bryan.e.burr@qcware.com"]
 packages = [
@@ -22,14 +22,14 @@ classifiers = [
 
 
 [tool.poetry.dependencies]
-python = "^3.9"
+python = ">=3.7,<3.11"
 aiohttp = ">= 3.7.4.post0"
 backoff = ">= 1.10.0"
 colorama = ">= 0.4.4"
 icontract = ">= 2.5.3"
 lz4 = ">= 3.1.3"
 networkx = ">= 2.5.1"
-numpy = ">= 1.21.0"
+numpy = "^1.21.5"
 packaging = ">= 20.9"
 pydantic = ">= 1.8.2"
 python-decouple = ">= 3.4"
@@ -38,3 +38,8 @@ qubovert = ">= 1.2.3"
 requests = ">= 2.25.1"
 tabulate = ">= 0.8.9"
 setuptools = ">= 57.1.0"
+toolz = ">=0.11.2"
+
+[tool.poetry.dev-dependencies]
+tox = "^3.24.5"
+pytest = "^7.1.0"
diff --git a/qcware/forge/__init__.py b/qcware/forge/__init__.py
index 987530a..594b22b 100644
--- a/qcware/forge/__init__.py
+++ b/qcware/forge/__init__.py
@@ -13,7 +13,7 @@
 try:
     __version__ = pkg_resources.get_distribution("qcware").version
 except Exception:
-    __version__ = "7.4.0"
+    __version__ = "7.4.1"
 
 import logging
 
diff --git a/qcware/forge/config/config.py b/qcware/forge/config/config.py
index 94e5919..6050f81 100644
--- a/qcware/forge/config/config.py
+++ b/qcware/forge/config/config.py
@@ -4,7 +4,7 @@
 from contextlib import contextmanager
 from enum import Enum
 from functools import reduce
-from typing import Annotated, Optional
+from typing import Optional
 from urllib.parse import urljoin, urlparse
 
 import colorama  # type: ignore
@@ -415,10 +415,10 @@ def set_ibmq_credentials_from_ibmq_provider(
 
 class IBMQCredentials(BaseModel):
 
-    token: Optional[Annotated[str, Field(max_length=255)]]
-    hub: Optional[Annotated[str, Field(max_length=255)]]
-    group: Optional[Annotated[str, Field(max_length=255)]]
-    project: Optional[Annotated[str, Field(max_length=255)]]
+    token: Optional[str]
+    hub: Optional[str]
+    group: Optional[str]
+    project: Optional[str]
 
     @classmethod
     def from_ibmq(cls, ibmq):
@@ -441,7 +441,7 @@ class Config:
 
 
 class ApiCredentials(BaseModel):
-    qcware_api_key: Optional[Annotated[str, Field(max_length=255)]] = None
+    qcware_api_key: Optional[str] = None
     ibmq: Optional[IBMQCredentials] = None
 
     class Config:
@@ -468,11 +468,11 @@ class Environment(BaseModel):
     This is set via the environment variable QCWARE_ENVIRONMENT_SOURCE_FILE.
     """
 
-    client: Annotated[str, Field(max_length=255)]
-    client_version: Annotated[str, Field(max_length=255)]
-    python_version: Annotated[str, Field(max_length=255)]
-    environment: Annotated[str, Field(max_length=255)]
-    source_file: Annotated[str, Field(max_length=255)]
+    client: str
+    client_version: str
+    python_version: str
+    environment: str
+    source_file: str
 
 
 def set_environment_environment(new_environment: str):
@@ -494,12 +494,12 @@ class ApiCallContext(BaseModel):
     override only one field (or a subset).
     """
 
-    qcware_host: Optional[Annotated[str, Field(max_length=255)]] = None
+    qcware_host: Optional[str] = None
     credentials: Optional[ApiCredentials] = None
     environment: Optional[Environment] = None
-    server_timeout: Optional[Annotated[int, Field(ge=0)]] = None
-    client_timeout: Optional[Annotated[int, Field(ge=0)]] = None
-    async_interval_between_tries: Optional[Annotated[float, Field(ge=0)]] = None
+    server_timeout: Optional[int] = None
+    client_timeout: Optional[int] = None
+    async_interval_between_tries: Optional[float] = None
     scheduling_mode: Optional[SchedulingMode] = None
 
     class Config:
diff --git a/qcware/forge/qml/types/__init__.py b/qcware/forge/qml/types/__init__.py
index f6d1fdf..3f9e618 100644
--- a/qcware/forge/qml/types/__init__.py
+++ b/qcware/forge/qml/types/__init__.py
@@ -1,5 +1,5 @@
 from abc import ABC, abstractmethod
-from typing import Optional
+from typing import Optional, Tuple
 
 from qcware.forge.qml import fit, predict
 
@@ -20,7 +20,7 @@ def __init__(
         backend: str = "qcware/cpu_simulator",
         num_measurements: int = 100,
         absolute: bool = False,
-        opt_shape: Optional[tuple[int, int]] = None,
+        opt_shape: Optional[Tuple[int, int]] = None,
     ):
         self.parameters = dict(
             loader_mode=loader_mode,
@@ -40,7 +40,7 @@ def __init__(
         backend: str = "qcware/cpu_simulator",
         num_measurements: int = 100,
         absolute: bool = False,
-        opt_shape: Optional[tuple[int, int]] = None,
+        opt_shape: Optional[Tuple[int, int]] = None,
     ):
         self.parameters = dict(
             n_neighbors=n_neighbors,
@@ -60,7 +60,7 @@ def __init__(
         backend: str = "qcware/cpu_simulator",
         num_measurements: int = 100,
         absolute: bool = False,
-        opt_shape: Optional[tuple[int, int]] = None,
+        opt_shape: Optional[Tuple[int, int]] = None,
     ):
         self.parameters = dict(
             n_neighbors=n_neighbors,
@@ -85,7 +85,7 @@ def __init__(
         backend: str = "qcware/cpu_simulator",
         num_measurements: int = 100,
         absolute: bool = False,
-        opt_shape: Optional[tuple[int, int]] = None,
+        opt_shape: Optional[Tuple[int, int]] = None,
     ):
         self.parameters = dict(
             n_clusters=n_clusters,
diff --git a/qcware/serialization/transforms/transform_params.py b/qcware/serialization/transforms/transform_params.py
index 7cc0699..b6b318b 100644
--- a/qcware/serialization/transforms/transform_params.py
+++ b/qcware/serialization/transforms/transform_params.py
@@ -7,7 +7,7 @@
 themselves for particular types (those go in the helpers file).
 """
 from functools import wraps
-from typing import Any, Callable, Mapping, Optional
+from typing import Any, Callable, Mapping, Optional, Dict
 
 from qcware.serialization.serialize_quasar import (
     list_to_pauli,
@@ -40,7 +40,7 @@
 from toolz.dicttoolz import update_in
 
 
-def update_with_replacers(d: dict[str, Any], replacers: Mapping[str, Callable]):
+def update_with_replacers(d: Dict[str, Any], replacers: Mapping[str, Callable]):
     """for all (k,f) in replacers, updates the dict entry marked by k by calling the
     function f on the value"""
     result = d.copy()
@@ -50,7 +50,7 @@ def update_with_replacers(d: dict[str, Any], replacers: Mapping[str, Callable]):
     return result
 
 
-_to_wire_arg_replacers: dict[str, dict[str, Callable]] = {}
+_to_wire_arg_replacers: Dict[str, Dict[str, Callable]] = {}
 
 
 def client_args_to_wire(method_name: str, **kwargs):
@@ -66,7 +66,7 @@ def client_args_to_wire(method_name: str, **kwargs):
         )
 
 
-_from_wire_arg_replacers: dict[str, dict[str, Callable]] = {}
+_from_wire_arg_replacers: Dict[str, Dict[str, Callable]] = {}
 
 
 def replace_server_args_from_wire(method_name: str):
diff --git a/qcware/serialization/transforms/transform_results.py b/qcware/serialization/transforms/transform_results.py
index 2c14874..eab60b6 100644
--- a/qcware/serialization/transforms/transform_results.py
+++ b/qcware/serialization/transforms/transform_results.py
@@ -1,5 +1,5 @@
 import os
-from typing import Callable, Optional, cast
+from typing import Callable, Optional, cast, Dict
 
 import numpy
 from decouple import config
@@ -28,7 +28,7 @@
     to_wire,
 )
 
-_to_wire_result_replacers: dict[str, Callable] = {}
+_to_wire_result_replacers: Dict[str, Callable] = {}
 
 
 def debug_is_set() -> bool:
@@ -61,7 +61,7 @@ def server_result_to_wire(method_name: str, worker_result: object):
         return f(worker_result)
 
 
-_from_wire_result_replacers: dict[str, Callable] = {}
+_from_wire_result_replacers: Dict[str, Callable] = {}
 
 
 def client_result_from_wire(method_name: str, worker_result: object):
diff --git a/qcware/types/optimization/results/results_types.py b/qcware/types/optimization/results/results_types.py
index 358b1fe..67304cb 100644
--- a/qcware/types/optimization/results/results_types.py
+++ b/qcware/types/optimization/results/results_types.py
@@ -8,6 +8,7 @@
 from qcware.types.optimization.problem_spec import BinaryProblem
 from qcware.types.optimization.results import utils
 from qcware.types.optimization.variable_types import domain_bit_values
+from typing import Dict
 
 
 class Sample(pydantic.BaseModel):
@@ -15,7 +16,7 @@ class Sample(pydantic.BaseModel):
     value: int
     occurrences: int = 1
 
-    @pydantic.validator("occurrences")
+    @pydantic.validator("occurrences", allow_reuse=True)
     def positive_occurrences(cls, v):
         if v <= 0:
             raise ValueError(
@@ -30,7 +31,7 @@ def str_bitstring(self, domain: Domain):
         """Write the sample bitstring in a format like '011' or '+--'."""
         return binary_ints_to_binstring(bl=self.bitstring, domain=domain)
 
-    def convert(self, mapping: dict[int, int]) -> "Sample":
+    def convert(self, mapping: Dict[int, int]) -> "Sample":
         return Sample(
             bitstring=tuple(mapping[i] for i in self.bitstring),
             value=self.value,
diff --git a/qcware/types/qml/fit_data.py b/qcware/types/qml/fit_data.py
index e7a84f9..ebf1592 100644
--- a/qcware/types/qml/fit_data.py
+++ b/qcware/types/qml/fit_data.py
@@ -7,7 +7,7 @@
 as additional internal data.
 """
 
-from typing import Optional, Union
+from typing import Optional, Union, Tuple
 
 import numpy.typing
 import quasar
@@ -23,7 +23,7 @@ class FitDataBase(BaseModel):
     loader_mode: str
     num_measurements: int
     absolute: bool
-    opt_shape: Optional[tuple[int, int]]
+    opt_shape: Optional[Tuple[int, int]]
 
 
 class QNearestCentroidFitData(FitDataBase):
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000..102e6ef
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,12 @@
+[tox]
+skipsdist = true
+envlist = py37, py38, py39, py310
+
+[testenv]
+setenv =
+  QCWARE_HOST=http://localhost:5454
+  QCWARE_API_KEY=QCWARE
+whitelist_externals = poetry
+commands =
+    poetry install -v
+    poetry run pytest -k cpu