Merge pull request #1197 from weaviate/chore/fix-all-devel-deps

Do not use deps ranges in devel requirements
weaviate · Jul 24, 2024 · 286fa35 · 286fa35
2 parents 33e35ba + 198e696
commit 286fa35
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 25 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -53,7 +53,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
-          python-version: "3.11"
+          python-version: ${{ matrix.version }}
           cache: 'pip' # caching pip dependencies
       - run: pip install -r requirements-devel.txt
       - name: Run mypy

diff --git a/requirements-devel.txt b/requirements-devel.txt
@@ -1,11 +1,11 @@
-requests>=2.30.0,<3.0.0
-httpx>=0.25.2,<=0.27.0
+requests==2.30.0
+httpx==0.25.2
 validators==0.33.0
-authlib>=1.2.1,<2.0.0
+authlib==1.2.1
 grpcio==1.62.2
 grpcio-tools==1.62.2
-grpcio-health-checking>=1.57.0,<2.0.0
-pydantic>=2.5.0,<3.0.0
+grpcio-health-checking==1.62.2
+pydantic==2.5.0
 
 build
 twine
@@ -17,36 +17,33 @@ sphinx-rtd-theme==2.0.0
 autodoc-pydantic==2.2.0
 importlib_metadata==7.2.1
 
-grpcio-tools
-
 pytest==8.2.2
 pytest-cov==5.0.0
 pytest-asyncio==0.23.7
 pytest-benchmark==4.0.0
 pytest-profiling==1.7.0
 coverage==7.6.0
 pytest-xdist==3.6.1
-werkzeug>=2.3.7
-pytest-httpserver>=1.0.8
-py-spy>=0.3.14
+werkzeug==3.0.3
+pytest-httpserver==1.0.12
+py-spy==0.3.14
 
 numpy>=1.24.4,<2.0.0
 pandas>=2.0.3,<3.0.0
 pandas-stubs>=2.0.3,<3.0.0
 polars>=0.20.26,<0.21.0
 
-fastapi>=0.111.0,<1.0.0
-flask[async]>=3.0.3,<4.0.0
-litestar>=2.8.3,<3.0.0
+fastapi==0.111.1
+flask[async]==3.0.3
+litestar==2.9.1
 
-mypy>=1.9.0,<2.0.0
+mypy==1.11.0
 mypy-extensions==1.0.0
-tomli>=2.0.1,<3.0.0
-types-Deprecated>=1.2.9.3,<2.0.0
-types-protobuf>=4.24.0.1,<5.0.0
-types-requests>=2.31.0.2,<3.0.0
-types-urllib3>=1.26.25.14,<2.0.0
-typing_extensions>=4.7.1,<5.0.0
+tomli==2.0.1
+types-protobuf==4.24.0.1
+types-requests==2.30.0.0
+types-urllib3==1.26.25.14
+typing_extensions==4.8.0
 
 pre-commit
 

diff --git a/weaviate/collections/classes/tenants.py b/weaviate/collections/classes/tenants.py
@@ -75,7 +75,7 @@ class Tenant(BaseModel):
         exclude=True,
     )
     activityStatus: _TenantActivistatusServerValues = Field(
-        init=False, default=_TenantActivistatusServerValues.HOT
+        init_var=False, default=_TenantActivistatusServerValues.HOT
     )
 
     @property
@@ -176,7 +176,7 @@ class TenantCreate(BaseModel):
         exclude=True,
     )
     activityStatus: _TenantActivistatusServerValues = Field(
-        init=False, default=_TenantActivistatusServerValues.HOT
+        init_var=False, default=_TenantActivistatusServerValues.HOT
     )
 
     @property
@@ -212,7 +212,7 @@ class TenantUpdate(BaseModel):
         default=TenantUpdateActivityStatus.ACTIVE, alias="activity_status", exclude=True
     )
     activityStatus: _TenantActivistatusServerValues = Field(
-        init=False, default=_TenantActivistatusServerValues.HOT
+        init_var=False, default=_TenantActivistatusServerValues.HOT
     )
 
     @property

diff --git a/weaviate/connect/v4.py b/weaviate/connect/v4.py
@@ -28,6 +28,7 @@
     RemoteProtocolError,
     RequestError,
     Response,
+    Proxy,
     Timeout,
 )
 
@@ -207,7 +208,7 @@ def __make_mounts(self) -> Dict[str, AsyncHTTPTransport]:
                     max_connections=self.__connection_config.session_pool_maxsize,
                     max_keepalive_connections=self.__connection_config.session_pool_connections,
                 ),
-                proxy=proxy,
+                proxy=Proxy(url=proxy),
                 retries=self.__connection_config.session_pool_max_retries,
                 trust_env=self.__trust_env,
             )