Merge pull request #169 from LeoHsiao1/dev

[test] remove FROM_SOURCE_CODE_IMPORT_PYEXIV2

Author: LeoHsiao1

.github/workflows/test_wheels.yml

@@ -32,9 +32,9 @@ jobs:
         python -m pip install pytest psutil
     - name: Test
       run: |
+        # Disable the pyexiv2 in current repository, to use the pyexiv2 installed by pip
+        python -c "import os; os.rename('pyexiv2/__init__.py', 'pyexiv2/disable__init__.py')"
         pytest -sv
-      env:
-        FROM_SOURCE_CODE_IMPORT_PYEXIV2: False
 
   on_macos:
     strategy:
@@ -58,9 +58,9 @@ jobs:
     - name: Test
       run: |
         brew install inih
+        # Disable the pyexiv2 in current repository, to use the pyexiv2 installed by pip
+        python -c "import os; os.rename('pyexiv2/__init__.py', 'pyexiv2/disable__init__.py')"
         pytest -sv
-      env:
-        FROM_SOURCE_CODE_IMPORT_PYEXIV2: False
 
   on_windows:
     strategy:
@@ -82,6 +82,6 @@ jobs:
         python -m pip install pytest psutil
     - name: Test
       run: |
+        # Disable the pyexiv2 in current repository, to use the pyexiv2 installed by pip
+        python -c "import os; os.rename('pyexiv2/__init__.py', 'pyexiv2/disable__init__.py')"
         pytest -sv
-      env:
-        FROM_SOURCE_CODE_IMPORT_PYEXIV2: False

pyexiv2/tests/base.py

@@ -10,6 +10,7 @@
 import pytest
 
 from . import data
+from pyexiv2 import *
 
 
 class ENV:
@@ -22,12 +23,6 @@ class ENV:
     test_img_copy   = os.path.join(test_dir, 'test-copy.jpg')
 
 
-if os.environ.get('FROM_SOURCE_CODE_IMPORT_PYEXIV2', 'True'):
-    from ..      import *
-else:
-    from pyexiv2 import *
-
-
 def setup_function():
     if ENV.skip_test:
         pytest.skip()