Isolate tests that uses external_fixturepkg into a venv#783

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lieryan merged 5 commits into from
Mar 24, 2024
+69 −21
Merged

Isolate tests that uses external_fixturepkg into a venv #783

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ab931b7
Change unnecessary generator-based fixture to regular fixture
lieryan Mar 24, 2024
0d8fa6d
Isolate tests that uses external_fixturepkg into a venv
lieryan Mar 24, 2024
67edcd7
Fix venv Lib path for Windows
lieryan Mar 24, 2024
6bbef1e
Update CHANGELOG.md
lieryan Mar 24, 2024
aa0ffa6
Merge branch 'master' into lieryan-781-venv-isolate
lieryan Mar 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
# **Upcoming release**

- #781, #783 Isolate tests that uses external_fixturepkg into a venv
- #751 Check for ast.Attributes when finding occurrences in fstrings (@sandratsy)
- #777, #698 add validation to refuse Rename refactoring to a python keyword (@lieryan)
- #730 Match on module aliases for autoimport suggestions (@MrBago)
Expand Down
57 changes: 51 additions & 6 deletions ropetest/conftest.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,58 @@
import os
import pathlib
import sys
from subprocess import check_call
from venv import EnvBuilder

import pytest

from rope.base import resources
from ropetest import testutils


@pytest.fixture(scope="session")
def session_venv(tmpdir_factory):
path = tmpdir_factory.mktemp("venv")
venv_path = pathlib.Path(path)

builder = EnvBuilder(with_pip=True)
builder.create(venv_path)

yield venv_path


@pytest.fixture(scope="session")
def session_venv_pyvenv_cfg(session_venv):
cfg = session_venv / "pyvenv.cfg"
return dict(line.split(" = ") for line in cfg.read_text().splitlines())


@pytest.fixture(scope="session")
def session_venv_site_packages(session_venv, session_venv_pyvenv_cfg):
if os.name == 'nt':
return session_venv / f"Lib/site-packages"
else:
major, minor, patch = session_venv_pyvenv_cfg["version"].split(".")
return session_venv / f"lib/python{major}.{minor}/site-packages"


@pytest.fixture(scope='session')
def session_venv_python_executable(session_venv):
# Get the path to the Python executable inside the venv
if os.name == 'nt':
python_executable = session_venv / 'Scripts' / 'python.exe'
else:
python_executable = session_venv / 'bin' / 'python'

# Yield the Python executable path
yield python_executable


@pytest.fixture
def project():
project = testutils.sample_project()
def project(session_venv, session_venv_site_packages):
project = testutils.sample_project(
python_path=[str(session_venv_site_packages)],
)
yield project
testutils.remove_project(project)

Expand All@@ -21,8 +63,11 @@ def project_path(project):


@pytest.fixture
def project2():
project = testutils.sample_project("sample_project2")
def project2(session_venv):
project = testutils.sample_project(
"sample_project2",
python_path=[str(session_venv_site_packages)],
)
yield project
testutils.remove_project(project)

Expand DownExpand Up@@ -50,9 +95,9 @@ def mod2(project, pkg1) -> resources.Folder:


