Merge pull request #12 from pomponchik/develop

pomponchik · web-flow · commit b25aa6117b46 · 2023-11-28T14:46:52.000+03:00
0.0.23
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -0,0 +1,28 @@
+name: Lint
+
+on:
+  push
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: ['3.7']
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v1
+      with:
+          python-version: ${{ matrix.python-version }}
+
+    - name: Install dependencies
+      shell: bash
+      run: pip install -r requirements_dev.txt
+
+    - name: Run ruff
+      shell: bash
+      run: ruff instld
diff --git a/.github/workflows/tests_and_coverage.yml b/.github/workflows/tests_and_coverage.yml
@@ -10,7 +10,7 @@ jobs:
     strategy:
       matrix:
         os: [macos-latest, ubuntu-latest, windows-latest]
-        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
+        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12']
 
     steps:
     - uses: actions/checkout@v2
@@ -25,7 +25,7 @@ jobs:
 
     - name: Install the library
       shell: bash
-      run: python setup.py install
+      run: pip install .
 
     - name: Print all libs
       shell: bash
diff --git a/.gitignore b/.gitignore
@@ -11,3 +11,4 @@ test.py
 tests/cli/data/chpok
 tests/cli/data/pok
 .idea
+.ruff_cache
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -0,0 +1,10 @@
+# See https://pre-commit.com for more information
+# See https://pre-commit.com/hooks.html for more hooks
+repos:
+- repo: https://github.com/astral-sh/ruff-pre-commit
+  # Ruff version.
+  rev: v0.0.290
+  hooks:
+    # Run the linter.
+    - id: ruff
+      args: [ instld ]
diff --git a/.ruff.toml b/.ruff.toml
@@ -0,0 +1 @@
+ignore = ['E501', 'E712']
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-![logo](https://raw.githubusercontent.com/pomponchik/instld/main/docs/assets/logo5.png)
+![logo](https://raw.githubusercontent.com/pomponchik/instld/main/docs/assets/logo_5.png)
 
 # INSTLD: the simplest package management
 
@@ -8,9 +8,11 @@
 [![Test-Package](https://github.com/pomponchik/instld/actions/workflows/tests_and_coverage.yml/badge.svg)](https://github.com/pomponchik/instld/actions/workflows/tests_and_coverage.yml)
 [![Python versions](https://img.shields.io/pypi/pyversions/instld.svg)](https://pypi.python.org/pypi/instld)
 [![PyPI version](https://badge.fury.io/py/instld.svg)](https://badge.fury.io/py/instld)
+[![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
 
 Thanks to this package, it is very easy to manage the lifecycle of packages.
 
+- ⚡ Run your code without installing libraries.
 - ⚡ You can use 2 different versions of the same library in the same program.
 - ⚡ You can use incompatible libraries in the same project, as well as libraries with incompatible/conflicting dependencies.
 - ⚡ It's easy to share written scripts. The script file becomes self-sufficient - the user does not need to install the necessary libraries.
diff --git a/docs/assets/logo_1.bmp b/docs/assets/logo_1.bmp
diff --git a/docs/assets/logo_2.png b/docs/assets/logo_2.png
diff --git a/docs/assets/logo_3.bmp b/docs/assets/logo_3.bmp
diff --git a/docs/assets/logo_4.png b/docs/assets/logo_4.png
diff --git a/docs/assets/logo_5.png b/docs/assets/logo_5.png
diff --git a/docs/assets/logo_6.png b/docs/assets/logo_6.png
diff --git a/docs/assets/presentation.pptx b/docs/assets/presentation.pptx
diff --git a/docs/assets/terminal.gif b/docs/assets/terminal.gif
diff --git a/instld/cli/main.py b/instld/cli/main.py
@@ -3,9 +3,9 @@
 import code
 import builtins
 import importlib
+import importlib.util
 import inspect
 from contextlib import contextmanager
-from tempfile import TemporaryDirectory
 from threading import RLock
 
 import instld
@@ -74,7 +74,7 @@ def import_wrapper(name, *args, **kwargs):
                 with set_import():
                     try:
                         result = __import__(name, *args, **kwargs)
-                    except (ModuleNotFoundError, ImportError) as e:
+                    except (ModuleNotFoundError, ImportError):
                         current_context.install(package_name, catch_output=catch_output, **options)
                         result = current_context.import_here(base_name)
                         sys.modules[base_name] = result
@@ -92,7 +92,7 @@ def import_wrapper(name, *args, **kwargs):
 
     if python_file is None:
         try:
-            import readline
+            import readline  # noqa: F401
         except ImportError:
             pass
 
@@ -120,9 +120,13 @@ def push(self, line):
         spec = importlib.util.spec_from_file_location('kek', os.path.abspath(python_file))
         module = importlib.util.module_from_spec(spec)
         sys.modules['__main__'] = module
-        set_cutting_excepthook(4)
+        if sys.platform.lower() in ('win32',):
+            cutting_trace_size = 4
+        else:
+            cutting_trace_size = 4
+        set_cutting_excepthook(cutting_trace_size)
         spec.loader.exec_module(module)
 
 
 if __name__ == "__main__":
-    start()
+    main()
diff --git a/instld/cli/parsing_arguments/get_python_file.py b/instld/cli/parsing_arguments/get_python_file.py
@@ -1,4 +1,3 @@
-import os
 import sys
 
 
diff --git a/instld/cli/traceback_cutting/cutting.py b/instld/cli/traceback_cutting/cutting.py
@@ -1,15 +1,13 @@
-import io
-import os
 import sys
 import traceback
-from contextlib import redirect_stderr
 
-from instld.cli.traceback_cutting.traceback_utils import cut_base_of_traceback
+from instld.cli.traceback_cutting.traceback_utils import cut_base_of_traceback, cut_importlib_bug
 
 
 def create_cutting_excepthook(old_hook, base_size):
     def new_hook(exc_type, value, traceback_object):
         traceback_object = cut_base_of_traceback(traceback_object, base_size)
+        traceback_object = cut_importlib_bug(traceback_object)
         traceback.print_exception(exc_type, value, traceback_object)
     return new_hook
 
diff --git a/instld/cli/traceback_cutting/traceback_utils.py b/instld/cli/traceback_cutting/traceback_utils.py
@@ -13,3 +13,18 @@ def cut_base_of_traceback(traceback_object, base_size):
             return traceback_object
         index += 1
         traceback_object = traceback_object.tb_next
+
+
+def cut_importlib_bug(traceback_object):
+    """
+    This function fix the truble, that occurs only for windows.
+
+    See: https://github.com/pomponchik/instld/actions/runs/6997770395
+    """
+    try:
+        while traceback_object is not None:
+            if not (traceback_object.tb_frame.f_code.co_filename == '<frozen importlib._bootstrap>' or traceback_object.tb_frame.f_code.co_filename == '<frozen importlib._bootstrap_external>'):
+                return traceback_object
+            traceback_object = traceback_object.tb_next
+    except AttributeError:
+        return traceback_object
diff --git a/instld/module/command_executer.py b/instld/module/command_executer.py
@@ -1,6 +1,6 @@
 import sys
 from threading import Thread, Lock
-from subprocess import Popen, PIPE, CalledProcessError
+from subprocess import Popen, PIPE
 
 from instld.module.empty_logger import EmptyLogger
 from instld.errors import RestartingCommandError, RunningCommandError
diff --git a/instld/module/context.py b/instld/module/context.py
@@ -36,9 +36,7 @@ def new_path(self, module_name):
         old_path = sys.path
         sys.path = [self.where] + copy.copy(self.original_path)
         if module_name in sys.modules:
-            old_module = sys.modules.pop(module_name)
-        else:
-            old_module = None
+            sys.modules.pop(module_name)
         yield
         sys.path = old_path
 
diff --git a/instld/module/context_manager.py b/instld/module/context_manager.py
@@ -3,7 +3,6 @@
 import tempfile
 from functools import partial
 
-from io import StringIO
 from contextlib import contextmanager
 
 from instld.errors import InstallingPackageError, RunningCommandError
@@ -52,8 +51,6 @@ def create_temp_directory():
                 new_error = InstallingPackageError(f'{str(e)} It occurred when installing one of the following packages: {", ".join(packages_names)}.')
                 new_error.stdout = e.stdout
                 new_error.stderr = e.stderr
-                #print('STDOUT', e.stdout)
-                #print('STDERR', e.stderr)
                 raise new_error from e
 
             yield Context(where, logger, catch_output, options, partial(pip_context, logger=logger, runner=runner, catch_output=catch_output, where=directory))
diff --git a/pre-commit_activate.sh b/pre-commit_activate.sh
@@ -0,0 +1,2 @@
+# Run it after the first clone of the repo.
+pre-commit install
diff --git a/pyproject.toml b/pyproject.toml
@@ -0,0 +1,38 @@
+[build-system]
+requires = ['setuptools==68.0.0']
+build-backend = 'setuptools.build_meta'
+
+[project]
+name = 'instld'
+version = '0.0.23'
+authors = [
+  { name='Evgeniy Blinov', email='zheni-b@yandex.ru' },
+]
+description = 'The simplest package management'
+readme = 'README.md'
+requires-python = '>=3.7'
+classifiers = [
+  'Operating System :: MacOS :: MacOS X',
+  'Operating System :: Microsoft :: Windows',
+  'Operating System :: POSIX',
+  'Programming Language :: Python :: 3.7',
+  'Programming Language :: Python :: 3.8',
+  'Programming Language :: Python :: 3.9',
+  'Programming Language :: Python :: 3.10',
+  'Programming Language :: Python :: 3.11',
+  'Programming Language :: Python :: 3.12',
+  'License :: OSI Approved :: MIT License',
+  'Topic :: Software Development :: Libraries',
+  'Topic :: Software Development :: Interpreters',
+  'Topic :: Utilities',
+  'Topic :: System :: Archiving :: Packaging',
+  'Intended Audience :: System Administrators',
+  'Intended Audience :: Developers',
+]
+
+[project.scripts]
+instld = 'instld.cli.main:main'
+
+[project.urls]
+'Source' = 'https://github.com/pomponchik/instld'
+'Tracker' = 'https://github.com/pomponchik/instld/issues'
diff --git a/requirements_dev.txt b/requirements_dev.txt
@@ -1,6 +1,9 @@
 pytest==7.4.1
 coverage==7.2.7
 twine==4.0.2
+build==0.9.0
 wheel==0.40.0
 pytest-timeout==2.1.0
 contextif==0.0.3
+ruff==0.0.290
+pre-commit
diff --git a/setup.py b/setup.py
diff --git a/tests/cli/test_cli.py b/tests/cli/test_cli.py
@@ -5,7 +5,6 @@
 import shutil
 
 import pytest
-from contextif import state
 
 
 @pytest.mark.timeout(180)
@@ -14,7 +13,7 @@ def test_cli_where(main_runner):
         rf'import is_odd  # instld: where {os.path.join("tests", "cli", "data", "pok")}',
         rf'import is_even  # instld: where {os.path.join("tests", "cli", "data", "chpok")}',
         'assert is_odd.valid(23)',
-        'assert is_even.isEven(1)',
+        'assert is_even.is_even(2)',
     ]
 
     script = os.path.join('tests', 'cli', 'data', 'main.py')
diff --git a/tests/units/cli/parsing_comments/test_get_options_from_comments.py b/tests/units/cli/parsing_comments/test_get_options_from_comments.py
@@ -16,13 +16,24 @@ def test_get_normal_options():
     assert options['cheburek'] == 'mek'
 
 
+# TODO: fix it!
+@pytest.mark.skip("I'll fix it later.")
+def test_real_options():
+    options = get_options_from_comments_by_frame(inspect.currentframe())  # instld: where tests/cli/data/pok, version 1.0.4
+
+    assert options == {
+        'where': 'tests/cli/data/pok',
+        'version': '1.0.4',
+    }
+
+
 def test_get_wrong_options():
     with pytest.raises(InstallingPackageError):
-        options = get_options_from_comments_by_frame(inspect.currentframe())  # instld: lol kek cheburek, cheburek mek
+        get_options_from_comments_by_frame(inspect.currentframe())  # instld: lol kek cheburek, cheburek mek
     with pytest.raises(InstallingPackageError):
-        options = get_options_from_comments_by_frame(inspect.currentframe())  # instld: lol
+        get_options_from_comments_by_frame(inspect.currentframe())  # instld: lol
     with pytest.raises(InstallingPackageError):
-        options = get_options_from_comments_by_frame(inspect.currentframe())  # instld:
+        get_options_from_comments_by_frame(inspect.currentframe())  # instld:
 
 
 def test_get_empty_options():
