From 3d69a391d53fdf6d88da76340a1ef52e18ac8de7 Mon Sep 17 00:00:00 2001 From: Joe Futrelle Date: Wed, 24 Apr 2024 09:30:29 -0400 Subject: [PATCH 1/5] adding dep on pyifcb 1.1 pre-release --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index e65793ff..95e6b48c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -14,4 +14,4 @@ rectpack==0.2.2 scikit-image==0.22.0 pysmb==1.2.9.1 pyyaml==6.0.1 -git+https://github.com/joefutrelle/pyifcb@v1.0.0 +git+https://github.com/joefutrelle/pyifcb@v1.1.0-rc1 From 80fc0c974d8b6bd23f5d0ef87e110de782f21dd2 Mon Sep 17 00:00:00 2001 From: Joe Futrelle Date: Wed, 24 Apr 2024 09:30:44 -0400 Subject: [PATCH 2/5] removing unnused conda env file --- environment.yml | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 environment.yml diff --git a/environment.yml b/environment.yml deleted file mode 100644 index 0d3340ce..00000000 --- a/environment.yml +++ /dev/null @@ -1,13 +0,0 @@ -name: ifcbdb -dependencies: -- django -- gunicorn -- psycopg2 -- libiconv -- tiledb -- numba -- pip -- pip: - - celery - - pymemcache - - redis From 4b464f01175af32d326c68e0f8392eae6c5b781a Mon Sep 17 00:00:00 2001 From: Joe Futrelle Date: Wed, 24 Apr 2024 13:43:25 -0400 Subject: [PATCH 3/5] porting to pyifcb 1.1 --- utilities/auto_transfer.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/utilities/auto_transfer.py b/utilities/auto_transfer.py index 4eac59f3..3259be02 100644 --- a/utilities/auto_transfer.py +++ b/utilities/auto_transfer.py @@ -21,7 +21,6 @@ def load_config(config_file): def sync_ifcb(name, dashboard_url, ifcb_config): address = ifcb_config['address'] - netbios_name = ifcb_config.get('netbios_name',None) username = ifcb_config.get('username','ifcb') password = ifcb_config.get('password','ifcb') share = ifcb_config.get('share','Data') @@ -53,7 +52,7 @@ def hit_sync_endpoint(lid): logging.info(f'connecting to {name} ...') try: - ifcb = RemoteIfcb(address, username, password, netbios_name=netbios_name, + ifcb = RemoteIfcb(address, username, password, share=share, directory=directory, timeout=timeout) with ifcb: @@ -67,7 +66,7 @@ def hit_sync_endpoint(lid): logging.info(f'transferring beads ...') try: - ifcb = RemoteIfcb(address, username, password, netbios_name=netbios_name, + ifcb = RemoteIfcb(address, username, password, share=share, directory='beads', timeout=timeout) with ifcb: From 07c6ebf729e5cd77f0229e44b907790a1b1259cc Mon Sep 17 00:00:00 2001 From: Joe Futrelle Date: Thu, 25 Apr 2024 12:58:34 -0400 Subject: [PATCH 4/5] moving dependency to released pyifcb 1.1.0 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 95e6b48c..ed92d5ff 100644 --- a/requirements.txt +++ b/requirements.txt @@ -14,4 +14,4 @@ rectpack==0.2.2 scikit-image==0.22.0 pysmb==1.2.9.1 pyyaml==6.0.1 -git+https://github.com/joefutrelle/pyifcb@v1.1.0-rc1 +git+https://github.com/joefutrelle/pyifcb@v1.1.0 From e6a5cd92dbade47f25e1435093774b39b95888d7 Mon Sep 17 00:00:00 2001 From: Joe Futrelle Date: Thu, 25 Apr 2024 12:58:57 -0400 Subject: [PATCH 5/5] bumping displayed version to 4.1 --- ifcbdb/templates/base.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ifcbdb/templates/base.html b/ifcbdb/templates/base.html index 49a06586..261c978c 100644 --- a/ifcbdb/templates/base.html +++ b/ifcbdb/templates/base.html @@ -97,7 +97,7 @@
  • - Version 1.0 - December 2019 + Version 4.1 - April 2024
  • About