@pytest.fixture(scope="session")
def external_fixturepkg():
def external_fixturepkg(session_venv, session_venv_python_executable):
check_call([
sys.executable,
session_venv_python_executable,
"-m",
"pip",
"install",
Expand Down
29 changes: 16 additions & 13 deletions ropetest/contrib/autoimport/conftest.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,38 +8,41 @@
@pytest.fixture
def mod1(project):
mod1 = testutils.create_module(project, "mod1")
yield mod1
return mod1


@pytest.fixture
def mod1_path(mod1):
yield pathlib.Path(mod1.real_path)
return pathlib.Path(mod1.real_path)


@pytest.fixture
def typing_path():
import typing

yield pathlib.Path(typing.__file__)
return pathlib.Path(typing.__file__)


@pytest.fixture
def example_external_package_module_path(external_fixturepkg):
from external_fixturepkg import mod1
yield pathlib.Path(mod1.__file__)
def example_external_package_module_path(
session_venv,
external_fixturepkg,
session_venv_site_packages,
):
return session_venv_site_packages / "external_fixturepkg/mod1.py"


@pytest.fixture
def example_external_package_path(external_fixturepkg):
import external_fixturepkg

# Uses __init__.py so we need the parent

yield pathlib.Path(external_fixturepkg.__file__).parent
def example_external_package_path(
session_venv,
external_fixturepkg,
session_venv_site_packages,
):
return session_venv_site_packages / "external_fixturepkg"


@pytest.fixture
def compiled_lib():
import _sqlite3

yield "_sqlite3", pathlib.Path(_sqlite3.__file__)
return "_sqlite3", pathlib.Path(_sqlite3.__file__)
3 changes: 1 addition & 2 deletions ropetest/contrib/autoimporttest.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -177,8 +177,7 @@ def test_skipping_directories_not_accessible_because_of_permission_error(self):
self.assertGreater(len(self.importer._dump_all()), 0)


def test_search_submodule(external_fixturepkg):
project = testutils.sample_project(extension_modules=["sys"])
def test_search_submodule(project, external_fixturepkg):
importer = autoimport.AutoImport(project, observe=False)
importer.update_module("external_fixturepkg")
import_statement = ("from external_fixturepkg import mod1", "mod1")
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Isolate tests that uses external_fixturepkg into a venv#783

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

lieryan
merged 5 commits into

from

Mar 24, 2024

+69

−21

 Merged


Isolate tests that uses external_fixturepkg into a venv
#783
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
ab931b7

Change unnecessary generator-based fixture to regular fixture


lieryan Mar 24, 2024
0d8fa6d

Isolate tests that uses external_fixturepkg into a venv


lieryan Mar 24, 2024
67edcd7

Fix venv Lib path for Windows


lieryan Mar 24, 2024
6bbef1e

Update CHANGELOG.md


lieryan Mar 24, 2024
aa0ffa6

Merge branch 'master' into lieryan-781-venv-isolate


lieryan Mar 24, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
# **Upcoming release**

- #781, #783 Isolate tests that uses external_fixturepkg into a venv
- #751 Check for ast.Attributes when finding occurrences in fstrings (@sandratsy)
- #777, #698 add validation to refuse Rename refactoring to a python keyword (@lieryan)
- #730 Match on module aliases for autoimport suggestions (@MrBago)
Expand Down

57 changes: 51 additions & 6 deletions
ropetest/conftest.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,16 +1,58 @@
import os
import pathlib
import sys
from subprocess import check_call
from venv import EnvBuilder

import pytest

from rope.base import resources
from ropetest import testutils


@pytest.fixture(scope="session")
def session_venv(tmpdir_factory):
 path = tmpdir_factory.mktemp("venv")
 venv_path = pathlib.Path(path)

 builder = EnvBuilder(with_pip=True)
 builder.create(venv_path)

 yield venv_path


@pytest.fixture(scope="session")
def session_venv_pyvenv_cfg(session_venv):
 cfg = session_venv / "pyvenv.cfg"
 return dict(line.split(" = ") for line in cfg.read_text().splitlines())


@pytest.fixture(scope="session")
def session_venv_site_packages(session_venv, session_venv_pyvenv_cfg):
 if os.name == 'nt':
 return session_venv / f"Lib/site-packages"
 else:
 major, minor, patch = session_venv_pyvenv_cfg["version"].split(".")
 return session_venv / f"lib/python{major}.{minor}/site-packages"


@pytest.fixture(scope='session')
def session_venv_python_executable(session_venv):
 # Get the path to the Python executable inside the venv
 if os.name == 'nt':
 python_executable = session_venv / 'Scripts' / 'python.exe'
 else:
 python_executable = session_venv / 'bin' / 'python'

 # Yield the Python executable path
 yield python_executable


@pytest.fixture
def project():
 project = testutils.sample_project()
def project(session_venv, session_venv_site_packages):
 project = testutils.sample_project(
 python_path=[str(session_venv_site_packages)],
 )
 yield project
 testutils.remove_project(project)

Expand All@@ -21,8 +63,11 @@ def project_path(project):


@pytest.fixture
def project2():
 project = testutils.sample_project("sample_project2")
def project2(session_venv):
 project = testutils.sample_project(
 "sample_project2",
 python_path=[str(session_venv_site_packages)],
 )
 yield project
 testutils.remove_project(project)

Expand DownExpand Up@@ -50,9 +95,9 @@ def mod2(project, pkg1) -> resources.Folder:


@pytest.fixture(scope="session")
def external_fixturepkg():
def external_fixturepkg(session_venv, session_venv_python_executable):
 check_call([
sys.executable,
session_venv_python_executable,
 "-m",
 "pip",
 "install",
Expand Down

29 changes: 16 additions & 13 deletions
ropetest/contrib/autoimport/conftest.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,38 +8,41 @@
@pytest.fixture
def mod1(project):
 mod1 = testutils.create_module(project, "mod1")
yield mod1
return mod1


@pytest.fixture
def mod1_path(mod1):
yield pathlib.Path(mod1.real_path)
return pathlib.Path(mod1.real_path)


@pytest.fixture
def typing_path():
 import typing

yield pathlib.Path(typing.__file__)
return pathlib.Path(typing.__file__)


@pytest.fixture
def example_external_package_module_path(external_fixturepkg):
 from external_fixturepkg import mod1
 yield pathlib.Path(mod1.__file__)
def example_external_package_module_path(
 session_venv,
 external_fixturepkg,
 session_venv_site_packages,
):
 return session_venv_site_packages / "external_fixturepkg/mod1.py"


@pytest.fixture
def example_external_package_path(external_fixturepkg):
import external_fixturepkg

# Uses __init__.py so we need the parent

yield pathlib.Path(external_fixturepkg.__file__).parent
def example_external_package_path(
session_venv,
 external_fixturepkg,
session_venv_site_packages,
):
return session_venv_site_packages / "external_fixturepkg"


@pytest.fixture
def compiled_lib():
 import _sqlite3

yield "_sqlite3", pathlib.Path(_sqlite3.__file__)
return "_sqlite3", pathlib.Path(_sqlite3.__file__)

3 changes: 1 addition & 2 deletions
ropetest/contrib/autoimporttest.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -177,8 +177,7 @@ def test_skipping_directories_not_accessible_because_of_permission_error(self):
 self.assertGreater(len(self.importer._dump_all()), 0)


def test_search_submodule(external_fixturepkg):
 project = testutils.sample_project(extension_modules=["sys"])
def test_search_submodule(project, external_fixturepkg):
 importer = autoimport.AutoImport(project, observe=False)
 importer.update_module("external_fixturepkg")
 import_statement = ("from external_fixturepkg import mod1", "mod1")
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Isolate tests that uses external_fixturepkg into a venv#783

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

lieryan
merged 5 commits into

from

Mar 24, 2024

+69

−21

 Merged


Isolate tests that uses external_fixturepkg into a venv
#783
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
ab931b7

Change unnecessary generator-based fixture to regular fixture


lieryan Mar 24, 2024
0d8fa6d

Isolate tests that uses external_fixturepkg into a venv


lieryan Mar 24, 2024
67edcd7

Fix venv Lib path for Windows


lieryan Mar 24, 2024
6bbef1e

Update CHANGELOG.md


lieryan Mar 24, 2024
aa0ffa6

Merge branch 'master' into lieryan-781-venv-isolate


lieryan Mar 24, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
# **Upcoming release**

- #781, #783 Isolate tests that uses external_fixturepkg into a venv
- #751 Check for ast.Attributes when finding occurrences in fstrings (@sandratsy)
- #777, #698 add validation to refuse Rename refactoring to a python keyword (@lieryan)
- #730 Match on module aliases for autoimport suggestions (@MrBago)
Expand Down

57 changes: 51 additions & 6 deletions
ropetest/conftest.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,16 +1,58 @@
import os
import pathlib
import sys
from subprocess import check_call
from venv import EnvBuilder

import pytest

from rope.base import resources
from ropetest import testutils


@pytest.fixture(scope="session")
def session_venv(tmpdir_factory):
 path = tmpdir_factory.mktemp("venv")
 venv_path = pathlib.Path(path)

 builder = EnvBuilder(with_pip=True)
 builder.create(venv_path)

 yield venv_path


@pytest.fixture(scope="session")
def session_venv_pyvenv_cfg(session_venv):
 cfg = session_venv / "pyvenv.cfg"
 return dict(line.split(" = ") for line in cfg.read_text().splitlines())


@pytest.fixture(scope="session")
def session_venv_site_packages(session_venv, session_venv_pyvenv_cfg):
 if os.name == 'nt':
 return session_venv / f"Lib/site-packages"
 else:
 major, minor, patch = session_venv_pyvenv_cfg["version"].split(".")
 return session_venv / f"lib/python{major}.{minor}/site-packages"


@pytest.fixture(scope='session')
def session_venv_python_executable(session_venv):
 # Get the path to the Python executable inside the venv
 if os.name == 'nt':
 python_executable = session_venv / 'Scripts' / 'python.exe'
 else:
 python_executable = session_venv / 'bin' / 'python'

 # Yield the Python executable path
 yield python_executable


@pytest.fixture
def project():
 project = testutils.sample_project()
def project(session_venv, session_venv_site_packages):
 project = testutils.sample_project(
 python_path=[str(session_venv_site_packages)],
 )
 yield project
 testutils.remove_project(project)

Expand All@@ -21,8 +63,11 @@ def project_path(project):


@pytest.fixture
def project2():
 project = testutils.sample_project("sample_project2")
def project2(session_venv):
 project = testutils.sample_project(
 "sample_project2",
 python_path=[str(session_venv_site_packages)],
 )
 yield project
 testutils.remove_project(project)

Expand DownExpand Up@@ -50,9 +95,9 @@ def mod2(project, pkg1) -> resources.Folder:


@pytest.fixture(scope="session")
def external_fixturepkg():
def external_fixturepkg(session_venv, session_venv_python_executable):
 check_call([
sys.executable,
session_venv_python_executable,
 "-m",
 "pip",
 "install",
Expand Down

29 changes: 16 additions & 13 deletions
ropetest/contrib/autoimport/conftest.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,38 +8,41 @@
@pytest.fixture
def mod1(project):
 mod1 = testutils.create_module(project, "mod1")
yield mod1
return mod1


@pytest.fixture
def mod1_path(mod1):
yield pathlib.Path(mod1.real_path)
return pathlib.Path(mod1.real_path)


@pytest.fixture
def typing_path():
 import typing

yield pathlib.Path(typing.__file__)
return pathlib.Path(typing.__file__)


@pytest.fixture
def example_external_package_module_path(external_fixturepkg):
 from external_fixturepkg import mod1
 yield pathlib.Path(mod1.__file__)
def example_external_package_module_path(
 session_venv,
 external_fixturepkg,
 session_venv_site_packages,
):
 return session_venv_site_packages / "external_fixturepkg/mod1.py"


@pytest.fixture
def example_external_package_path(external_fixturepkg):
import external_fixturepkg

# Uses __init__.py so we need the parent

yield pathlib.Path(external_fixturepkg.__file__).parent
def example_external_package_path(
session_venv,
 external_fixturepkg,
session_venv_site_packages,
):
return session_venv_site_packages / "external_fixturepkg"


@pytest.fixture
def compiled_lib():
 import _sqlite3

yield "_sqlite3", pathlib.Path(_sqlite3.__file__)
return "_sqlite3", pathlib.Path(_sqlite3.__file__)

3 changes: 1 addition & 2 deletions
ropetest/contrib/autoimporttest.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -177,8 +177,7 @@ def test_skipping_directories_not_accessible_because_of_permission_error(self):
 self.assertGreater(len(self.importer._dump_all()), 0)


def test_search_submodule(external_fixturepkg):
 project = testutils.sample_project(extension_modules=["sys"])
def test_search_submodule(project, external_fixturepkg):
 importer = autoimport.AutoImport(project, observe=False)
 importer.update_module("external_fixturepkg")
 import_statement = ("from external_fixturepkg import mod1", "mod1")
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Isolate tests that uses external_fixturepkg into a venv#783

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

lieryan
merged 5 commits into

from

Mar 24, 2024

+69

−21

 Merged


Isolate tests that uses external_fixturepkg into a venv
#783
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
ab931b7

Change unnecessary generator-based fixture to regular fixture


lieryan Mar 24, 2024
0d8fa6d

Isolate tests that uses external_fixturepkg into a venv


lieryan Mar 24, 2024
67edcd7

Fix venv Lib path for Windows


lieryan Mar 24, 2024
6bbef1e

Update CHANGELOG.md


lieryan Mar 24, 2024
aa0ffa6

Merge branch 'master' into lieryan-781-venv-isolate


lieryan Mar 24, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
# **Upcoming release**

- #781, #783 Isolate tests that uses external_fixturepkg into a venv
- #751 Check for ast.Attributes when finding occurrences in fstrings (@sandratsy)
- #777, #698 add validation to refuse Rename refactoring to a python keyword (@lieryan)
- #730 Match on module aliases for autoimport suggestions (@MrBago)
Expand Down

57 changes: 51 additions & 6 deletions
ropetest/conftest.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,16 +1,58 @@
import os
import pathlib
import sys
from subprocess import check_call
from venv import EnvBuilder

import pytest

from rope.base import resources
from ropetest import testutils


@pytest.fixture(scope="session")
def session_venv(tmpdir_factory):
 path = tmpdir_factory.mktemp("venv")
 venv_path = pathlib.Path(path)

 builder = EnvBuilder(with_pip=True)
 builder.create(venv_path)

 yield venv_path


@pytest.fixture(scope="session")
def session_venv_pyvenv_cfg(session_venv):
 cfg = session_venv / "pyvenv.cfg"
 return dict(line.split(" = ") for line in cfg.read_text().splitlines())


@pytest.fixture(scope="session")
def session_venv_site_packages(session_venv, session_venv_pyvenv_cfg):
 if os.name == 'nt':
 return session_venv / f"Lib/site-packages"
 else:
 major, minor, patch = session_venv_pyvenv_cfg["version"].split(".")
 return session_venv / f"lib/python{major}.{minor}/site-packages"


@pytest.fixture(scope='session')
def session_venv_python_executable(session_venv):
 # Get the path to the Python executable inside the venv
 if os.name == 'nt':
 python_executable = session_venv / 'Scripts' / 'python.exe'
 else:
 python_executable = session_venv / 'bin' / 'python'

 # Yield the Python executable path
 yield python_executable


@pytest.fixture
def project():
 project = testutils.sample_project()
def project(session_venv, session_venv_site_packages):
 project = testutils.sample_project(
 python_path=[str(session_venv_site_packages)],
 )
 yield project
 testutils.remove_project(project)

Expand All@@ -21,8 +63,11 @@ def project_path(project):


@pytest.fixture
def project2():
 project = testutils.sample_project("sample_project2")
def project2(session_venv):
 project = testutils.sample_project(
 "sample_project2",
 python_path=[str(session_venv_site_packages)],
 )
 yield project
 testutils.remove_project(project)

Expand DownExpand Up@@ -50,9 +95,9 @@ def mod2(project, pkg1) -> resources.Folder:


@pytest.fixture(scope="session")
def external_fixturepkg():
def external_fixturepkg(session_venv, session_venv_python_executable):
 check_call([
sys.executable,
session_venv_python_executable,
 "-m",
 "pip",
 "install",
Expand Down

29 changes: 16 additions & 13 deletions
ropetest/contrib/autoimport/conftest.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,38 +8,41 @@
@pytest.fixture
def mod1(project):
 mod1 = testutils.create_module(project, "mod1")
yield mod1
return mod1


@pytest.fixture
def mod1_path(mod1):
yield pathlib.Path(mod1.real_path)
return pathlib.Path(mod1.real_path)


@pytest.fixture
def typing_path():
 import typing

yield pathlib.Path(typing.__file__)
return pathlib.Path(typing.__file__)


@pytest.fixture
def example_external_package_module_path(external_fixturepkg):
 from external_fixturepkg import mod1
 yield pathlib.Path(mod1.__file__)
def example_external_package_module_path(
 session_venv,
 external_fixturepkg,
 session_venv_site_packages,
):
 return session_venv_site_packages / "external_fixturepkg/mod1.py"


@pytest.fixture
def example_external_package_path(external_fixturepkg):
import external_fixturepkg

# Uses __init__.py so we need the parent

yield pathlib.Path(external_fixturepkg.__file__).parent
def example_external_package_path(
session_venv,
 external_fixturepkg,
session_venv_site_packages,
):
return session_venv_site_packages / "external_fixturepkg"


@pytest.fixture
def compiled_lib():
 import _sqlite3

yield "_sqlite3", pathlib.Path(_sqlite3.__file__)
return "_sqlite3", pathlib.Path(_sqlite3.__file__)

3 changes: 1 addition & 2 deletions
ropetest/contrib/autoimporttest.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -177,8 +177,7 @@ def test_skipping_directories_not_accessible_because_of_permission_error(self):
 self.assertGreater(len(self.importer._dump_all()), 0)


def test_search_submodule(external_fixturepkg):
 project = testutils.sample_project(extension_modules=["sys"])
def test_search_submodule(project, external_fixturepkg):
 importer = autoimport.AutoImport(project, observe=False)
 importer.update_module("external_fixturepkg")
 import_statement = ("from external_fixturepkg import mod1", "mod1")
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Isolate tests that uses external_fixturepkg into a venv#783

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

lieryan
merged 5 commits into

from

Mar 24, 2024

+69

−21

 Merged


Isolate tests that uses external_fixturepkg into a venv
#783
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
ab931b7

Change unnecessary generator-based fixture to regular fixture


lieryan Mar 24, 2024
0d8fa6d

Isolate tests that uses external_fixturepkg into a venv


lieryan Mar 24, 2024
67edcd7

Fix venv Lib path for Windows


lieryan Mar 24, 2024
6bbef1e

Update CHANGELOG.md


lieryan Mar 24, 2024
aa0ffa6

Merge branch 'master' into lieryan-781-venv-isolate


lieryan Mar 24, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
# **Upcoming release**

- #781, #783 Isolate tests that uses external_fixturepkg into a venv
- #751 Check for ast.Attributes when finding occurrences in fstrings (@sandratsy)
- #777, #698 add validation to refuse Rename refactoring to a python keyword (@lieryan)
- #730 Match on module aliases for autoimport suggestions (@MrBago)
Expand Down

57 changes: 51 additions & 6 deletions
ropetest/conftest.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,16 +1,58 @@
import os
import pathlib
import sys
from subprocess import check_call
from venv import EnvBuilder

import pytest

from rope.base import resources
from ropetest import testutils


@pytest.fixture(scope="session")
def session_venv(tmpdir_factory):
 path = tmpdir_factory.mktemp("venv")
 venv_path = pathlib.Path(path)

 builder = EnvBuilder(with_pip=True)
 builder.create(venv_path)

 yield venv_path


@pytest.fixture(scope="session")
def session_venv_pyvenv_cfg(session_venv):
 cfg = session_venv / "pyvenv.cfg"
 return dict(line.split(" = ") for line in cfg.read_text().splitlines())


@pytest.fixture(scope="session")
def session_venv_site_packages(session_venv, session_venv_pyvenv_cfg):
 if os.name == 'nt':
 return session_venv / f"Lib/site-packages"
 else:
 major, minor, patch = session_venv_pyvenv_cfg["version"].split(".")
 return session_venv / f"lib/python{major}.{minor}/site-packages"


@pytest.fixture(scope='session')
def session_venv_python_executable(session_venv):
 # Get the path to the Python executable inside the venv
 if os.name == 'nt':
 python_executable = session_venv / 'Scripts' / 'python.exe'
 else:
 python_executable = session_venv / 'bin' / 'python'

 # Yield the Python executable path
 yield python_executable


@pytest.fixture
def project():
 project = testutils.sample_project()
def project(session_venv, session_venv_site_packages):
 project = testutils.sample_project(
 python_path=[str(session_venv_site_packages)],
 )
 yield project
 testutils.remove_project(project)

Expand All@@ -21,8 +63,11 @@ def project_path(project):


@pytest.fixture
def project2():
 project = testutils.sample_project("sample_project2")
def project2(session_venv):
 project = testutils.sample_project(
 "sample_project2",
 python_path=[str(session_venv_site_packages)],
 )
 yield project
 testutils.remove_project(project)

Expand DownExpand Up@@ -50,9 +95,9 @@ def mod2(project, pkg1) -> resources.Folder:


@pytest.fixture(scope="session")
def external_fixturepkg():
def external_fixturepkg(session_venv, session_venv_python_executable):
 check_call([
sys.executable,
session_venv_python_executable,
 "-m",
 "pip",
 "install",
Expand Down

29 changes: 16 additions & 13 deletions
ropetest/contrib/autoimport/conftest.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,38 +8,41 @@
@pytest.fixture
def mod1(project):
 mod1 = testutils.create_module(project, "mod1")
yield mod1
return mod1


@pytest.fixture
def mod1_path(mod1):
yield pathlib.Path(mod1.real_path)
return pathlib.Path(mod1.real_path)


@pytest.fixture
def typing_path():
 import typing

yield pathlib.Path(typing.__file__)
return pathlib.Path(typing.__file__)


@pytest.fixture
def example_external_package_module_path(external_fixturepkg):
 from external_fixturepkg import mod1
 yield pathlib.Path(mod1.__file__)
def example_external_package_module_path(
 session_venv,
 external_fixturepkg,
 session_venv_site_packages,
):
 return session_venv_site_packages / "external_fixturepkg/mod1.py"


@pytest.fixture
def example_external_package_path(external_fixturepkg):
import external_fixturepkg

# Uses __init__.py so we need the parent

yield pathlib.Path(external_fixturepkg.__file__).parent
def example_external_package_path(
session_venv,
 external_fixturepkg,
session_venv_site_packages,
):
return session_venv_site_packages / "external_fixturepkg"


@pytest.fixture
def compiled_lib():
 import _sqlite3

yield "_sqlite3", pathlib.Path(_sqlite3.__file__)
return "_sqlite3", pathlib.Path(_sqlite3.__file__)

3 changes: 1 addition & 2 deletions
ropetest/contrib/autoimporttest.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -177,8 +177,7 @@ def test_skipping_directories_not_accessible_because_of_permission_error(self):
 self.assertGreater(len(self.importer._dump_all()), 0)


def test_search_submodule(external_fixturepkg):
 project = testutils.sample_project(extension_modules=["sys"])
def test_search_submodule(project, external_fixturepkg):
 importer = autoimport.AutoImport(project, observe=False)
 importer.update_module("external_fixturepkg")
 import_statement = ("from external_fixturepkg import mod1", "mod1")
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Isolate tests that uses external_fixturepkg into a venv#783

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

lieryan
merged 5 commits into

from

Mar 24, 2024

+69

−21

 Merged


Isolate tests that uses external_fixturepkg into a venv
#783
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
ab931b7

Change unnecessary generator-based fixture to regular fixture


lieryan Mar 24, 2024
0d8fa6d

Isolate tests that uses external_fixturepkg into a venv


lieryan Mar 24, 2024
67edcd7

Fix venv Lib path for Windows


lieryan Mar 24, 2024
6bbef1e

Update CHANGELOG.md


lieryan Mar 24, 2024
aa0ffa6

Merge branch 'master' into lieryan-781-venv-isolate


lieryan Mar 24, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
# **Upcoming release**

- #781, #783 Isolate tests that uses external_fixturepkg into a venv
- #751 Check for ast.Attributes when finding occurrences in fstrings (@sandratsy)
- #777, #698 add validation to refuse Rename refactoring to a python keyword (@lieryan)
- #730 Match on module aliases for autoimport suggestions (@MrBago)
Expand Down

57 changes: 51 additions & 6 deletions
ropetest/conftest.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,16 +1,58 @@
import os
import pathlib
import sys
from subprocess import check_call
from venv import EnvBuilder

import pytest

from rope.base import resources
from ropetest import testutils


@pytest.fixture(scope="session")
def session_venv(tmpdir_factory):
 path = tmpdir_factory.mktemp("venv")
 venv_path = pathlib.Path(path)

 builder = EnvBuilder(with_pip=True)
 builder.create(venv_path)

 yield venv_path


@pytest.fixture(scope="session")
def session_venv_pyvenv_cfg(session_venv):
 cfg = session_venv / "pyvenv.cfg"
 return dict(line.split(" = ") for line in cfg.read_text().splitlines())


@pytest.fixture(scope="session")
def session_venv_site_packages(session_venv, session_venv_pyvenv_cfg):
 if os.name == 'nt':
 return session_venv / f"Lib/site-packages"
 else:
 major, minor, patch = session_venv_pyvenv_cfg["version"].split(".")
 return session_venv / f"lib/python{major}.{minor}/site-packages"


@pytest.fixture(scope='session')
def session_venv_python_executable(session_venv):
 # Get the path to the Python executable inside the venv
 if os.name == 'nt':
 python_executable = session_venv / 'Scripts' / 'python.exe'
 else:
 python_executable = session_venv / 'bin' / 'python'

 # Yield the Python executable path
 yield python_executable


@pytest.fixture
def project():
 project = testutils.sample_project()
def project(session_venv, session_venv_site_packages):
 project = testutils.sample_project(
 python_path=[str(session_venv_site_packages)],
 )
 yield project
 testutils.remove_project(project)

Expand All@@ -21,8 +63,11 @@ def project_path(project):


@pytest.fixture
def project2():
 project = testutils.sample_project("sample_project2")
def project2(session_venv):
 project = testutils.sample_project(
 "sample_project2",
 python_path=[str(session_venv_site_packages)],
 )
 yield project
 testutils.remove_project(project)

Expand DownExpand Up@@ -50,9 +95,9 @@ def mod2(project, pkg1) -> resources.Folder:


@pytest.fixture(scope="session")
def external_fixturepkg():
def external_fixturepkg(session_venv, session_venv_python_executable):
 check_call([
sys.executable,
session_venv_python_executable,
 "-m",
 "pip",
 "install",
Expand Down

29 changes: 16 additions & 13 deletions
ropetest/contrib/autoimport/conftest.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,38 +8,41 @@
@pytest.fixture
def mod1(project):
 mod1 = testutils.create_module(project, "mod1")
yield mod1
return mod1


@pytest.fixture
def mod1_path(mod1):
yield pathlib.Path(mod1.real_path)
return pathlib.Path(mod1.real_path)


@pytest.fixture
def typing_path():
 import typing

yield pathlib.Path(typing.__file__)
return pathlib.Path(typing.__file__)


@pytest.fixture
def example_external_package_module_path(external_fixturepkg):
 from external_fixturepkg import mod1
 yield pathlib.Path(mod1.__file__)
def example_external_package_module_path(
 session_venv,
 external_fixturepkg,
 session_venv_site_packages,
):
 return session_venv_site_packages / "external_fixturepkg/mod1.py"


@pytest.fixture
def example_external_package_path(external_fixturepkg):
import external_fixturepkg

# Uses __init__.py so we need the parent

yield pathlib.Path(external_fixturepkg.__file__).parent
def example_external_package_path(
session_venv,
 external_fixturepkg,
session_venv_site_packages,
):
return session_venv_site_packages / "external_fixturepkg"


@pytest.fixture
def compiled_lib():
 import _sqlite3

yield "_sqlite3", pathlib.Path(_sqlite3.__file__)
return "_sqlite3", pathlib.Path(_sqlite3.__file__)

3 changes: 1 addition & 2 deletions
ropetest/contrib/autoimporttest.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -177,8 +177,7 @@ def test_skipping_directories_not_accessible_because_of_permission_error(self):
 self.assertGreater(len(self.importer._dump_all()), 0)


def test_search_submodule(external_fixturepkg):
 project = testutils.sample_project(extension_modules=["sys"])
def test_search_submodule(project, external_fixturepkg):
 importer = autoimport.AutoImport(project, observe=False)
 importer.update_module("external_fixturepkg")
 import_statement = ("from external_fixturepkg import mod1", "mod1")
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Isolate tests that uses external_fixturepkg into a venv#783

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

lieryan
merged 5 commits into

from

Mar 24, 2024

+69

−21

 Merged


Isolate tests that uses external_fixturepkg into a venv
#783
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
ab931b7

Change unnecessary generator-based fixture to regular fixture


lieryan Mar 24, 2024
0d8fa6d

Isolate tests that uses external_fixturepkg into a venv


lieryan Mar 24, 2024
67edcd7

Fix venv Lib path for Windows


lieryan Mar 24, 2024
6bbef1e

Update CHANGELOG.md


lieryan Mar 24, 2024
aa0ffa6

Merge branch 'master' into lieryan-781-venv-isolate


lieryan Mar 24, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
# **Upcoming release**

- #781, #783 Isolate tests that uses external_fixturepkg into a venv
- #751 Check for ast.Attributes when finding occurrences in fstrings (@sandratsy)
- #777, #698 add validation to refuse Rename refactoring to a python keyword (@lieryan)
- #730 Match on module aliases for autoimport suggestions (@MrBago)
Expand Down

57 changes: 51 additions & 6 deletions
ropetest/conftest.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,16 +1,58 @@
import os
import pathlib
import sys
from subprocess import check_call
from venv import EnvBuilder

import pytest

from rope.base import resources
from ropetest import testutils


@pytest.fixture(scope="session")
def session_venv(tmpdir_factory):
 path = tmpdir_factory.mktemp("venv")
 venv_path = pathlib.Path(path)

 builder = EnvBuilder(with_pip=True)
 builder.create(venv_path)

 yield venv_path


@pytest.fixture(scope="session")
def session_venv_pyvenv_cfg(session_venv):
 cfg = session_venv / "pyvenv.cfg"
 return dict(line.split(" = ") for line in cfg.read_text().splitlines())


@pytest.fixture(scope="session")
def session_venv_site_packages(session_venv, session_venv_pyvenv_cfg):
 if os.name == 'nt':
 return session_venv / f"Lib/site-packages"
 else:
 major, minor, patch = session_venv_pyvenv_cfg["version"].split(".")
 return session_venv / f"lib/python{major}.{minor}/site-packages"


@pytest.fixture(scope='session')
def session_venv_python_executable(session_venv):
 # Get the path to the Python executable inside the venv
 if os.name == 'nt':
 python_executable = session_venv / 'Scripts' / 'python.exe'
 else:
 python_executable = session_venv / 'bin' / 'python'

 # Yield the Python executable path
 yield python_executable


@pytest.fixture
def project():
 project = testutils.sample_project()
def project(session_venv, session_venv_site_packages):
 project = testutils.sample_project(
 python_path=[str(session_venv_site_packages)],
 )
 yield project
 testutils.remove_project(project)

Expand All@@ -21,8 +63,11 @@ def project_path(project):


@pytest.fixture
def project2():
 project = testutils.sample_project("sample_project2")
def project2(session_venv):
 project = testutils.sample_project(
 "sample_project2",
 python_path=[str(session_venv_site_packages)],
 )
 yield project
 testutils.remove_project(project)

Expand DownExpand Up@@ -50,9 +95,9 @@ def mod2(project, pkg1) -> resources.Folder:


@pytest.fixture(scope="session")
def external_fixturepkg():
def external_fixturepkg(session_venv, session_venv_python_executable):
 check_call([
sys.executable,
session_venv_python_executable,
 "-m",
 "pip",
 "install",
Expand Down

29 changes: 16 additions & 13 deletions
ropetest/contrib/autoimport/conftest.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,38 +8,41 @@
@pytest.fixture
def mod1(project):
 mod1 = testutils.create_module(project, "mod1")
yield mod1
return mod1


@pytest.fixture
def mod1_path(mod1):
yield pathlib.Path(mod1.real_path)
return pathlib.Path(mod1.real_path)


@pytest.fixture
def typing_path():
 import typing

yield pathlib.Path(typing.__file__)
return pathlib.Path(typing.__file__)


@pytest.fixture
def example_external_package_module_path(external_fixturepkg):
 from external_fixturepkg import mod1
 yield pathlib.Path(mod1.__file__)
def example_external_package_module_path(
 session_venv,
 external_fixturepkg,
 session_venv_site_packages,
):
 return session_venv_site_packages / "external_fixturepkg/mod1.py"


@pytest.fixture
def example_external_package_path(external_fixturepkg):
import external_fixturepkg

# Uses __init__.py so we need the parent

yield pathlib.Path(external_fixturepkg.__file__).parent
def example_external_package_path(
session_venv,
 external_fixturepkg,
session_venv_site_packages,
):
return session_venv_site_packages / "external_fixturepkg"


@pytest.fixture
def compiled_lib():
 import _sqlite3

yield "_sqlite3", pathlib.Path(_sqlite3.__file__)
return "_sqlite3", pathlib.Path(_sqlite3.__file__)

3 changes: 1 addition & 2 deletions
ropetest/contrib/autoimporttest.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -177,8 +177,7 @@ def test_skipping_directories_not_accessible_because_of_permission_error(self):
 self.assertGreater(len(self.importer._dump_all()), 0)


def test_search_submodule(external_fixturepkg):
 project = testutils.sample_project(extension_modules=["sys"])
def test_search_submodule(project, external_fixturepkg):
 importer = autoimport.AutoImport(project, observe=False)
 importer.update_module("external_fixturepkg")
 import_statement = ("from external_fixturepkg import mod1", "mod1")
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Isolate tests that uses external_fixturepkg into a venv#783

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

lieryan
merged 5 commits into

from

Mar 24, 2024

+69

−21

 Merged


Isolate tests that uses external_fixturepkg into a venv
#783
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
ab931b7

Change unnecessary generator-based fixture to regular fixture


lieryan Mar 24, 2024
0d8fa6d

Isolate tests that uses external_fixturepkg into a venv


lieryan Mar 24, 2024
67edcd7

Fix venv Lib path for Windows


lieryan Mar 24, 2024
6bbef1e

Update CHANGELOG.md


lieryan Mar 24, 2024
aa0ffa6

Merge branch 'master' into lieryan-781-venv-isolate


lieryan Mar 24, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
CHANGELOG.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
# **Upcoming release**

- #781, #783 Isolate tests that uses external_fixturepkg into a venv
- #751 Check for ast.Attributes when finding occurrences in fstrings (@sandratsy)
- #777, #698 add validation to refuse Rename refactoring to a python keyword (@lieryan)
- #730 Match on module aliases for autoimport suggestions (@MrBago)
Expand Down

57 changes: 51 additions & 6 deletions
ropetest/conftest.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,16 +1,58 @@
import os
import pathlib
import sys
from subprocess import check_call
from venv import EnvBuilder

import pytest

from rope.base import resources
from ropetest import testutils


@pytest.fixture(scope="session")
def session_venv(tmpdir_factory):
 path = tmpdir_factory.mktemp("venv")
 venv_path = pathlib.Path(path)

 builder = EnvBuilder(with_pip=True)
 builder.create(venv_path)

 yield venv_path


@pytest.fixture(scope="session")
def session_venv_pyvenv_cfg(session_venv):
 cfg = session_venv / "pyvenv.cfg"
 return dict(line.split(" = ") for line in cfg.read_text().splitlines())


@pytest.fixture(scope="session")
def session_venv_site_packages(session_venv, session_venv_pyvenv_cfg):
 if os.name == 'nt':
 return session_venv / f"Lib/site-packages"
 else:
 major, minor, patch = session_venv_pyvenv_cfg["version"].split(".")
 return session_venv / f"lib/python{major}.{minor}/site-packages"


@pytest.fixture(scope='session')
def session_venv_python_executable(session_venv):
 # Get the path to the Python executable inside the venv
 if os.name == 'nt':
 python_executable = session_venv / 'Scripts' / 'python.exe'
 else:
 python_executable = session_venv / 'bin' / 'python'

 # Yield the Python executable path
 yield python_executable


@pytest.fixture
def project():
 project = testutils.sample_project()
def project(session_venv, session_venv_site_packages):
 project = testutils.sample_project(
 python_path=[str(session_venv_site_packages)],
 )
 yield project
 testutils.remove_project(project)

Expand All@@ -21,8 +63,11 @@ def project_path(project):


@pytest.fixture
def project2():
 project = testutils.sample_project("sample_project2")
def project2(session_venv):
 project = testutils.sample_project(
 "sample_project2",
 python_path=[str(session_venv_site_packages)],
 )
 yield project
 testutils.remove_project(project)

Expand DownExpand Up@@ -50,9 +95,9 @@ def mod2(project, pkg1) -> resources.Folder:


@pytest.fixture(scope="session")
def external_fixturepkg():
def external_fixturepkg(session_venv, session_venv_python_executable):
 check_call([
sys.executable,
session_venv_python_executable,
 "-m",
 "pip",
 "install",
Expand Down

29 changes: 16 additions & 13 deletions
ropetest/contrib/autoimport/conftest.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,38 +8,41 @@
@pytest.fixture
def mod1(project):
 mod1 = testutils.create_module(project, "mod1")
yield mod1
return mod1


@pytest.fixture
def mod1_path(mod1):
yield pathlib.Path(mod1.real_path)
return pathlib.Path(mod1.real_path)


@pytest.fixture
def typing_path():
 import typing

yield pathlib.Path(typing.__file__)
return pathlib.Path(typing.__file__)


@pytest.fixture
def example_external_package_module_path(external_fixturepkg):
 from external_fixturepkg import mod1
 yield pathlib.Path(mod1.__file__)
def example_external_package_module_path(
 session_venv,
 external_fixturepkg,
 session_venv_site_packages,
):
 return session_venv_site_packages / "external_fixturepkg/mod1.py"


@pytest.fixture
def example_external_package_path(external_fixturepkg):
import external_fixturepkg

# Uses __init__.py so we need the parent

yield pathlib.Path(external_fixturepkg.__file__).parent
def example_external_package_path(
session_venv,
 external_fixturepkg,
session_venv_site_packages,
):
return session_venv_site_packages / "external_fixturepkg"


@pytest.fixture
def compiled_lib():
 import _sqlite3

yield "_sqlite3", pathlib.Path(_sqlite3.__file__)
return "_sqlite3", pathlib.Path(_sqlite3.__file__)

3 changes: 1 addition & 2 deletions
ropetest/contrib/autoimporttest.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -177,8 +177,7 @@ def test_skipping_directories_not_accessible_because_of_permission_error(self):
 self.assertGreater(len(self.importer._dump_all()), 0)


def test_search_submodule(external_fixturepkg):
 project = testutils.sample_project(extension_modules=["sys"])
def test_search_submodule(project, external_fixturepkg):
 importer = autoimport.AutoImport(project, observe=False)
 importer.update_module("external_fixturepkg")
 import_statement = ("from external_fixturepkg import mod1", "mod1")
Expand Down