.circleci/config.yml

@@ -8,23 +8,23 @@ workflows:
   version: 2
   test:
     jobs:
-      - test-37:
+      - test-38:
           filters:
             tags:
               only: /.*/
-      - test-38:
+      - test-39:
           filters:
             tags:
               only: /.*/
-      - test-39:
+      - test-310:
           filters:
             tags:
               only: /.*/
       - deploy:
           requires:
+            - test-310
             - test-39
             - test-38
-            - test-37
           filters:
             tags:
               only: /^v.*/
@@ -53,9 +53,9 @@ commands:
           key: deps1-{{ .Branch }}-{{ checksum "setup.py" }}
 
 jobs:
-  test-37: &test-template
+  test-38: &test-template
     docker:
-      - image: circleci/python:3.7
+      - image: circleci/python:3.8
     working_directory: ~/pytest-lockable
     steps:
       - setup
@@ -87,15 +87,15 @@ jobs:
           path: junit
           destination: juni
 
-  test-38:
+  test-39:
     <<: *test-template
     docker:
-    - image: circleci/python:3.8
-
-  test-39:
+    - image: circleci/python:3.9
+  
+  test-310:
     <<: *test-template
     docker:
-    - image: circleci/python:3.9-rc-buster
+    - image: circleci/python:3.10
 
   deploy:
     <<: *test-template

.github/dependabot.yml

@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "pip"
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"

README.md

@@ -42,11 +42,6 @@ pytest --allocation_hostname localhost -s --allocation_requirements os=Android m
 pip install pytest-lockable
 ```
 
-`conftest.py`:
-
-```
-pytest_plugins = ("lockable.plugin",)
-```
 
 ## integrations
 

example/conftest.py

@@ -1,8 +1 @@
 """ example conftest """
-import sys
-import os
-TEST_DIR = os.path.dirname(os.path.abspath(__file__))
-PLUGIN_DIR = os.path.join(TEST_DIR, '../')
-sys.path.insert(0, PLUGIN_DIR)
-
-pytest_plugins = ("pytest_lockable.plugin", "metadata")  # pylint: disable=invalid-name

example/test_example.py

@@ -18,5 +18,5 @@ def test_example2(lockable_resource, lockable):
     """ Simple test """
     print(f'Testing with resource: {lockable_resource}')
     with lockable.auto_lock({}) as allocation:
-        print(f'Testing with resource#2: {allocation.resource_info}')
+        print(f'Testing with resource#2: {allocation}')
         sleep(1)

pytest_lockable/plugin.py

@@ -18,7 +18,7 @@ def pytest_addoption(parser):
     group.addoption("--allocation_lock_folder", default=tempfile.gettempdir(), help="Allocation lockfiles folder")
 
 
-@pytest.fixture(scope="session", autouse=True)
+@pytest.fixture(scope="session")
 def lockable(pytestconfig):
     """
     pytest fixture that yields function for allocate any resource
@@ -36,15 +36,15 @@ def test_foo(lockable):
     yield _lockable
 
 
-@pytest.fixture(scope="session", autouse=True)
+@pytest.fixture(scope="session")
 def lockable_resource(pytestconfig, lockable):  # pylint: disable=redefined-outer-name
     """
     pytest fixture that lock suitable resource and yield it
     .. code-block:: python
         def test_foo(lockable_resource):
-            print(f'Testing with resource: {lockable_resource}')
+            print(f'Testing with resource: {lockable_resource.resource_info}')
     """
     requirements = pytestconfig.getoption('allocation_requirements')
     timeout_s = pytestconfig.getoption('allocation_timeout')
     with lockable.auto_lock(requirements, timeout_s) as allocation:
-        yield allocation.resource_info
+        yield allocation

setup.py

@@ -42,20 +42,21 @@
         "Topic :: Software Development :: Quality Assurance",
         "Topic :: Software Development :: Testing",
         "Topic :: Utilities",
+        'Programming Language :: Python :: 3.10',
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.8',
-        'Programming Language :: Python :: 3.7',
         "Programming Language :: Python :: 3 :: Only",
     ],
     packages=find_packages(exclude=['tests']),
     keywords="py.test pytest lockable resource",
-    python_requires='>=3.7, <4',
+    entry_points={"pytest11": ["pytest_lockable = pytest_lockable.plugin"]},
+    python_requires='>=3.8, <4',
     install_requires=[
         'pytest',
-        'lockable==0.6.0'
+        'lockable>=0.11.0,<0.12.0'
     ],
     extras_require={  # Optional
-        'dev': ['nose', 'coveralls', 'pylint', 'coverage'],
+        'dev': ['pynose', 'coveralls', 'pylint', 'coverage'],
         'optional': ['pytest-metadata']
     },