Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump pyifcb to 1.1 #387

Merged
merged 5 commits into from
Apr 25, 2024
Merged

Bump pyifcb to 1.1 #387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3d69a39
adding dep on pyifcb 1.1 pre-release
joefutrelle Apr 24, 2024
80fc0c9
removing unnused conda env file
joefutrelle Apr 24, 2024
4b464f0
porting to pyifcb 1.1
joefutrelle Apr 24, 2024
07c6ebf
moving dependency to released pyifcb 1.1.0
joefutrelle Apr 25, 2024
e6a5cd9
bumping displayed version to 4.1
joefutrelle Apr 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions environment.yml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion ifcbdb/templates/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
<div class="col-sm-12">
<ul class="nav justify-content-center">
<li class="nav-item">
<span class="px-2">Version 1.0 - December 2019</span>
<span class="px-2">Version 4.1 - April 2024</span>
</li>
<li class="nav-item">
<a class="px-2" href="{% url 'about_page' %}">About</a>
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 2 additions & 3 deletions utilities/auto_transfer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down Expand Up @@ -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:
Expand All @@ -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:
Expand Down