pyoncat 2.0__tar.gz → 2.1__tar.gz

{pyoncat-2.0 → pyoncat-2.1}/PKG-INFO

@@ -1,8 +1,7 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: pyoncat
-Version: 2.0
+Version: 2.1
 Summary: A Python Client for ONCat (the ORNL Neutron Catalog).
-Home-page: https://oncat.ornl.gov
 Keywords: ornl,neutron,metadata,catalog
 Author: ONCat Support
 Author-email: oncat-support@ornl.gov
@@ -14,9 +13,11 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: oauthlib
 Requires-Dist: requests
 Requires-Dist: requests-oauthlib
+Project-URL: Homepage, https://oncat.ornl.gov
 Description-Content-Type: text/markdown
 
 Welcome to PyONCat, a Python client designed to facilitate interaction with the ONCat API.

{pyoncat-2.0 → pyoncat-2.1}/pyoncat/__init__.py

@@ -15,7 +15,6 @@ import getpass
 import json
 import os
 import pathlib
-import sys
 import warnings
 import weakref
 from typing import Any, Callable, ClassVar
@@ -25,7 +24,7 @@ import requests
 import requests_oauthlib
 from requests.packages.urllib3.exceptions import InsecureRequestWarning
 
-__version__ = "2.0"
+__version__ = "2.1"
 
 __all__ = [
     "FileSystemTokenStore",
@@ -529,16 +528,12 @@ class ONCatObject:
             "id={}".format(self._content.get("id")),
         ]
 
-        unicode_repr = "<{} at {}> JSON: {}".format(
+        return "<{} at {}> JSON: {}".format(
             " ".join(ident_parts),
             hex(id(self)),
             str(self),
         )
 
-        if sys.version_info[0] < 3:
-            return unicode_repr.encode("utf-8")
-        return unicode_repr
-
     def __str__(self):
         return json.dumps(self._content, sort_keys=True, indent=4)
 
@@ -659,8 +654,7 @@ class _ONCatResource(metaclass=_ONCatMixinMeta):
     def retrieve(self, identifier, **kwargs):
         oncat = self._parent_oncat_weakref()
 
-        if identifier.startswith("/"):
-            identifier = identifier[1:]
+        identifier = identifier.removeprefix("/")
 
         path = f"{self._NAMESPACE}/{self._RESOURCE_ENDPOINT}/{identifier}"
 
@@ -683,8 +677,7 @@ class _UpdatableONCatMixin(_ONCatResource):
     def place(self, identifier, data, **kwargs):
         oncat = self._parent_oncat_weakref()
 
-        if identifier.startswith("/"):
-            identifier = identifier[1:]
+        identifier = identifier.removeprefix("/")
 
         path = f"{self._NAMESPACE}/{self._RESOURCE_ENDPOINT}/{identifier}"
 
@@ -704,8 +697,7 @@ class _RemovableONCatMixin(_ONCatResource):
     def remove(self, identifier, **kwargs):
         oncat = self._parent_oncat_weakref()
 
-        if identifier.startswith("/"):
-            identifier = identifier[1:]
+        identifier = identifier.removeprefix("/")
 
         path = f"{self._NAMESPACE}/{self._RESOURCE_ENDPOINT}/{identifier}"
 
@@ -808,6 +800,11 @@ class Archive(
     _NAMESPACE = "api"
 
 
+class Cycle(_ListableONCatMixin, _ControllerONCatMixin):
+    _RESOURCE_ENDPOINT = "cycles"
+    _NAMESPACE = "api"
+
+
 class Datafile(
     _ControllerONCatMixin,
     _CreatableONCatMixin,

{pyoncat-2.0 → pyoncat-2.1}/pyproject.toml

@@ -7,7 +7,7 @@ build-backend = "poetry.masonry.api"
 # https://github.com/python-poetry/roadmap/issues/3
 [tool.poetry]
 name = "pyoncat"
-version = "2.0"
+version = "2.1"
 description = "A Python Client for ONCat (the ORNL Neutron Catalog)."
 authors = ["ONCat Support <oncat-support@ornl.gov>"]
 readme = ["pyoncat/README.md", "pyoncat/LICENSE"]