Merge pull request #53 from jpmorganchase/feature/tz-fix

Feature/tz fix
jpmorganchase · Jun 7, 2024 · 6cf6ac9 · 6cf6ac9
2 parents d4399d4 + 0bfa636
commit 6cf6ac9
Show file tree

Hide file tree

Showing 16 changed files with 29 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.1.1] - 2024-06-07
+
+* project folder rename
+* minor fix in the upload internals
 
 ## [1.1.0] - 2024-06-06
 

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pyfusion"
-version = "1.1.0"
+version = "1.1.1"
 edition = "2021"
 
 

diff --git a/mkdocs.yml b/mkdocs.yml
@@ -5,7 +5,7 @@ edit_uri: fusion/
 repo_name: jpmorganchase/fusion
 docs_dir: docs
 watch:
-  - python/fusion
+  - py_src/fusion
 
 nav:
   - Home: index.md
@@ -63,7 +63,7 @@ plugins:
   - include-markdown
   - mkdocstrings:
       watch:
-        - python/fusion
+        - py_src/fusion
   - search:
       lang: en
 

diff --git a/python/fusion/__init__.py → py_src/fusion/__init__.py b/python/fusion/__init__.py → py_src/fusion/__init__.py
@@ -2,7 +2,7 @@
 
 __author__ = """Fusion Devs"""
 __email__ = "fusion_developers@jpmorgan.com"
-__version__ = "1.1.0"
+__version__ = "1.1.1"
 
 from fusion.authentication import FusionCredentials
 from fusion.fs_sync import fsync

diff --git a/python/fusion/__main__.py → py_src/fusion/__main__.py b/python/fusion/__main__.py → py_src/fusion/__main__.py
diff --git a/python/fusion/authentication.py → py_src/fusion/authentication.py b/python/fusion/authentication.py → py_src/fusion/authentication.py
@@ -339,9 +339,9 @@ def from_dict(credentials: dict[str, Any]) -> "FusionCredentials":
                 password = None
                 bearer_token = credentials["bearer_token"]
                 bearer_token_expiry = (
-                    pd.to_datetime(credentials.get("bearer_token_expiry"))  # type: ignore
+                    pd.to_datetime(credentials.get("bearer_token_expiry"), utc=True)  # type: ignore
                     if credentials.get("bearer_token_expiry")
-                    else None
+                    else datetime.now(tz=timezone.utc)
                 )
                 bearer_token_expirable = credentials.get("bearer_token_expirable")
                 if isinstance(bearer_token_expirable, str):

diff --git a/python/fusion/exceptions.py → py_src/fusion/exceptions.py b/python/fusion/exceptions.py → py_src/fusion/exceptions.py
diff --git a/python/fusion/fs_sync.py → py_src/fusion/fs_sync.py b/python/fusion/fs_sync.py → py_src/fusion/fs_sync.py
diff --git a/python/fusion/fusion.py → py_src/fusion/fusion.py b/python/fusion/fusion.py → py_src/fusion/fusion.py
diff --git a/python/fusion/fusion_filesystem.py → py_src/fusion/fusion_filesystem.py b/python/fusion/fusion_filesystem.py → py_src/fusion/fusion_filesystem.py
@@ -404,7 +404,7 @@ async def _get_operation_id() -> dict[str, Any]:
                 res: dict[str, Any] = await r.json()
                 return res
 
-        async def _finish_operation(session: Any, operation_id: Any, kw: Any) -> None:
+        async def _finish_operation(operation_id: Any, kw: Any) -> None:
             session = await self.set_session()
             async with session.post(
                 url=rpath + f"/operations/upload?operationId={operation_id}",

diff --git a/python/fusion/types.py → py_src/fusion/types.py b/python/fusion/types.py → py_src/fusion/types.py
diff --git a/python/fusion/utils.py → py_src/fusion/utils.py b/python/fusion/utils.py → py_src/fusion/utils.py
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "pyfusion"
-version = "1.1.0"
+version = "1.1.1"
 
 homepage = "https://github.com/jpmorganchase/fusion"
 description = "JPMC Fusion Developer Tools"
@@ -42,7 +42,7 @@ requires = ["maturin>=1.2,<2.0"]
 build-backend = "maturin"
 
 [tool.maturin]
-python-source = "python"
+python-source = "py_src"
 module-name = "fusion._fusion"
 features = ["pyo3/extension-module"]
 
@@ -207,7 +207,7 @@ report.fail_under = 60
 run.parallel = true
 
 [tool.bumpversion]
-current_version = "1.1.0"
+current_version = "1.1.1"
 parse = '(?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(?:-(?P<release>[a-z]+)(?P<candidate>\d+))?'
 serialize = [
     '{major}.{minor}.{patch}-{release}{candidate}',
@@ -241,4 +241,4 @@ filename = "Cargo.toml"
 filename = "pyproject.toml"
 
 [[tool.bumpversion.files]]
-filename = "python/fusion/__init__.py"
+filename = "py_src/fusion/__init__.py"
diff --git a/runnable/run.py b/runnable/run.py
@@ -0,0 +1,8 @@
+from fusion import Fusion
+
+client = Fusion("config/client_credentials_bearer.json")
+client.list_catalogs()
+client.list_datasets()
+
+fs = client.get_fusion_filesystem()
+print(fs.ls('common'))
diff --git a/tox.ini b/tox.ini
@@ -20,8 +20,8 @@ commands =
 allowlist_externals = rye
 commands =
     rye sync
-    rye run ruff format python/fusion py_tests
-    rye run ruff check --fix python/fusion py_tests
+    rye run ruff format py_src/fusion py_tests
+    rye run ruff check --fix py_src/fusion py_tests
 
 [testenv:lint]
 allowlist_externals = rye, cargo
@@ -30,9 +30,9 @@ set_env =
 commands =
     # cargo clippy
     rye sync
-    rye run ruff check python/fusion py_tests
-    rye run mypy --disallow-untyped-defs python/fusion py_tests
-    rye run ruff check python/fusion py_tests --ignore-noqa --exit-zero
+    rye run ruff check py_src/fusion py_tests
+    rye run mypy --disallow-untyped-defs py_src/fusion py_tests
+    rye run ruff check py_src/fusion py_tests --ignore-noqa --exit-zero
 
 [testenv:doc]
 allowlist_externals = rye