Skip to content

Commit

Permalink
Merge pull request #387 from WHOIGit/pyifcb1.1
Browse files Browse the repository at this point in the history
Bump pyifcb to 1.1
  • Loading branch information
joefutrelle authored Apr 25, 2024
2 parents 629cd56 + e6a5cd9 commit b9553b0
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 18 deletions.
13 changes: 0 additions & 13 deletions environment.yml

This file was deleted.

2 changes: 1 addition & 1 deletion ifcbdb/templates/base.html
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
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
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

0 comments on commit b9553b0

Please sign in to comment.