add windows and mac CI#481

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 18 commits into from
Jun 17, 2022
Merged

add windows and mac CI #481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
94a230f
add windows and mac CI
bagel897 Jun 2, 2022
7c930cc
update checkout and setup to v3
bagel897 Jun 2, 2022
46d5119
fix: update package tuple function
bagel897 Jun 3, 2022
1891a0f
blacken
bagel897 Jun 4, 2022
c34b4db
skip on windows
bagel897 Jun 5, 2022
81031bd
Merge branch 'master' into patch-1
lieryan Jun 7, 2022
36f5a2a
Merge branch 'master' into patch-1
lieryan Jun 8, 2022
4d40e72
Resolve merge conflict
lieryan Jun 8, 2022
ae78c85
Merge branch 'master' into patch-1
lieryan Jun 8, 2022
4b4f62f
resolve() path name
lieryan Jun 8, 2022
b820645
Don't use nested function as this can't be pickled under certain fork…
lieryan Jun 14, 2022
0760ac9
Merge branch 'master' into patch-1
lieryan Jun 14, 2022
29c21c3
Remove "Dump event info" section
lieryan Jun 14, 2022
647b2df
skip fixture on windows
bagel897 Jun 14, 2022
0717dc7
return None on windows
bagel897 Jun 14, 2022
b9561b0
rename windows to win32
bagel897 Jun 15, 2022
be03174
skip properly
bagel897 Jun 15, 2022
d78f1e5
Merge branch 'master' into patch-1
bagel897 Jun 15, 2022
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
15 changes: 3 additions & 12 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,12 +4,13 @@ on: [push, pull_request]

jobs:
test:
name: Test - ${{ matrix.python-version }}
runs-on: ubuntu-latest
name: Test - ${{ matrix.python-version }} - ${{matrix.os}}
runs-on: ${{matrix.os}}

strategy:
matrix:
python-version: ['3.7', '3.8', '3.9', '3.10', '3.11.0-beta.3']
os: [ubuntu-latest, windows-latest, macos-latest]
fail-fast: false
steps:
- uses: actions/checkout@v3
Expand All@@ -23,13 +24,3 @@ jobs:
- name: Test with pytest
run: |
pytest -v

