Smoketest fixes

.github/workflows/test-smoketests.yml

@@ -13,9 +13,18 @@ jobs:
  timeout-minutes: 15
  strategy:
  matrix:
- os: [ ubuntu-latest, macos-latest ] # disabling windows-latest for now
+ os: [ ubuntu-latest, macos-13 ] # disabling windows-latest for now
  python: [ '3.8', '3.9', '3.10', '3.11', '3.12']
-
+ exclude:
+ - os: macos-latest
+ python: 3.8
+ - os: macos-latest
+ python: 3.9
+ include:
+ - os: macos-13
+ python: 3.8
+ - os: macos-13
+ python: 3.9
  steps:
  - uses: actions/checkout@v4
 
@@ -26,7 +35,7 @@ jobs:
 
  - name: Work around arm64 support on MacOS
  # https://github.com/actions/virtual-environments/issues/2557
- if: matrix.os == 'macos-latest'
+ if: matrix.os == 'macos-latest' || matrix.os == 'macos-13'
  run: sudo rm -Rf /Library/Developer/CommandLineTools/SDKs/*
 
  - name: Install dependencies
@@ -57,4 +66,4 @@ jobs:
  - name: -m invocation smoketest
  run: |
  python -m pip install git+https://github.com/sternj/import_stress_test
- python -m scalene --cli --- -m import_stress_test
+ python -m scalene --cli --- -m import_stress_test

.github/workflows/tests.yml

@@ -16,9 +16,18 @@ jobs:
  timeout-minutes: 15
  strategy:
  matrix:
- os: [ ubuntu-latest, macos-latest ]
- python: [ '3.9', '3.10', '3.11', '3.12' ]
-
+ os: [ ubuntu-latest, macos-13 ] # disabling windows-latest for now
+ python: [ '3.8', '3.9', '3.10', '3.11', '3.12']
+ exclude:
+ - os: macos-latest
+ python: 3.8
+ - os: macos-latest
+ python: 3.9
+ include:
+ - os: macos-13
+ python: 3.8
+ - os: macos-13
+ python: 3.9
  steps:
  - uses: actions/checkout@v4
 
@@ -33,7 +42,7 @@ jobs:
 
  - name: Work around arm64 support on MacOS
  # https://github.com/actions/virtual-environments/issues/2557
- if: matrix.os == 'macos-latest'
+ if: matrix.os == 'macos-latest' || matrix.os == 'macos-13'
  run: sudo rm -Rf /Library/Developer/CommandLineTools/SDKs/*
 
  - name: Install dependencies
@@ -52,4 +61,4 @@ jobs:
 
  - name: run tests
  run: |
- python3 -m pytest
+ pytest

scalene/scalene_analysis.py

@@ -64,7 +64,7 @@ def get_imported_modules(source: str) -> List[str]:
  if isinstance(node, (ast.Import, ast.ImportFrom)):
  imported_modules.append(ast.unparse(node))
 
- return imported_modules
+ return list(map(str.strip, imported_modules))
 
  @staticmethod
  def get_native_imported_modules(source: str) -> List[str]:
@@ -96,7 +96,7 @@ def get_native_imported_modules(source: str) -> List[str]:
  if ScaleneAnalysis.is_native(node.module):
  imported_modules.append(ast.unparse(node))
 
- return imported_modules
+ return list(map(str.strip, imported_modules))
 
  @staticmethod
  def find_regions(src: str) -> Dict[int, Tuple[int, int]]: