datajoint 2.0.0__tar.gz → 2.0.1__tar.gz

{datajoint-2.0.0 → datajoint-2.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datajoint
-Version: 2.0.0
+Version: 2.0.1
 Summary: DataJoint for Python is a framework for scientific workflow management based on relational principles. DataJoint is built on the foundation of the relational data model and prescribes a consistent method for organizing, populating, computing, and querying data.
 Author: Raphael Guzman, Edgar Walker
 Author-email: Dimitri Yatsenko <dimitri@datajoint.com>, Thinh Nguyen <thinh@datajoint.com>, DataJoint Contributors <support@datajoint.com>
@@ -218,16 +218,11 @@ Requires-Dist: numpy
 Requires-Dist: pymysql>=0.7.2
 Requires-Dist: deepdiff
 Requires-Dist: pyparsing
-Requires-Dist: ipython
 Requires-Dist: pandas
 Requires-Dist: tqdm
 Requires-Dist: networkx
 Requires-Dist: pydot
 Requires-Dist: fsspec>=2023.1.0
-Requires-Dist: matplotlib
-Requires-Dist: faker
-Requires-Dist: urllib3
-Requires-Dist: setuptools
 Requires-Dist: pydantic-settings>=2.0.0
 Provides-Extra: s3
 Requires-Dist: s3fs>=2023.1.0; extra == "s3"
@@ -239,10 +234,16 @@ Provides-Extra: polars
 Requires-Dist: polars>=0.20.0; extra == "polars"
 Provides-Extra: arrow
 Requires-Dist: pyarrow>=14.0.0; extra == "arrow"
+Provides-Extra: viz
+Requires-Dist: matplotlib; extra == "viz"
+Requires-Dist: ipython; extra == "viz"
 Provides-Extra: test
 Requires-Dist: pytest; extra == "test"
 Requires-Dist: pytest-cov; extra == "test"
 Requires-Dist: requests; extra == "test"
+Requires-Dist: faker; extra == "test"
+Requires-Dist: matplotlib; extra == "test"
+Requires-Dist: ipython; extra == "test"
 Requires-Dist: s3fs>=2023.1.0; extra == "test"
 Requires-Dist: testcontainers[minio,mysql]>=4.0; extra == "test"
 Requires-Dist: polars>=0.20.0; extra == "test"

{datajoint-2.0.0 → datajoint-2.0.1}/pyproject.toml

@@ -11,16 +11,11 @@ dependencies = [
   "pymysql>=0.7.2",
   "deepdiff",
   "pyparsing",
-  "ipython",
   "pandas",
   "tqdm",
   "networkx",
   "pydot",
   "fsspec>=2023.1.0",
-  "matplotlib",
-  "faker",
-  "urllib3",
-  "setuptools",
   "pydantic-settings>=2.0.0",
 ]
 
@@ -88,6 +83,9 @@ test = [
   "pytest",
   "pytest-cov",
   "requests",
+  "faker",
+  "matplotlib",
+  "ipython",
   "graphviz",
   "testcontainers[mysql,minio]>=4.0",
   "polars>=0.20.0",
@@ -100,10 +98,14 @@ gcs = ["gcsfs>=2023.1.0"]
 azure = ["adlfs>=2023.1.0"]
 polars = ["polars>=0.20.0"]
 arrow = ["pyarrow>=14.0.0"]
+viz = ["matplotlib", "ipython"]
 test = [
   "pytest",
   "pytest-cov",
   "requests",
+  "faker",
+  "matplotlib",
+  "ipython",
   "s3fs>=2023.1.0",
   "testcontainers[mysql,minio]>=4.0",
   "polars>=0.20.0",

{datajoint-2.0.0 → datajoint-2.0.1}/src/datajoint/migrate.py

@@ -5,6 +5,11 @@ This module provides tools for migrating existing schemas to use the new
 Codec system, particularly for upgrading blob columns to use
 explicit `<blob>` type declarations.
 
+.. note::
+    This module is provided temporarily to assist with migration from pre-2.0.
+    It will be deprecated in DataJoint 2.1 and removed in 2.2.
+    Complete your migrations while on DataJoint 2.0.
+
 Note on Terminology
 -------------------
 This module uses "external storage" because that was the term in DataJoint 0.14.6.
@@ -16,9 +21,22 @@ from __future__ import annotations
 
 import logging
 import re
+import warnings
 from typing import TYPE_CHECKING
 
+from packaging.version import Version
+
 from .errors import DataJointError
+from .version import __version__
+
+# Show deprecation warning starting in 2.1
+if Version(__version__) >= Version("2.1"):
+    warnings.warn(
+        "datajoint.migrate is deprecated and will be removed in DataJoint 2.2. "
+        "Complete your schema migrations before upgrading.",
+        DeprecationWarning,
+        stacklevel=2,
+    )
 
 if TYPE_CHECKING:
     from .schemas import Schema

{datajoint-2.0.0 → datajoint-2.0.1}/src/datajoint/table.py

@@ -151,11 +151,20 @@ class Table(QueryExpression):
         """
         if self.connection.in_transaction:
             raise DataJointError("Cannot declare new tables inside a transaction, e.g. from inside a populate/make call")
-        # Enforce strict CamelCase #1150
-        if not is_camel_case(self.class_name):
+        # Validate class name #1150
+        class_name = self.class_name
+        if "_" in class_name:
+            warnings.warn(
+                f"Table class name `{class_name}` contains underscores. "
+                "CamelCase names without underscores are recommended.",
+                UserWarning,
+                stacklevel=2,
+            )
+            class_name = class_name.replace("_", "")
+        if not is_camel_case(class_name):
             raise DataJointError(
-                "Table class name `{name}` is invalid. Please use CamelCase. ".format(name=self.class_name)
-                + "Classes defining tables should be formatted in strict CamelCase."
+                f"Table class name `{self.class_name}` is invalid. "
+                "Class names must be in CamelCase, starting with a capital letter."
             )
         sql, _external_stores, primary_key, fk_attribute_map = declare(self.full_table_name, self.definition, context)
 

{datajoint-2.0.0 → datajoint-2.0.1}/src/datajoint/user_tables.py

@@ -32,6 +32,7 @@ supported_class_attrs = {
     "to_arrow",
     "to_arrays",
     "keys",
+    "fetch",
     "fetch1",
     "head",
     "tail",

{datajoint-2.0.0 → datajoint-2.0.1}/src/datajoint/utils.py

@@ -2,6 +2,7 @@
 
 import re
 import shutil
+import warnings
 from pathlib import Path
 
 from .errors import DataJointError
@@ -86,6 +87,14 @@ def from_camel_case(s):
     def convert(match):
         return ("_" if match.groups()[0] else "") + match.group(0).lower()
 
+    # Handle underscores: warn and remove them
+    if "_" in s:
+        warnings.warn(
+            f"Table class name `{s}` contains underscores. " "CamelCase names without underscores are recommended.",
+            UserWarning,
+            stacklevel=3,
+        )
+        s = s.replace("_", "")
     if not is_camel_case(s):
         raise DataJointError("ClassName must be alphanumeric in CamelCase, begin with a capital letter")
     return re.sub(r"(\B[A-Z])|(\b[A-Z])", convert, s)

{datajoint-2.0.0 → datajoint-2.0.1}/src/datajoint/version.py

@@ -1,4 +1,4 @@
 # version bump auto managed by Github Actions:
 # label_prs.yaml(prep), release.yaml(bump), post_release.yaml(edit)
 # manually set this version will be eventually overwritten by the above actions
-__version__ = "2.0.0"
+__version__ = "2.0.1"

{datajoint-2.0.0 → datajoint-2.0.1}/src/datajoint.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datajoint
-Version: 2.0.0
+Version: 2.0.1
 Summary: DataJoint for Python is a framework for scientific workflow management based on relational principles. DataJoint is built on the foundation of the relational data model and prescribes a consistent method for organizing, populating, computing, and querying data.
 Author: Raphael Guzman, Edgar Walker
 Author-email: Dimitri Yatsenko <dimitri@datajoint.com>, Thinh Nguyen <thinh@datajoint.com>, DataJoint Contributors <support@datajoint.com>
@@ -218,16 +218,11 @@ Requires-Dist: numpy
 Requires-Dist: pymysql>=0.7.2
 Requires-Dist: deepdiff
 Requires-Dist: pyparsing
-Requires-Dist: ipython
 Requires-Dist: pandas
 Requires-Dist: tqdm
 Requires-Dist: networkx
 Requires-Dist: pydot
 Requires-Dist: fsspec>=2023.1.0
-Requires-Dist: matplotlib
-Requires-Dist: faker
-Requires-Dist: urllib3
-Requires-Dist: setuptools
 Requires-Dist: pydantic-settings>=2.0.0
 Provides-Extra: s3
 Requires-Dist: s3fs>=2023.1.0; extra == "s3"
@@ -239,10 +234,16 @@ Provides-Extra: polars
 Requires-Dist: polars>=0.20.0; extra == "polars"
 Provides-Extra: arrow
 Requires-Dist: pyarrow>=14.0.0; extra == "arrow"
+Provides-Extra: viz
+Requires-Dist: matplotlib; extra == "viz"
+Requires-Dist: ipython; extra == "viz"
 Provides-Extra: test
 Requires-Dist: pytest; extra == "test"
 Requires-Dist: pytest-cov; extra == "test"
 Requires-Dist: requests; extra == "test"
+Requires-Dist: faker; extra == "test"
+Requires-Dist: matplotlib; extra == "test"
+Requires-Dist: ipython; extra == "test"
 Requires-Dist: s3fs>=2023.1.0; extra == "test"
 Requires-Dist: testcontainers[minio,mysql]>=4.0; extra == "test"
 Requires-Dist: polars>=0.20.0; extra == "test"

{datajoint-2.0.0 → datajoint-2.0.1}/src/datajoint.egg-info/requires.txt

@@ -2,16 +2,11 @@ numpy
 pymysql>=0.7.2
 deepdiff
 pyparsing
-ipython
 pandas
 tqdm
 networkx
 pydot
 fsspec>=2023.1.0
-matplotlib
-faker
-urllib3
-setuptools
 pydantic-settings>=2.0.0
 
 [arrow]
@@ -42,7 +37,14 @@ s3fs>=2023.1.0
 pytest
 pytest-cov
 requests
+faker
+matplotlib
+ipython
 s3fs>=2023.1.0
 testcontainers[minio,mysql]>=4.0
 polars>=0.20.0
 pyarrow>=14.0.0
+
+[viz]
+matplotlib
+ipython