# === NOTIFICATIONS ===
# https://github.com/rectalogic/notify-irc
- name: Dump event info
if: always()
# Usually unnecessary, but insanely useful if IRC notifications fail.
run: |
cat <<"EOF"
${{ toJSON(github.event) }}
EOF
38 changes: 23 additions & 15 deletions rope/contrib/autoimport/utils.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,34 +19,42 @@ def get_package_tuple(
Returns None if not a viable package.
"""
package_name = package_path.name
package_source = get_package_source(package_path, project)
package_type: PackageType
if package_name.startswith(".") or package_name == "__pycache__":
return None
if package_path.is_file():
if package_name.endswith(".so"):
name = package_name.split(".")[0]
return Package(name, package_source, package_path, PackageType.COMPILED)
if package_name.endswith(".py"):
stripped_name = package_path.stem
return Package(
stripped_name, package_source, package_path, PackageType.SINGLE_FILE
)
return None
if package_name.endswith((".egg-info", ".dist-info")):
return None
return Package(package_name, package_source, package_path, PackageType.STANDARD)
if package_path.is_file():
if package_name.endswith(".so"):
package_name = package_name.split(".")[0]
package_type = PackageType.COMPILED
elif package_name.endswith(".py"):
package_name = package_path.stem
package_type = PackageType.SINGLE_FILE
else:
return None
else:
package_type = PackageType.STANDARD
package_source: Source = get_package_source(package_path, project, package_name)
return Package(package_name, package_source, package_path, package_type)


def get_package_source(
package: pathlib.Path, project: Optional[Project] = None
package: pathlib.Path, project: Optional[Project], name: str
) -> Source:
"""Detect the source of a given package. Rudimentary implementation."""
if name in sys.builtin_module_names:
return Source.BUILTIN
if project is not None and project.address in str(package):
return Source.PROJECT
if "site-packages" in package.parts:
return Source.SITE_PACKAGE
if package.as_posix().startswith(sys.prefix):
return Source.STANDARD
if sys.version_info < (3, 10, 0):
if str(package).startswith(sys.prefix):
return Source.STANDARD
else:
if name in sys.stdlib_module_names:
return Source.STANDARD
return Source.UNKNOWN


Expand Down
2 changes: 0 additions & 2 deletions ropetest/contrib/autoimport/conftest.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,8 +35,6 @@ def typing_path():
yield pathlib.Path(typing.__file__)




@pytest.fixture
def build_env_path():
from build import env
Expand Down
14 changes: 9 additions & 5 deletions ropetest/contrib/autoimport/utilstest.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,31 @@
"""Tests for autoimport utility functions, written in pytest"""
import pathlib

from sys import platform

import pytest

from rope.contrib.autoimport import utils
from rope.contrib.autoimport.defs import Package, PackageType, Source


def test_get_package_source(mod1_path, project):
assert utils.get_package_source(mod1_path, project) == Source.PROJECT
assert utils.get_package_source(mod1_path, project, "") == Source.PROJECT


def test_get_package_source_not_project(mod1_path):
assert utils.get_package_source(mod1_path) == Source.UNKNOWN
assert utils.get_package_source(mod1_path, None, "") == Source.UNKNOWN


def test_get_package_source_pytest(build_path):
# pytest is not installed as part of the standard library
# but should be installed into site_packages,
# so it should return Source.SITE_PACKAGE
assert utils.get_package_source(build_path) == Source.SITE_PACKAGE
assert utils.get_package_source(build_path, None, "build") == Source.SITE_PACKAGE


def test_get_package_source_typing(typing_path):

assert utils.get_package_source(typing_path) == Source.STANDARD
assert utils.get_package_source(typing_path, None, "typing") == Source.STANDARD


def test_get_modname_project_no_add(mod1_path, project_path):
Expand DownExpand Up@@ -53,6 +56,7 @@ def test_get_package_tuple_typing(typing_path):
) == utils.get_package_tuple(typing_path)


@pytest.mark.skipif(platform == "win32", reason="Windows doesn't have compiled modules")
def test_get_package_tuple_compiled(zlib_path):
assert Package(
"zlib", Source.STANDARD, zlib_path, PackageType.COMPILED
Expand Down
17 changes: 9 additions & 8 deletions ropetest/doatest.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,20 +18,21 @@
from rope.base.oi import doa


def cve_2014_3539_attacker(data_port, payload):
s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
s.connect(("127.0.0.1", data_port))
s_file = s.makefile("wb")
s_file.write(payload)
s.close()


class DOATest(unittest.TestCase):
def try_CVE_2014_3539_exploit(self, receiver, payload):
# Simulated attacker writing to the socket
def attacker(data_port):
s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
s.connect(("127.0.0.1", data_port))
s_file = s.makefile("wb")
s_file.write(payload)
s.close()

# Assume the attacker guesses the port correctly; 3037 is used by
# default if it is available.
attacker_proc = multiprocessing.Process(
target=attacker, args=(receiver.data_port,)
target=cve_2014_3539_attacker, args=(receiver.data_port, payload)
)

attacker_proc.start()
Expand Down
4 changes: 3 additions & 1 deletion ropetest/reprtest.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
import pathlib
import tempfile

import pytest

from rope.base import libutils, resources, pyobjectsdef, pynames
from rope.base import libutils, resources, pyobjectsdef
from rope.base.project import Project
from ropetest import testutils

Expand All@@ -27,6 +28,7 @@ def mod1(project):

def test_repr_project():
with tempfile.TemporaryDirectory() as folder:
folder = pathlib.Path(folder).resolve()
obj = testutils.sample_project(folder)
assert isinstance(obj, Project)
assert repr(obj) == f'<rope.base.project.Project "{folder}">'
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
add windows and mac CI#481

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 18 commits into

from

Jun 17, 2022
 Merged


add windows and mac CI
#481
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


18 commits


Select commit
Hold shift + click to select a range
94a230f

add windows and mac CI


bagel897 Jun 2, 2022
7c930cc

update checkout and setup to v3


bagel897 Jun 2, 2022
46d5119

fix: update package tuple function


bagel897 Jun 3, 2022
1891a0f

blacken


bagel897 Jun 4, 2022
c34b4db

skip on windows


bagel897 Jun 5, 2022
81031bd

Merge branch 'master' into patch-1


lieryan Jun 7, 2022
36f5a2a

Merge branch 'master' into patch-1


lieryan Jun 8, 2022
4d40e72

Resolve merge conflict


lieryan Jun 8, 2022
ae78c85

Merge branch 'master' into patch-1


lieryan Jun 8, 2022
4b4f62f

resolve() path name


lieryan Jun 8, 2022
b820645

Don't use nested function as this can't be pickled under certain fork…


lieryan Jun 14, 2022
0760ac9

Merge branch 'master' into patch-1


lieryan Jun 14, 2022
29c21c3

Remove "Dump event info" section


lieryan Jun 14, 2022
647b2df

skip fixture on windows


bagel897 Jun 14, 2022
0717dc7

return None on windows


bagel897 Jun 14, 2022
b9561b0

rename windows to win32


bagel897 Jun 15, 2022
be03174

skip properly


bagel897 Jun 15, 2022
d78f1e5

Merge branch 'master' into patch-1


bagel897 Jun 15, 2022

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


15 changes: 3 additions & 12 deletions
.github/workflows/main.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,12 +4,13 @@ on: [push, pull_request]

jobs:
 test:
 name: Test - ${{ matrix.python-version }}
 runs-on: ubuntu-latest
 name: Test - ${{ matrix.python-version }} - ${{matrix.os}}
 runs-on: ${{matrix.os}}

 strategy:
 matrix:
 python-version: ['3.7', '3.8', '3.9', '3.10', '3.11.0-beta.3']
 os: [ubuntu-latest, windows-latest, macos-latest]
 fail-fast: false
 steps:
 - uses: actions/checkout@v3
Expand All@@ -23,13 +24,3 @@ jobs:
 - name: Test with pytest
 run: |
 pytest -v

 # === NOTIFICATIONS ===
 # https://github.com/rectalogic/notify-irc
 - name: Dump event info
 if: always()
 # Usually unnecessary, but insanely useful if IRC notifications fail.
 run: |
 cat <<"EOF"
 ${{ toJSON(github.event) }}
 EOF

38 changes: 23 additions & 15 deletions
rope/contrib/autoimport/utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,34 +19,42 @@ def get_package_tuple(
 Returns None if not a viable package.
 """
 package_name = package_path.name
package_source = get_package_source(package_path, project)
package_type: PackageType
 if package_name.startswith(".") or package_name == "__pycache__":
 return None
 if package_path.is_file():
 if package_name.endswith(".so"):
 name = package_name.split(".")[0]
 return Package(name, package_source, package_path, PackageType.COMPILED)
 if package_name.endswith(".py"):
 stripped_name = package_path.stem
 return Package(
 stripped_name, package_source, package_path, PackageType.SINGLE_FILE
 )
 return None
 if package_name.endswith((".egg-info", ".dist-info")):
 return None
 return Package(package_name, package_source, package_path, PackageType.STANDARD)
 if package_path.is_file():
 if package_name.endswith(".so"):
 package_name = package_name.split(".")[0]
 package_type = PackageType.COMPILED
 elif package_name.endswith(".py"):
 package_name = package_path.stem
 package_type = PackageType.SINGLE_FILE
 else:
 return None
 else:
 package_type = PackageType.STANDARD
 package_source: Source = get_package_source(package_path, project, package_name)
 return Package(package_name, package_source, package_path, package_type)


def get_package_source(
 package: pathlib.Path, project: Optional[Project] = None
 package: pathlib.Path, project: Optional[Project], name: str
) -> Source:
 """Detect the source of a given package. Rudimentary implementation."""
 if name in sys.builtin_module_names:
 return Source.BUILTIN
 if project is not None and project.address in str(package):
 return Source.PROJECT
 if "site-packages" in package.parts:
 return Source.SITE_PACKAGE
 if package.as_posix().startswith(sys.prefix):
 return Source.STANDARD
 if sys.version_info < (3, 10, 0):
 if str(package).startswith(sys.prefix):
 return Source.STANDARD
 else:
 if name in sys.stdlib_module_names:
 return Source.STANDARD
 return Source.UNKNOWN


Expand Down

2 changes: 0 additions & 2 deletions
ropetest/contrib/autoimport/conftest.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,8 +35,6 @@ def typing_path():
 yield pathlib.Path(typing.__file__)




@pytest.fixture
def build_env_path():
 from build import env
Expand Down

14 changes: 9 additions & 5 deletions
ropetest/contrib/autoimport/utilstest.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,28 +1,31 @@
"""Tests for autoimport utility functions, written in pytest"""
import pathlib

from sys import platform

import pytest

from rope.contrib.autoimport import utils
from rope.contrib.autoimport.defs import Package, PackageType, Source


def test_get_package_source(mod1_path, project):
 assert utils.get_package_source(mod1_path, project) == Source.PROJECT
 assert utils.get_package_source(mod1_path, project, "") == Source.PROJECT


def test_get_package_source_not_project(mod1_path):
 assert utils.get_package_source(mod1_path) == Source.UNKNOWN
 assert utils.get_package_source(mod1_path, None, "") == Source.UNKNOWN


def test_get_package_source_pytest(build_path):
 # pytest is not installed as part of the standard library
 # but should be installed into site_packages,
 # so it should return Source.SITE_PACKAGE
 assert utils.get_package_source(build_path) == Source.SITE_PACKAGE
 assert utils.get_package_source(build_path, None, "build") == Source.SITE_PACKAGE


def test_get_package_source_typing(typing_path):

 assert utils.get_package_source(typing_path) == Source.STANDARD
 assert utils.get_package_source(typing_path, None, "typing") == Source.STANDARD


def test_get_modname_project_no_add(mod1_path, project_path):
Expand DownExpand Up@@ -53,6 +56,7 @@ def test_get_package_tuple_typing(typing_path):
 ) == utils.get_package_tuple(typing_path)


@pytest.mark.skipif(platform == "win32", reason="Windows doesn't have compiled modules")
def test_get_package_tuple_compiled(zlib_path):
 assert Package(
 "zlib", Source.STANDARD, zlib_path, PackageType.COMPILED
Expand Down

17 changes: 9 additions & 8 deletions
ropetest/doatest.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,20 +18,21 @@
from rope.base.oi import doa


def cve_2014_3539_attacker(data_port, payload):
 s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 s.connect(("127.0.0.1", data_port))
 s_file = s.makefile("wb")
 s_file.write(payload)
 s.close()


class DOATest(unittest.TestCase):
 def try_CVE_2014_3539_exploit(self, receiver, payload):
 # Simulated attacker writing to the socket
 def attacker(data_port):
 s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 s.connect(("127.0.0.1", data_port))
 s_file = s.makefile("wb")
 s_file.write(payload)
 s.close()

 # Assume the attacker guesses the port correctly; 3037 is used by
 # default if it is available.
 attacker_proc = multiprocessing.Process(
 target=attacker, args=(receiver.data_port,)
 target=cve_2014_3539_attacker, args=(receiver.data_port, payload)
 )

 attacker_proc.start()
Expand Down

4 changes: 3 additions & 1 deletion
ropetest/reprtest.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
import pathlib
import tempfile

import pytest

from rope.base import libutils, resources, pyobjectsdef, pynames
from rope.base import libutils, resources, pyobjectsdef
from rope.base.project import Project
from ropetest import testutils

Expand All@@ -27,6 +28,7 @@ def mod1(project):

def test_repr_project():
 with tempfile.TemporaryDirectory() as folder:
 folder = pathlib.Path(folder).resolve()
 obj = testutils.sample_project(folder)
 assert isinstance(obj, Project)
 assert repr(obj) == f'<rope.base.project.Project "{folder}">'
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
add windows and mac CI#481

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 18 commits into

from

Jun 17, 2022
 Merged


add windows and mac CI
#481
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


18 commits


Select commit
Hold shift + click to select a range
94a230f

add windows and mac CI


bagel897 Jun 2, 2022
7c930cc

update checkout and setup to v3


bagel897 Jun 2, 2022
46d5119

fix: update package tuple function


bagel897 Jun 3, 2022
1891a0f

blacken


bagel897 Jun 4, 2022
c34b4db

skip on windows


bagel897 Jun 5, 2022
81031bd

Merge branch 'master' into patch-1


lieryan Jun 7, 2022
36f5a2a

Merge branch 'master' into patch-1


lieryan Jun 8, 2022
4d40e72

Resolve merge conflict


lieryan Jun 8, 2022
ae78c85

Merge branch 'master' into patch-1


lieryan Jun 8, 2022
4b4f62f

resolve() path name


lieryan Jun 8, 2022
b820645

Don't use nested function as this can't be pickled under certain fork…


lieryan Jun 14, 2022
0760ac9

Merge branch 'master' into patch-1


lieryan Jun 14, 2022
29c21c3

Remove "Dump event info" section


lieryan Jun 14, 2022
647b2df

skip fixture on windows


bagel897 Jun 14, 2022
0717dc7

return None on windows


bagel897 Jun 14, 2022
b9561b0

rename windows to win32


bagel897 Jun 15, 2022
be03174

skip properly


bagel897 Jun 15, 2022
d78f1e5

Merge branch 'master' into patch-1


bagel897 Jun 15, 2022

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


15 changes: 3 additions & 12 deletions
.github/workflows/main.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,12 +4,13 @@ on: [push, pull_request]

jobs:
 test:
 name: Test - ${{ matrix.python-version }}
 runs-on: ubuntu-latest
 name: Test - ${{ matrix.python-version }} - ${{matrix.os}}
 runs-on: ${{matrix.os}}

 strategy:
 matrix:
 python-version: ['3.7', '3.8', '3.9', '3.10', '3.11.0-beta.3']
 os: [ubuntu-latest, windows-latest, macos-latest]
 fail-fast: false
 steps:
 - uses: actions/checkout@v3
Expand All@@ -23,13 +24,3 @@ jobs:
 - name: Test with pytest
 run: |
 pytest -v

 # === NOTIFICATIONS ===
 # https://github.com/rectalogic/notify-irc
 - name: Dump event info
 if: always()
 # Usually unnecessary, but insanely useful if IRC notifications fail.
 run: |
 cat <<"EOF"
 ${{ toJSON(github.event) }}
 EOF

38 changes: 23 additions & 15 deletions
rope/contrib/autoimport/utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,34 +19,42 @@ def get_package_tuple(
 Returns None if not a viable package.
 """
 package_name = package_path.name
package_source = get_package_source(package_path, project)
package_type: PackageType
 if package_name.startswith(".") or package_name == "__pycache__":
 return None
 if package_path.is_file():
 if package_name.endswith(".so"):
 name = package_name.split(".")[0]
 return Package(name, package_source, package_path, PackageType.COMPILED)
 if package_name.endswith(".py"):
 stripped_name = package_path.stem
 return Package(
 stripped_name, package_source, package_path, PackageType.SINGLE_FILE
 )
 return None
 if package_name.endswith((".egg-info", ".dist-info")):
 return None
 return Package(package_name, package_source, package_path, PackageType.STANDARD)
 if package_path.is_file():
 if package_name.endswith(".so"):
 package_name = package_name.split(".")[0]
 package_type = PackageType.COMPILED
 elif package_name.endswith(".py"):
 package_name = package_path.stem
 package_type = PackageType.SINGLE_FILE
 else:
 return None
 else:
 package_type = PackageType.STANDARD
 package_source: Source = get_package_source(package_path, project, package_name)
 return Package(package_name, package_source, package_path, package_type)


def get_package_source(
 package: pathlib.Path, project: Optional[Project] = None
 package: pathlib.Path, project: Optional[Project], name: str
) -> Source:
 """Detect the source of a given package. Rudimentary implementation."""
 if name in sys.builtin_module_names:
 return Source.BUILTIN
 if project is not None and project.address in str(package):
 return Source.PROJECT
 if "site-packages" in package.parts:
 return Source.SITE_PACKAGE
 if package.as_posix().startswith(sys.prefix):
 return Source.STANDARD
 if sys.version_info < (3, 10, 0):
 if str(package).startswith(sys.prefix):
 return Source.STANDARD
 else:
 if name in sys.stdlib_module_names:
 return Source.STANDARD
 return Source.UNKNOWN


Expand Down

2 changes: 0 additions & 2 deletions
ropetest/contrib/autoimport/conftest.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,8 +35,6 @@ def typing_path():
 yield pathlib.Path(typing.__file__)




@pytest.fixture
def build_env_path():
 from build import env
Expand Down

14 changes: 9 additions & 5 deletions
ropetest/contrib/autoimport/utilstest.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,28 +1,31 @@
"""Tests for autoimport utility functions, written in pytest"""
import pathlib

from sys import platform

import pytest

from rope.contrib.autoimport import utils
from rope.contrib.autoimport.defs import Package, PackageType, Source


def test_get_package_source(mod1_path, project):
 assert utils.get_package_source(mod1_path, project) == Source.PROJECT
 assert utils.get_package_source(mod1_path, project, "") == Source.PROJECT


def test_get_package_source_not_project(mod1_path):
 assert utils.get_package_source(mod1_path) == Source.UNKNOWN
 assert utils.get_package_source(mod1_path, None, "") == Source.UNKNOWN


def test_get_package_source_pytest(build_path):
 # pytest is not installed as part of the standard library
 # but should be installed into site_packages,
 # so it should return Source.SITE_PACKAGE
 assert utils.get_package_source(build_path) == Source.SITE_PACKAGE
 assert utils.get_package_source(build_path, None, "build") == Source.SITE_PACKAGE


def test_get_package_source_typing(typing_path):

 assert utils.get_package_source(typing_path) == Source.STANDARD
 assert utils.get_package_source(typing_path, None, "typing") == Source.STANDARD


def test_get_modname_project_no_add(mod1_path, project_path):
Expand DownExpand Up@@ -53,6 +56,7 @@ def test_get_package_tuple_typing(typing_path):
 ) == utils.get_package_tuple(typing_path)


@pytest.mark.skipif(platform == "win32", reason="Windows doesn't have compiled modules")
def test_get_package_tuple_compiled(zlib_path):
 assert Package(
 "zlib", Source.STANDARD, zlib_path, PackageType.COMPILED
Expand Down

17 changes: 9 additions & 8 deletions
ropetest/doatest.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,20 +18,21 @@
from rope.base.oi import doa


def cve_2014_3539_attacker(data_port, payload):
 s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 s.connect(("127.0.0.1", data_port))
 s_file = s.makefile("wb")
 s_file.write(payload)
 s.close()


class DOATest(unittest.TestCase):
 def try_CVE_2014_3539_exploit(self, receiver, payload):
 # Simulated attacker writing to the socket
 def attacker(data_port):
 s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 s.connect(("127.0.0.1", data_port))
 s_file = s.makefile("wb")
 s_file.write(payload)
 s.close()

 # Assume the attacker guesses the port correctly; 3037 is used by
 # default if it is available.
 attacker_proc = multiprocessing.Process(
 target=attacker, args=(receiver.data_port,)
 target=cve_2014_3539_attacker, args=(receiver.data_port, payload)
 )

 attacker_proc.start()
Expand Down

4 changes: 3 additions & 1 deletion
ropetest/reprtest.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
import pathlib
import tempfile

import pytest

from rope.base import libutils, resources, pyobjectsdef, pynames
from rope.base import libutils, resources, pyobjectsdef
from rope.base.project import Project
from ropetest import testutils

Expand All@@ -27,6 +28,7 @@ def mod1(project):

def test_repr_project():
 with tempfile.TemporaryDirectory() as folder:
 folder = pathlib.Path(folder).resolve()
 obj = testutils.sample_project(folder)
 assert isinstance(obj, Project)
 assert repr(obj) == f'<rope.base.project.Project "{folder}">'
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
add windows and mac CI#481

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 18 commits into

from

Jun 17, 2022
 Merged


add windows and mac CI
#481
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


18 commits


Select commit
Hold shift + click to select a range
94a230f

add windows and mac CI


bagel897 Jun 2, 2022
7c930cc

update checkout and setup to v3


bagel897 Jun 2, 2022
46d5119

fix: update package tuple function


bagel897 Jun 3, 2022
1891a0f

blacken


bagel897 Jun 4, 2022
c34b4db

skip on windows


bagel897 Jun 5, 2022
81031bd

Merge branch 'master' into patch-1


lieryan Jun 7, 2022
36f5a2a

Merge branch 'master' into patch-1


lieryan Jun 8, 2022
4d40e72

Resolve merge conflict


lieryan Jun 8, 2022
ae78c85

Merge branch 'master' into patch-1


lieryan Jun 8, 2022
4b4f62f

resolve() path name


lieryan Jun 8, 2022
b820645

Don't use nested function as this can't be pickled under certain fork…


lieryan Jun 14, 2022
0760ac9

Merge branch 'master' into patch-1


lieryan Jun 14, 2022
29c21c3

Remove "Dump event info" section


lieryan Jun 14, 2022
647b2df

skip fixture on windows


bagel897 Jun 14, 2022
0717dc7

return None on windows


bagel897 Jun 14, 2022
b9561b0

rename windows to win32


bagel897 Jun 15, 2022
be03174

skip properly


bagel897 Jun 15, 2022
d78f1e5

Merge branch 'master' into patch-1


bagel897 Jun 15, 2022

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


15 changes: 3 additions & 12 deletions
.github/workflows/main.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,12 +4,13 @@ on: [push, pull_request]

jobs:
 test:
 name: Test - ${{ matrix.python-version }}
 runs-on: ubuntu-latest
 name: Test - ${{ matrix.python-version }} - ${{matrix.os}}
 runs-on: ${{matrix.os}}

 strategy:
 matrix:
 python-version: ['3.7', '3.8', '3.9', '3.10', '3.11.0-beta.3']
 os: [ubuntu-latest, windows-latest, macos-latest]
 fail-fast: false
 steps:
 - uses: actions/checkout@v3
Expand All@@ -23,13 +24,3 @@ jobs:
 - name: Test with pytest
 run: |
 pytest -v

 # === NOTIFICATIONS ===
 # https://github.com/rectalogic/notify-irc
 - name: Dump event info
 if: always()
 # Usually unnecessary, but insanely useful if IRC notifications fail.
 run: |
 cat <<"EOF"
 ${{ toJSON(github.event) }}
 EOF

38 changes: 23 additions & 15 deletions
rope/contrib/autoimport/utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,34 +19,42 @@ def get_package_tuple(
 Returns None if not a viable package.
 """
 package_name = package_path.name
package_source = get_package_source(package_path, project)
package_type: PackageType
 if package_name.startswith(".") or package_name == "__pycache__":
 return None
 if package_path.is_file():
 if package_name.endswith(".so"):
 name = package_name.split(".")[0]
 return Package(name, package_source, package_path, PackageType.COMPILED)
 if package_name.endswith(".py"):
 stripped_name = package_path.stem
 return Package(
 stripped_name, package_source, package_path, PackageType.SINGLE_FILE
 )
 return None
 if package_name.endswith((".egg-info", ".dist-info")):
 return None
 return Package(package_name, package_source, package_path, PackageType.STANDARD)
 if package_path.is_file():
 if package_name.endswith(".so"):
 package_name = package_name.split(".")[0]
 package_type = PackageType.COMPILED
 elif package_name.endswith(".py"):
 package_name = package_path.stem
 package_type = PackageType.SINGLE_FILE
 else:
 return None
 else:
 package_type = PackageType.STANDARD
 package_source: Source = get_package_source(package_path, project, package_name)
 return Package(package_name, package_source, package_path, package_type)


def get_package_source(
 package: pathlib.Path, project: Optional[Project] = None
 package: pathlib.Path, project: Optional[Project], name: str
) -> Source:
 """Detect the source of a given package. Rudimentary implementation."""
 if name in sys.builtin_module_names:
 return Source.BUILTIN
 if project is not None and project.address in str(package):
 return Source.PROJECT
 if "site-packages" in package.parts:
 return Source.SITE_PACKAGE
 if package.as_posix().startswith(sys.prefix):
 return Source.STANDARD
 if sys.version_info < (3, 10, 0):
 if str(package).startswith(sys.prefix):
 return Source.STANDARD
 else:
 if name in sys.stdlib_module_names:
 return Source.STANDARD
 return Source.UNKNOWN


Expand Down

2 changes: 0 additions & 2 deletions
ropetest/contrib/autoimport/conftest.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,8 +35,6 @@ def typing_path():
 yield pathlib.Path(typing.__file__)




@pytest.fixture
def build_env_path():
 from build import env
Expand Down

14 changes: 9 additions & 5 deletions
ropetest/contrib/autoimport/utilstest.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,28 +1,31 @@
"""Tests for autoimport utility functions, written in pytest"""
import pathlib

from sys import platform

import pytest

from rope.contrib.autoimport import utils
from rope.contrib.autoimport.defs import Package, PackageType, Source


def test_get_package_source(mod1_path, project):
 assert utils.get_package_source(mod1_path, project) == Source.PROJECT
 assert utils.get_package_source(mod1_path, project, "") == Source.PROJECT


def test_get_package_source_not_project(mod1_path):
 assert utils.get_package_source(mod1_path) == Source.UNKNOWN
 assert utils.get_package_source(mod1_path, None, "") == Source.UNKNOWN


def test_get_package_source_pytest(build_path):
 # pytest is not installed as part of the standard library
 # but should be installed into site_packages,
 # so it should return Source.SITE_PACKAGE
 assert utils.get_package_source(build_path) == Source.SITE_PACKAGE
 assert utils.get_package_source(build_path, None, "build") == Source.SITE_PACKAGE


def test_get_package_source_typing(typing_path):

 assert utils.get_package_source(typing_path) == Source.STANDARD
 assert utils.get_package_source(typing_path, None, "typing") == Source.STANDARD


def test_get_modname_project_no_add(mod1_path, project_path):
Expand DownExpand Up@@ -53,6 +56,7 @@ def test_get_package_tuple_typing(typing_path):
 ) == utils.get_package_tuple(typing_path)


@pytest.mark.skipif(platform == "win32", reason="Windows doesn't have compiled modules")
def test_get_package_tuple_compiled(zlib_path):
 assert Package(
 "zlib", Source.STANDARD, zlib_path, PackageType.COMPILED
Expand Down

17 changes: 9 additions & 8 deletions
ropetest/doatest.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,20 +18,21 @@
from rope.base.oi import doa


def cve_2014_3539_attacker(data_port, payload):
 s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 s.connect(("127.0.0.1", data_port))
 s_file = s.makefile("wb")
 s_file.write(payload)
 s.close()


class DOATest(unittest.TestCase):
 def try_CVE_2014_3539_exploit(self, receiver, payload):
 # Simulated attacker writing to the socket
 def attacker(data_port):
 s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 s.connect(("127.0.0.1", data_port))
 s_file = s.makefile("wb")
 s_file.write(payload)
 s.close()

 # Assume the attacker guesses the port correctly; 3037 is used by
 # default if it is available.
 attacker_proc = multiprocessing.Process(
 target=attacker, args=(receiver.data_port,)
 target=cve_2014_3539_attacker, args=(receiver.data_port, payload)
 )

 attacker_proc.start()
Expand Down

4 changes: 3 additions & 1 deletion
ropetest/reprtest.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
import pathlib
import tempfile

import pytest

from rope.base import libutils, resources, pyobjectsdef, pynames
from rope.base import libutils, resources, pyobjectsdef
from rope.base.project import Project
from ropetest import testutils

Expand All@@ -27,6 +28,7 @@ def mod1(project):

def test_repr_project():
 with tempfile.TemporaryDirectory() as folder:
 folder = pathlib.Path(folder).resolve()
 obj = testutils.sample_project(folder)
 assert isinstance(obj, Project)
 assert repr(obj) == f'<rope.base.project.Project "{folder}">'
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
add windows and mac CI#481

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 18 commits into

from

Jun 17, 2022
 Merged


add windows and mac CI
#481
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


18 commits


Select commit
Hold shift + click to select a range
94a230f

add windows and mac CI


bagel897 Jun 2, 2022
7c930cc

update checkout and setup to v3


bagel897 Jun 2, 2022
46d5119

fix: update package tuple function


bagel897 Jun 3, 2022
1891a0f

blacken


bagel897 Jun 4, 2022
c34b4db

skip on windows


bagel897 Jun 5, 2022
81031bd

Merge branch 'master' into patch-1


lieryan Jun 7, 2022
36f5a2a

Merge branch 'master' into patch-1


lieryan Jun 8, 2022
4d40e72

Resolve merge conflict


lieryan Jun 8, 2022
ae78c85

Merge branch 'master' into patch-1


lieryan Jun 8, 2022
4b4f62f

resolve() path name


lieryan Jun 8, 2022
b820645

Don't use nested function as this can't be pickled under certain fork…


lieryan Jun 14, 2022
0760ac9

Merge branch 'master' into patch-1


lieryan Jun 14, 2022
29c21c3

Remove "Dump event info" section


lieryan Jun 14, 2022
647b2df

skip fixture on windows


bagel897 Jun 14, 2022
0717dc7

return None on windows


bagel897 Jun 14, 2022
b9561b0

rename windows to win32


bagel897 Jun 15, 2022
be03174

skip properly


bagel897 Jun 15, 2022
d78f1e5

Merge branch 'master' into patch-1


bagel897 Jun 15, 2022

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


15 changes: 3 additions & 12 deletions
.github/workflows/main.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,12 +4,13 @@ on: [push, pull_request]

jobs:
 test:
 name: Test - ${{ matrix.python-version }}
 runs-on: ubuntu-latest
 name: Test - ${{ matrix.python-version }} - ${{matrix.os}}
 runs-on: ${{matrix.os}}

 strategy:
 matrix:
 python-version: ['3.7', '3.8', '3.9', '3.10', '3.11.0-beta.3']
 os: [ubuntu-latest, windows-latest, macos-latest]
 fail-fast: false
 steps:
 - uses: actions/checkout@v3
Expand All@@ -23,13 +24,3 @@ jobs:
 - name: Test with pytest
 run: |
 pytest -v

 # === NOTIFICATIONS ===
 # https://github.com/rectalogic/notify-irc
 - name: Dump event info
 if: always()
 # Usually unnecessary, but insanely useful if IRC notifications fail.
 run: |
 cat <<"EOF"
 ${{ toJSON(github.event) }}
 EOF

38 changes: 23 additions & 15 deletions
rope/contrib/autoimport/utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,34 +19,42 @@ def get_package_tuple(
 Returns None if not a viable package.
 """
 package_name = package_path.name
package_source = get_package_source(package_path, project)
package_type: PackageType
 if package_name.startswith(".") or package_name == "__pycache__":
 return None
 if package_path.is_file():
 if package_name.endswith(".so"):
 name = package_name.split(".")[0]
 return Package(name, package_source, package_path, PackageType.COMPILED)
 if package_name.endswith(".py"):
 stripped_name = package_path.stem
 return Package(
 stripped_name, package_source, package_path, PackageType.SINGLE_FILE
 )
 return None
 if package_name.endswith((".egg-info", ".dist-info")):
 return None
 return Package(package_name, package_source, package_path, PackageType.STANDARD)
 if package_path.is_file():
 if package_name.endswith(".so"):
 package_name = package_name.split(".")[0]
 package_type = PackageType.COMPILED
 elif package_name.endswith(".py"):
 package_name = package_path.stem
 package_type = PackageType.SINGLE_FILE
 else:
 return None
 else:
 package_type = PackageType.STANDARD
 package_source: Source = get_package_source(package_path, project, package_name)
 return Package(package_name, package_source, package_path, package_type)


def get_package_source(
 package: pathlib.Path, project: Optional[Project] = None
 package: pathlib.Path, project: Optional[Project], name: str
) -> Source:
 """Detect the source of a given package. Rudimentary implementation."""
 if name in sys.builtin_module_names:
 return Source.BUILTIN
 if project is not None and project.address in str(package):
 return Source.PROJECT
 if "site-packages" in package.parts:
 return Source.SITE_PACKAGE
 if package.as_posix().startswith(sys.prefix):
 return Source.STANDARD
 if sys.version_info < (3, 10, 0):
 if str(package).startswith(sys.prefix):
 return Source.STANDARD
 else:
 if name in sys.stdlib_module_names:
 return Source.STANDARD
 return Source.UNKNOWN


Expand Down

2 changes: 0 additions & 2 deletions
ropetest/contrib/autoimport/conftest.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,8 +35,6 @@ def typing_path():
 yield pathlib.Path(typing.__file__)




@pytest.fixture
def build_env_path():
 from build import env
Expand Down

14 changes: 9 additions & 5 deletions
ropetest/contrib/autoimport/utilstest.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,28 +1,31 @@
"""Tests for autoimport utility functions, written in pytest"""
import pathlib

from sys import platform

import pytest

from rope.contrib.autoimport import utils
from rope.contrib.autoimport.defs import Package, PackageType, Source


def test_get_package_source(mod1_path, project):
 assert utils.get_package_source(mod1_path, project) == Source.PROJECT
 assert utils.get_package_source(mod1_path, project, "") == Source.PROJECT


def test_get_package_source_not_project(mod1_path):
 assert utils.get_package_source(mod1_path) == Source.UNKNOWN
 assert utils.get_package_source(mod1_path, None, "") == Source.UNKNOWN


def test_get_package_source_pytest(build_path):
 # pytest is not installed as part of the standard library
 # but should be installed into site_packages,
 # so it should return Source.SITE_PACKAGE
 assert utils.get_package_source(build_path) == Source.SITE_PACKAGE
 assert utils.get_package_source(build_path, None, "build") == Source.SITE_PACKAGE


def test_get_package_source_typing(typing_path):

 assert utils.get_package_source(typing_path) == Source.STANDARD
 assert utils.get_package_source(typing_path, None, "typing") == Source.STANDARD


def test_get_modname_project_no_add(mod1_path, project_path):
Expand DownExpand Up@@ -53,6 +56,7 @@ def test_get_package_tuple_typing(typing_path):
 ) == utils.get_package_tuple(typing_path)


@pytest.mark.skipif(platform == "win32", reason="Windows doesn't have compiled modules")
def test_get_package_tuple_compiled(zlib_path):
 assert Package(
 "zlib", Source.STANDARD, zlib_path, PackageType.COMPILED
Expand Down

17 changes: 9 additions & 8 deletions
ropetest/doatest.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,20 +18,21 @@
from rope.base.oi import doa


def cve_2014_3539_attacker(data_port, payload):
 s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 s.connect(("127.0.0.1", data_port))
 s_file = s.makefile("wb")
 s_file.write(payload)
 s.close()


class DOATest(unittest.TestCase):
 def try_CVE_2014_3539_exploit(self, receiver, payload):
 # Simulated attacker writing to the socket
 def attacker(data_port):
 s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 s.connect(("127.0.0.1", data_port))
 s_file = s.makefile("wb")
 s_file.write(payload)
 s.close()

 # Assume the attacker guesses the port correctly; 3037 is used by
 # default if it is available.
 attacker_proc = multiprocessing.Process(
 target=attacker, args=(receiver.data_port,)
 target=cve_2014_3539_attacker, args=(receiver.data_port, payload)
 )

 attacker_proc.start()
Expand Down

4 changes: 3 additions & 1 deletion
ropetest/reprtest.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
import pathlib
import tempfile

import pytest

from rope.base import libutils, resources, pyobjectsdef, pynames
from rope.base import libutils, resources, pyobjectsdef
from rope.base.project import Project
from ropetest import testutils

Expand All@@ -27,6 +28,7 @@ def mod1(project):

def test_repr_project():
 with tempfile.TemporaryDirectory() as folder:
 folder = pathlib.Path(folder).resolve()
 obj = testutils.sample_project(folder)
 assert isinstance(obj, Project)
 assert repr(obj) == f'<rope.base.project.Project "{folder}">'
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
add windows and mac CI#481

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 18 commits into

from

Jun 17, 2022
 Merged


add windows and mac CI
#481
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


18 commits


Select commit
Hold shift + click to select a range
94a230f

add windows and mac CI


bagel897 Jun 2, 2022
7c930cc

update checkout and setup to v3


bagel897 Jun 2, 2022
46d5119

fix: update package tuple function


bagel897 Jun 3, 2022
1891a0f

blacken


bagel897 Jun 4, 2022
c34b4db

skip on windows


bagel897 Jun 5, 2022
81031bd

Merge branch 'master' into patch-1


lieryan Jun 7, 2022
36f5a2a

Merge branch 'master' into patch-1


lieryan Jun 8, 2022
4d40e72

Resolve merge conflict


lieryan Jun 8, 2022
ae78c85

Merge branch 'master' into patch-1


lieryan Jun 8, 2022
4b4f62f

resolve() path name


lieryan Jun 8, 2022
b820645

Don't use nested function as this can't be pickled under certain fork…


lieryan Jun 14, 2022
0760ac9

Merge branch 'master' into patch-1


lieryan Jun 14, 2022
29c21c3

Remove "Dump event info" section


lieryan Jun 14, 2022
647b2df

skip fixture on windows


bagel897 Jun 14, 2022
0717dc7

return None on windows


bagel897 Jun 14, 2022
b9561b0

rename windows to win32


bagel897 Jun 15, 2022
be03174

skip properly


bagel897 Jun 15, 2022
d78f1e5

Merge branch 'master' into patch-1


bagel897 Jun 15, 2022

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


15 changes: 3 additions & 12 deletions
.github/workflows/main.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,12 +4,13 @@ on: [push, pull_request]

jobs:
 test:
 name: Test - ${{ matrix.python-version }}
 runs-on: ubuntu-latest
 name: Test - ${{ matrix.python-version }} - ${{matrix.os}}
 runs-on: ${{matrix.os}}

 strategy:
 matrix:
 python-version: ['3.7', '3.8', '3.9', '3.10', '3.11.0-beta.3']
 os: [ubuntu-latest, windows-latest, macos-latest]
 fail-fast: false
 steps:
 - uses: actions/checkout@v3
Expand All@@ -23,13 +24,3 @@ jobs:
 - name: Test with pytest
 run: |
 pytest -v

 # === NOTIFICATIONS ===
 # https://github.com/rectalogic/notify-irc
 - name: Dump event info
 if: always()
 # Usually unnecessary, but insanely useful if IRC notifications fail.
 run: |
 cat <<"EOF"
 ${{ toJSON(github.event) }}
 EOF

38 changes: 23 additions & 15 deletions
rope/contrib/autoimport/utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,34 +19,42 @@ def get_package_tuple(
 Returns None if not a viable package.
 """
 package_name = package_path.name
package_source = get_package_source(package_path, project)
package_type: PackageType
 if package_name.startswith(".") or package_name == "__pycache__":
 return None
 if package_path.is_file():
 if package_name.endswith(".so"):
 name = package_name.split(".")[0]
 return Package(name, package_source, package_path, PackageType.COMPILED)
 if package_name.endswith(".py"):
 stripped_name = package_path.stem
 return Package(
 stripped_name, package_source, package_path, PackageType.SINGLE_FILE
 )
 return None
 if package_name.endswith((".egg-info", ".dist-info")):
 return None
 return Package(package_name, package_source, package_path, PackageType.STANDARD)
 if package_path.is_file():
 if package_name.endswith(".so"):
 package_name = package_name.split(".")[0]
 package_type = PackageType.COMPILED
 elif package_name.endswith(".py"):
 package_name = package_path.stem
 package_type = PackageType.SINGLE_FILE
 else:
 return None
 else:
 package_type = PackageType.STANDARD
 package_source: Source = get_package_source(package_path, project, package_name)
 return Package(package_name, package_source, package_path, package_type)


def get_package_source(
 package: pathlib.Path, project: Optional[Project] = None
 package: pathlib.Path, project: Optional[Project], name: str
) -> Source:
 """Detect the source of a given package. Rudimentary implementation."""
 if name in sys.builtin_module_names:
 return Source.BUILTIN
 if project is not None and project.address in str(package):
 return Source.PROJECT
 if "site-packages" in package.parts:
 return Source.SITE_PACKAGE
 if package.as_posix().startswith(sys.prefix):
 return Source.STANDARD
 if sys.version_info < (3, 10, 0):
 if str(package).startswith(sys.prefix):
 return Source.STANDARD
 else:
 if name in sys.stdlib_module_names:
 return Source.STANDARD
 return Source.UNKNOWN


Expand Down

2 changes: 0 additions & 2 deletions
ropetest/contrib/autoimport/conftest.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,8 +35,6 @@ def typing_path():
 yield pathlib.Path(typing.__file__)




@pytest.fixture
def build_env_path():
 from build import env
Expand Down

14 changes: 9 additions & 5 deletions
ropetest/contrib/autoimport/utilstest.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,28 +1,31 @@
"""Tests for autoimport utility functions, written in pytest"""
import pathlib

from sys import platform

import pytest

from rope.contrib.autoimport import utils
from rope.contrib.autoimport.defs import Package, PackageType, Source


def test_get_package_source(mod1_path, project):
 assert utils.get_package_source(mod1_path, project) == Source.PROJECT
 assert utils.get_package_source(mod1_path, project, "") == Source.PROJECT


def test_get_package_source_not_project(mod1_path):
 assert utils.get_package_source(mod1_path) == Source.UNKNOWN
 assert utils.get_package_source(mod1_path, None, "") == Source.UNKNOWN


def test_get_package_source_pytest(build_path):
 # pytest is not installed as part of the standard library
 # but should be installed into site_packages,
 # so it should return Source.SITE_PACKAGE
 assert utils.get_package_source(build_path) == Source.SITE_PACKAGE
 assert utils.get_package_source(build_path, None, "build") == Source.SITE_PACKAGE


def test_get_package_source_typing(typing_path):

 assert utils.get_package_source(typing_path) == Source.STANDARD
 assert utils.get_package_source(typing_path, None, "typing") == Source.STANDARD


def test_get_modname_project_no_add(mod1_path, project_path):
Expand DownExpand Up@@ -53,6 +56,7 @@ def test_get_package_tuple_typing(typing_path):
 ) == utils.get_package_tuple(typing_path)


@pytest.mark.skipif(platform == "win32", reason="Windows doesn't have compiled modules")
def test_get_package_tuple_compiled(zlib_path):
 assert Package(
 "zlib", Source.STANDARD, zlib_path, PackageType.COMPILED
Expand Down

17 changes: 9 additions & 8 deletions
ropetest/doatest.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,20 +18,21 @@
from rope.base.oi import doa


def cve_2014_3539_attacker(data_port, payload):
 s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 s.connect(("127.0.0.1", data_port))
 s_file = s.makefile("wb")
 s_file.write(payload)
 s.close()


class DOATest(unittest.TestCase):
 def try_CVE_2014_3539_exploit(self, receiver, payload):
 # Simulated attacker writing to the socket
 def attacker(data_port):
 s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 s.connect(("127.0.0.1", data_port))
 s_file = s.makefile("wb")
 s_file.write(payload)
 s.close()

 # Assume the attacker guesses the port correctly; 3037 is used by
 # default if it is available.
 attacker_proc = multiprocessing.Process(
 target=attacker, args=(receiver.data_port,)
 target=cve_2014_3539_attacker, args=(receiver.data_port, payload)
 )

 attacker_proc.start()
Expand Down

4 changes: 3 additions & 1 deletion
ropetest/reprtest.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
import pathlib
import tempfile

import pytest

from rope.base import libutils, resources, pyobjectsdef, pynames
from rope.base import libutils, resources, pyobjectsdef
from rope.base.project import Project
from ropetest import testutils

Expand All@@ -27,6 +28,7 @@ def mod1(project):

def test_repr_project():
 with tempfile.TemporaryDirectory() as folder:
 folder = pathlib.Path(folder).resolve()
 obj = testutils.sample_project(folder)
 assert isinstance(obj, Project)
 assert repr(obj) == f'<rope.base.project.Project "{folder}">'
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
add windows and mac CI#481

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 18 commits into

from

Jun 17, 2022
 Merged


add windows and mac CI
#481
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


18 commits


Select commit
Hold shift + click to select a range
94a230f

add windows and mac CI


bagel897 Jun 2, 2022
7c930cc

update checkout and setup to v3


bagel897 Jun 2, 2022
46d5119

fix: update package tuple function


bagel897 Jun 3, 2022
1891a0f

blacken


bagel897 Jun 4, 2022
c34b4db

skip on windows


bagel897 Jun 5, 2022
81031bd

Merge branch 'master' into patch-1


lieryan Jun 7, 2022
36f5a2a

Merge branch 'master' into patch-1


lieryan Jun 8, 2022
4d40e72

Resolve merge conflict


lieryan Jun 8, 2022
ae78c85

Merge branch 'master' into patch-1


lieryan Jun 8, 2022
4b4f62f

resolve() path name


lieryan Jun 8, 2022
b820645

Don't use nested function as this can't be pickled under certain fork…


lieryan Jun 14, 2022
0760ac9

Merge branch 'master' into patch-1


lieryan Jun 14, 2022
29c21c3

Remove "Dump event info" section


lieryan Jun 14, 2022
647b2df

skip fixture on windows


bagel897 Jun 14, 2022
0717dc7

return None on windows


bagel897 Jun 14, 2022
b9561b0

rename windows to win32


bagel897 Jun 15, 2022
be03174

skip properly


bagel897 Jun 15, 2022
d78f1e5

Merge branch 'master' into patch-1


bagel897 Jun 15, 2022

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


15 changes: 3 additions & 12 deletions
.github/workflows/main.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,12 +4,13 @@ on: [push, pull_request]

jobs:
 test:
 name: Test - ${{ matrix.python-version }}
 runs-on: ubuntu-latest
 name: Test - ${{ matrix.python-version }} - ${{matrix.os}}
 runs-on: ${{matrix.os}}

 strategy:
 matrix:
 python-version: ['3.7', '3.8', '3.9', '3.10', '3.11.0-beta.3']
 os: [ubuntu-latest, windows-latest, macos-latest]
 fail-fast: false
 steps:
 - uses: actions/checkout@v3
Expand All@@ -23,13 +24,3 @@ jobs:
 - name: Test with pytest
 run: |
 pytest -v

 # === NOTIFICATIONS ===
 # https://github.com/rectalogic/notify-irc
 - name: Dump event info
 if: always()
 # Usually unnecessary, but insanely useful if IRC notifications fail.
 run: |
 cat <<"EOF"
 ${{ toJSON(github.event) }}
 EOF

38 changes: 23 additions & 15 deletions
rope/contrib/autoimport/utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,34 +19,42 @@ def get_package_tuple(
 Returns None if not a viable package.
 """
 package_name = package_path.name
package_source = get_package_source(package_path, project)
package_type: PackageType
 if package_name.startswith(".") or package_name == "__pycache__":
 return None
 if package_path.is_file():
 if package_name.endswith(".so"):
 name = package_name.split(".")[0]
 return Package(name, package_source, package_path, PackageType.COMPILED)
 if package_name.endswith(".py"):
 stripped_name = package_path.stem
 return Package(
 stripped_name, package_source, package_path, PackageType.SINGLE_FILE
 )
 return None
 if package_name.endswith((".egg-info", ".dist-info")):
 return None
 return Package(package_name, package_source, package_path, PackageType.STANDARD)
 if package_path.is_file():
 if package_name.endswith(".so"):
 package_name = package_name.split(".")[0]
 package_type = PackageType.COMPILED
 elif package_name.endswith(".py"):
 package_name = package_path.stem
 package_type = PackageType.SINGLE_FILE
 else:
 return None
 else:
 package_type = PackageType.STANDARD
 package_source: Source = get_package_source(package_path, project, package_name)
 return Package(package_name, package_source, package_path, package_type)


def get_package_source(
 package: pathlib.Path, project: Optional[Project] = None
 package: pathlib.Path, project: Optional[Project], name: str
) -> Source:
 """Detect the source of a given package. Rudimentary implementation."""
 if name in sys.builtin_module_names:
 return Source.BUILTIN
 if project is not None and project.address in str(package):
 return Source.PROJECT
 if "site-packages" in package.parts:
 return Source.SITE_PACKAGE
 if package.as_posix().startswith(sys.prefix):
 return Source.STANDARD
 if sys.version_info < (3, 10, 0):
 if str(package).startswith(sys.prefix):
 return Source.STANDARD
 else:
 if name in sys.stdlib_module_names:
 return Source.STANDARD
 return Source.UNKNOWN


Expand Down

2 changes: 0 additions & 2 deletions
ropetest/contrib/autoimport/conftest.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,8 +35,6 @@ def typing_path():
 yield pathlib.Path(typing.__file__)




@pytest.fixture
def build_env_path():
 from build import env
Expand Down

14 changes: 9 additions & 5 deletions
ropetest/contrib/autoimport/utilstest.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,28 +1,31 @@
"""Tests for autoimport utility functions, written in pytest"""
import pathlib

from sys import platform

import pytest

from rope.contrib.autoimport import utils
from rope.contrib.autoimport.defs import Package, PackageType, Source


def test_get_package_source(mod1_path, project):
 assert utils.get_package_source(mod1_path, project) == Source.PROJECT
 assert utils.get_package_source(mod1_path, project, "") == Source.PROJECT


def test_get_package_source_not_project(mod1_path):
 assert utils.get_package_source(mod1_path) == Source.UNKNOWN
 assert utils.get_package_source(mod1_path, None, "") == Source.UNKNOWN


def test_get_package_source_pytest(build_path):
 # pytest is not installed as part of the standard library
 # but should be installed into site_packages,
 # so it should return Source.SITE_PACKAGE
 assert utils.get_package_source(build_path) == Source.SITE_PACKAGE
 assert utils.get_package_source(build_path, None, "build") == Source.SITE_PACKAGE


def test_get_package_source_typing(typing_path):

 assert utils.get_package_source(typing_path) == Source.STANDARD
 assert utils.get_package_source(typing_path, None, "typing") == Source.STANDARD


def test_get_modname_project_no_add(mod1_path, project_path):
Expand DownExpand Up@@ -53,6 +56,7 @@ def test_get_package_tuple_typing(typing_path):
 ) == utils.get_package_tuple(typing_path)


@pytest.mark.skipif(platform == "win32", reason="Windows doesn't have compiled modules")
def test_get_package_tuple_compiled(zlib_path):
 assert Package(
 "zlib", Source.STANDARD, zlib_path, PackageType.COMPILED
Expand Down

17 changes: 9 additions & 8 deletions
ropetest/doatest.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,20 +18,21 @@
from rope.base.oi import doa


def cve_2014_3539_attacker(data_port, payload):
 s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 s.connect(("127.0.0.1", data_port))
 s_file = s.makefile("wb")
 s_file.write(payload)
 s.close()


class DOATest(unittest.TestCase):
 def try_CVE_2014_3539_exploit(self, receiver, payload):
 # Simulated attacker writing to the socket
 def attacker(data_port):
 s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 s.connect(("127.0.0.1", data_port))
 s_file = s.makefile("wb")
 s_file.write(payload)
 s.close()

 # Assume the attacker guesses the port correctly; 3037 is used by
 # default if it is available.
 attacker_proc = multiprocessing.Process(
 target=attacker, args=(receiver.data_port,)
 target=cve_2014_3539_attacker, args=(receiver.data_port, payload)
 )

 attacker_proc.start()
Expand Down

4 changes: 3 additions & 1 deletion
ropetest/reprtest.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
import pathlib
import tempfile

import pytest

from rope.base import libutils, resources, pyobjectsdef, pynames
from rope.base import libutils, resources, pyobjectsdef
from rope.base.project import Project
from ropetest import testutils

Expand All@@ -27,6 +28,7 @@ def mod1(project):

def test_repr_project():
 with tempfile.TemporaryDirectory() as folder:
 folder = pathlib.Path(folder).resolve()
 obj = testutils.sample_project(folder)
 assert isinstance(obj, Project)
 assert repr(obj) == f'<rope.base.project.Project "{folder}">'
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
add windows and mac CI#481

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 18 commits into

from

Jun 17, 2022
 Merged


add windows and mac CI
#481
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


18 commits


Select commit
Hold shift + click to select a range
94a230f

add windows and mac CI


bagel897 Jun 2, 2022
7c930cc

update checkout and setup to v3


bagel897 Jun 2, 2022
46d5119

fix: update package tuple function


bagel897 Jun 3, 2022
1891a0f

blacken


bagel897 Jun 4, 2022
c34b4db

skip on windows


bagel897 Jun 5, 2022
81031bd

Merge branch 'master' into patch-1


lieryan Jun 7, 2022
36f5a2a

Merge branch 'master' into patch-1


lieryan Jun 8, 2022
4d40e72

Resolve merge conflict


lieryan Jun 8, 2022
ae78c85

Merge branch 'master' into patch-1


lieryan Jun 8, 2022
4b4f62f

resolve() path name


lieryan Jun 8, 2022
b820645

Don't use nested function as this can't be pickled under certain fork…


lieryan Jun 14, 2022
0760ac9

Merge branch 'master' into patch-1


lieryan Jun 14, 2022
29c21c3

Remove "Dump event info" section


lieryan Jun 14, 2022
647b2df

skip fixture on windows


bagel897 Jun 14, 2022
0717dc7

return None on windows


bagel897 Jun 14, 2022
b9561b0

rename windows to win32


bagel897 Jun 15, 2022
be03174

skip properly


bagel897 Jun 15, 2022
d78f1e5

Merge branch 'master' into patch-1


bagel897 Jun 15, 2022

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


15 changes: 3 additions & 12 deletions
.github/workflows/main.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,12 +4,13 @@ on: [push, pull_request]

jobs:
 test:
 name: Test - ${{ matrix.python-version }}
 runs-on: ubuntu-latest
 name: Test - ${{ matrix.python-version }} - ${{matrix.os}}
 runs-on: ${{matrix.os}}

 strategy:
 matrix:
 python-version: ['3.7', '3.8', '3.9', '3.10', '3.11.0-beta.3']
 os: [ubuntu-latest, windows-latest, macos-latest]
 fail-fast: false
 steps:
 - uses: actions/checkout@v3
Expand All@@ -23,13 +24,3 @@ jobs:
 - name: Test with pytest
 run: |
 pytest -v

 # === NOTIFICATIONS ===
 # https://github.com/rectalogic/notify-irc
 - name: Dump event info
 if: always()
 # Usually unnecessary, but insanely useful if IRC notifications fail.
 run: |
 cat <<"EOF"
 ${{ toJSON(github.event) }}
 EOF

38 changes: 23 additions & 15 deletions
rope/contrib/autoimport/utils.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -19,34 +19,42 @@ def get_package_tuple(
 Returns None if not a viable package.
 """
 package_name = package_path.name
package_source = get_package_source(package_path, project)
package_type: PackageType
 if package_name.startswith(".") or package_name == "__pycache__":
 return None
 if package_path.is_file():
 if package_name.endswith(".so"):
 name = package_name.split(".")[0]
 return Package(name, package_source, package_path, PackageType.COMPILED)
 if package_name.endswith(".py"):
 stripped_name = package_path.stem
 return Package(
 stripped_name, package_source, package_path, PackageType.SINGLE_FILE
 )
 return None
 if package_name.endswith((".egg-info", ".dist-info")):
 return None
 return Package(package_name, package_source, package_path, PackageType.STANDARD)
 if package_path.is_file():
 if package_name.endswith(".so"):
 package_name = package_name.split(".")[0]
 package_type = PackageType.COMPILED
 elif package_name.endswith(".py"):
 package_name = package_path.stem
 package_type = PackageType.SINGLE_FILE
 else:
 return None
 else:
 package_type = PackageType.STANDARD
 package_source: Source = get_package_source(package_path, project, package_name)
 return Package(package_name, package_source, package_path, package_type)


def get_package_source(
 package: pathlib.Path, project: Optional[Project] = None
 package: pathlib.Path, project: Optional[Project], name: str
) -> Source:
 """Detect the source of a given package. Rudimentary implementation."""
 if name in sys.builtin_module_names:
 return Source.BUILTIN
 if project is not None and project.address in str(package):
 return Source.PROJECT
 if "site-packages" in package.parts:
 return Source.SITE_PACKAGE
 if package.as_posix().startswith(sys.prefix):
 return Source.STANDARD
 if sys.version_info < (3, 10, 0):
 if str(package).startswith(sys.prefix):
 return Source.STANDARD
 else:
 if name in sys.stdlib_module_names:
 return Source.STANDARD
 return Source.UNKNOWN


Expand Down

2 changes: 0 additions & 2 deletions
ropetest/contrib/autoimport/conftest.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,8 +35,6 @@ def typing_path():
 yield pathlib.Path(typing.__file__)




@pytest.fixture
def build_env_path():
 from build import env
Expand Down

14 changes: 9 additions & 5 deletions
ropetest/contrib/autoimport/utilstest.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,28 +1,31 @@
"""Tests for autoimport utility functions, written in pytest"""
import pathlib

from sys import platform

import pytest

from rope.contrib.autoimport import utils
from rope.contrib.autoimport.defs import Package, PackageType, Source


def test_get_package_source(mod1_path, project):
 assert utils.get_package_source(mod1_path, project) == Source.PROJECT
 assert utils.get_package_source(mod1_path, project, "") == Source.PROJECT


def test_get_package_source_not_project(mod1_path):
 assert utils.get_package_source(mod1_path) == Source.UNKNOWN
 assert utils.get_package_source(mod1_path, None, "") == Source.UNKNOWN


def test_get_package_source_pytest(build_path):
 # pytest is not installed as part of the standard library
 # but should be installed into site_packages,
 # so it should return Source.SITE_PACKAGE
 assert utils.get_package_source(build_path) == Source.SITE_PACKAGE
 assert utils.get_package_source(build_path, None, "build") == Source.SITE_PACKAGE


def test_get_package_source_typing(typing_path):

 assert utils.get_package_source(typing_path) == Source.STANDARD
 assert utils.get_package_source(typing_path, None, "typing") == Source.STANDARD


def test_get_modname_project_no_add(mod1_path, project_path):
Expand DownExpand Up@@ -53,6 +56,7 @@ def test_get_package_tuple_typing(typing_path):
 ) == utils.get_package_tuple(typing_path)


@pytest.mark.skipif(platform == "win32", reason="Windows doesn't have compiled modules")
def test_get_package_tuple_compiled(zlib_path):
 assert Package(
 "zlib", Source.STANDARD, zlib_path, PackageType.COMPILED
Expand Down

17 changes: 9 additions & 8 deletions
ropetest/doatest.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,20 +18,21 @@
from rope.base.oi import doa


def cve_2014_3539_attacker(data_port, payload):
 s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 s.connect(("127.0.0.1", data_port))
 s_file = s.makefile("wb")
 s_file.write(payload)
 s.close()


class DOATest(unittest.TestCase):
 def try_CVE_2014_3539_exploit(self, receiver, payload):
 # Simulated attacker writing to the socket
 def attacker(data_port):
 s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 s.connect(("127.0.0.1", data_port))
 s_file = s.makefile("wb")
 s_file.write(payload)
 s.close()

 # Assume the attacker guesses the port correctly; 3037 is used by
 # default if it is available.
 attacker_proc = multiprocessing.Process(
 target=attacker, args=(receiver.data_port,)
 target=cve_2014_3539_attacker, args=(receiver.data_port, payload)
 )

 attacker_proc.start()
Expand Down

4 changes: 3 additions & 1 deletion
ropetest/reprtest.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
import pathlib
import tempfile

import pytest

from rope.base import libutils, resources, pyobjectsdef, pynames
from rope.base import libutils, resources, pyobjectsdef
from rope.base.project import Project
from ropetest import testutils

Expand All@@ -27,6 +28,7 @@ def mod1(project):

def test_repr_project():
 with tempfile.TemporaryDirectory() as folder:
 folder = pathlib.Path(folder).resolve()
 obj = testutils.sample_project(folder)
 assert isinstance(obj, Project)
 assert repr(obj) == f'<rope.base.project.Project "{folder}">'
Expand Down