Skip to content

Commit

Permalink
update lockable dependency (#7)
Browse files Browse the repository at this point in the history
  • Loading branch information
jupe committed Apr 14, 2021
1 parent 7980131 commit 7e0faee
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 7 deletions.
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Robot Framework Remote Resource Allocator

[![CircleCI](https://circleci.com/gh/jupe/robot-lockable/tree/master.svg?style=svg)](https://circleci.com/gh/jupe/robot-lockable/tree/master)
[![PyPI version](https://badge.fury.io/py/robot-lockable.svg)](https://pypi.org/project/robot-lockable/)

Resource locking library for Robot Framework.

# Usage
Expand Down
8 changes: 6 additions & 2 deletions RobotLockable/Remote.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import click
from robotremoteserver import RobotRemoteServer
from robot.api import logger
from lockable import Lockable
from lockable import Lockable, Allocation


class RemoteLockable:
Expand Down Expand Up @@ -42,7 +42,11 @@ def unlock(self, resource):
:return: None
"""
print('resource:', resource)
self._lockable.unlock(resource)
allocation = Allocation(requirements=resource,
resource_info=resource,
_release=None,
pid_file='')
self._lockable.unlock(allocation)


def generate_doc(doc):
Expand Down
8 changes: 6 additions & 2 deletions RobotLockable/RobotLockable.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"""
import socket
import tempfile
from lockable import Lockable
from lockable import Lockable, Allocation
from RobotLockable import __version__


Expand Down Expand Up @@ -46,4 +46,8 @@ def unlock(self, resource):
:return: None
"""
print('resource:', resource)
self._lockable.unlock(resource)
allocation = Allocation(requirements=resource,
resource_info=resource,
_release=None,
pid_file='')
self._lockable.unlock(allocation)
2 changes: 1 addition & 1 deletion pylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ confidence=
# --enable=similarities". If you want to run only the classes checker, but have
# no Warning level messages displayed, use"--disable=all --enable=classes
# --disable=W"
disable=print-statement,parameter-unpacking,unpacking-in-except,old-raise-syntax,backtick,long-suffix,old-ne-operator,old-octal-literal,import-star-module-level,raw-checker-failed,bad-inline-option,locally-disabled,locally-enabled,file-ignored,suppressed-message,useless-suppression,deprecated-pragma,apply-builtin,basestring-builtin,buffer-builtin,cmp-builtin,coerce-builtin,execfile-builtin,file-builtin,long-builtin,raw_input-builtin,reduce-builtin,standarderror-builtin,unicode-builtin,xrange-builtin,coerce-method,delslice-method,getslice-method,setslice-method,no-absolute-import,old-division,dict-iter-method,dict-view-method,next-method-called,metaclass-assignment,indexing-exception,raising-string,reload-builtin,oct-method,hex-method,nonzero-method,cmp-method,input-builtin,round-builtin,intern-builtin,unichr-builtin,map-builtin-not-iterating,zip-builtin-not-iterating,range-builtin-not-iterating,filter-builtin-not-iterating,using-cmp-argument,eq-without-hash,div-method,idiv-method,rdiv-method,exception-message-attribute,invalid-str-codec,sys-max-int,bad-python3-import,deprecated-string-function,deprecated-str-translate-call,useless-object-inheritance
disable=print-statement,parameter-unpacking,unpacking-in-except,old-raise-syntax,backtick,long-suffix,old-ne-operator,old-octal-literal,import-star-module-level,raw-checker-failed,bad-inline-option,locally-disabled,locally-enabled,file-ignored,suppressed-message,useless-suppression,deprecated-pragma,apply-builtin,basestring-builtin,buffer-builtin,cmp-builtin,coerce-builtin,execfile-builtin,file-builtin,long-builtin,raw_input-builtin,reduce-builtin,standarderror-builtin,unicode-builtin,xrange-builtin,coerce-method,delslice-method,getslice-method,setslice-method,no-absolute-import,old-division,dict-iter-method,dict-view-method,next-method-called,metaclass-assignment,indexing-exception,raising-string,reload-builtin,oct-method,hex-method,nonzero-method,cmp-method,input-builtin,round-builtin,intern-builtin,unichr-builtin,map-builtin-not-iterating,zip-builtin-not-iterating,range-builtin-not-iterating,filter-builtin-not-iterating,using-cmp-argument,eq-without-hash,div-method,idiv-method,rdiv-method,exception-message-attribute,invalid-str-codec,sys-max-int,bad-python3-import,deprecated-string-function,deprecated-str-translate-call,useless-object-inheritance,duplicate-code

# Enable the message, report, category or checker with the given id(s). You can
# either give multiple identifier separated by comma (,) or put this option
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
setup_requires=["setuptools_scm"],
install_requires=[
"robotframework",
"lockable==0.3.1",
"lockable==0.4.0",
"click",
"retry",
"robotremoteserver",
Expand Down
1 change: 0 additions & 1 deletion test/test_lockable.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
from threading import Thread
from contextlib import contextmanager
import requests
import subprocess
from requests.exceptions import ConnectionError, HTTPError
from retry import retry
from robot import run as run_robot
Expand Down

0 comments on commit 7e0faee

Please sign in to comment.