Evergreening - August 2023 (#45)

* Toolchain and dependencies refresh * Apple frameworks list update per Xcode 15 beta * Update CHANGELOG.md and version bump * Enforcing urllib3 version for codecov script
matsoftware · Aug 18, 2023 · d05f77f · d05f77f
1 parent 09a85ff
commit d05f77f
Show file tree

Hide file tree

Showing 6 changed files with 67 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.5.4](https://github.com/matsoftware/swift-code-metrics/releases/tag/1.5.4) - 2023-08-18
+
+### Fixed
+
+-   [PR-45](https://github.com/matsoftware/swift-code-metrics/pull/45) Apple frameworks list update per Xcode 15 beta and CI evergreening
+
 ## [1.5.3](https://github.com/matsoftware/swift-code-metrics/releases/tag/1.5.3) - 2023-03-17
 
 ### Fixed

diff --git a/install.sh b/install.sh
@@ -5,13 +5,17 @@ set -e
 top="$(dirname "$0")"
 python3 -m venv "${top}"/venv
 
-"${top}"/venv/bin/python3 "${top}"/venv/bin/pip3 install wheel
+pip_install="${top}/venv/bin/python3 ${top}/venv/bin/pip3 install"
+
+$pip_install --upgrade "pip>=23.0"
+
+$pip_install wheel
 
 if arch | grep -q 'arm64'; then
     echo "Overriding pygraphviz setup for M1 architecture"
-    "${top}"/venv/bin/python3 "${top}"/venv/bin/pip3 install --global-option=build_ext --global-option="-I$(brew --prefix graphviz)/include" --global-option="-L$(brew --prefix graphviz)/lib" pygraphviz
+    $pip_install --global-option=build_ext --global-option="-I$(brew --prefix graphviz)/include" --global-option="-L$(brew --prefix graphviz)/lib" pygraphviz
 fi
 
-"${top}"/venv/bin/python3 "${top}"/venv/bin/pip3 install -r requirements.txt
+$pip_install -r requirements.txt
 
-"${top}"/venv/bin/python3 "${top}"/venv/bin/pip3 install -r tests-requirements.txt
+$pip_install -r tests-requirements.txt
diff --git a/setup.py b/setup.py
@@ -5,11 +5,11 @@
     long_description = fh.read()
 
 install_requires = [
-    "matplotlib >= 2",
-    "adjustText < 1",
+    "matplotlib > 2",
+    "adjustText",
     "pygraphviz > 1.5",
-    "pyfunctional >= 1.2",
-    "numpy >= 1.22.0",
+    "pyfunctional > 1.2",
+    "numpy > 1.22.0",
     "dataclasses"
 ]
 

diff --git a/swift_code_metrics/_helpers.py b/swift_code_metrics/_helpers.py
@@ -26,27 +26,39 @@ class AnalyzerHelpers:
         'Accelerate',
         'Accessibility',
         'Accounts',
+        'ActivityKit',
         'AddressBook',
         'AddressBookUI',
+        'AdServices',
         'AdSupport',
         'AGL',
+        'Algorithms',
         'AppClip',
         'AppKit',
+        'AppIntents',
         'AppleArchive',
+        'AppleTextureEncoder',
         'ApplicationServices',
         'AppTrackingTransparency',
+        'ArgumentParser',
         'ARKit',
         'AssetsLibrary',
+        'Atomics',
         'AudioToolbox',
         'AudioUnit',
         'AuthenticationServices',
+        'AutomatedDeviceEnrollment',
         'AutomaticAssessmentConfiguration',
+        'AVFAudio',
         'AVFoundation',
         'AVKit',
+        'AVRouting',
         'BackgroundTasks',
+        'BusinessChat',
         'CallKit',
         'CarPlay',
         'CFNetwork',
+        'Cinematic',
         'ClassKit',
         'ClockKit',
         'CloudKit',
@@ -76,19 +88,24 @@ class AnalyzerHelpers:
         'CoreServices',
         'CoreSpotlight',
         'CoreTelephony',
+        'CoreTransferable',
         'CoreText',
         'CoreVideo',
         'CoreWLAN',
         'CreateML',
+        'CreateMLComponents',
         'CryptoKit',
         'CryptoTokenKit',
         'DarwinNotify',
         'DeveloperToolsSupport',
         'DeviceActivity',
         'DeviceCheck',
+        'DeviceDiscoveryExtension',
         'DiskArbitration',
         'Dispatch',
+        'Distributed',
         'dnssd',
+        'DockKit',
         'DriverKit',
         'EndpointSecurity',
         'EventKit',
@@ -97,6 +114,8 @@ class AnalyzerHelpers:
         'ExecutionPolicy',
         'ExposureNotification',
         'ExternalAccessory',
+        'ExtensionFoundation',
+        'ExtensionKit',
         'FamilyControls',
         'FileProvider',
         'FileProviderUI',
@@ -108,6 +127,7 @@ class AnalyzerHelpers:
         'GameController',
         'GameKit',
         'GameplayKit',
+        'GenerateManual',
         'GLKit',
         'GroupActivities',
         'GSS',
@@ -117,6 +137,7 @@ class AnalyzerHelpers:
         'HTTPLiveStreaming',
         'Hypervisor',
         'iAd',
+        'ImageIO',
         'InputMethodKit',
         'IOBluetooth',
         'IOBluetoothUI',
@@ -134,15 +155,23 @@ class AnalyzerHelpers:
         'ManagedSettings',
         'ManagedSettingsUI',
         'MapKit',
+        'Matter',
+        'MatterSupport'
         'MediaAccessibility',
         'MediaLibrary',
         'MediaPlayer',
         'MediaSetup',
         'Messages',
         'MessageUI',
+        'Metal',
+        'MetalFX',
         'MetalKit',
+        'MetalPerformanceShaders',
+        'MetalPerformanceShadersGraph',
         'MetricKit',
+        'MLCompute',
         'MobileCoreServices',
+        'ModelIO',
         'MultipeerConnectivity',
         'MusicKit',
         'NaturalLanguage',
@@ -152,29 +181,40 @@ class AnalyzerHelpers:
         'NetworkingDriverKit',
         'NewsstandKit',
         'NotificationCenter',
+        'networkext',
         'ObjectiveC',
+        'OpenAL',
         'OpenDirectory',
         'OpenGL',
         'os',
+        'os_object',
         'ParavirtualizedGraphics',
         'PassKit',
         'PDFKit',
         'PencilKit',
+        'PHASE',
         'PhotoKit',
+        'ProximityReader',
         'PushKit',
+        'PushToTalk',
         'QTKit',
         'QuartzCore',
         'QuickLook',
         'QuickLookThumbnailing',
         'RealityKit',
+        'RegexBuilder',
         'ReplayKit',
+        'RoomPlan',
         'SafariServices',
+        'SafetyKit',
         'SceneKit',
+        'ScreenCaptureKit',
         'ScreenSaver',
         'ScreenTime',
         'Security',
         'SecurityFoundation',
         'SecurityInterface',
+        'SensitiveContentAnalysis',
         'SensorKit',
         'ServiceManagement',
         'ShazamKit',
@@ -187,10 +227,14 @@ class AnalyzerHelpers:
         'SpriteKit',
         'StoreKit',
         'StoreKitTest',
+        'SwiftData',
         'SwiftUI',
+        'Symbols',
         'System',
         'SystemConfiguration',
         'SystemExtensions',
+        'TabularData',
+        'ThreadNetwork'
         'TVML',
         'TVMLKit JS',
         'TVMLKit',
@@ -210,6 +254,7 @@ class AnalyzerHelpers:
         'WatchKit',
         'WebKit',
         'WidgetKit',
+        'WorkoutKit',
         'XCTest',
         'XPC'
     ]

diff --git a/swift_code_metrics/version.py b/swift_code_metrics/version.py
@@ -1 +1 @@
-VERSION = "1.5.3"
+VERSION = "1.5.4"
diff --git a/tests-requirements.txt b/tests-requirements.txt
@@ -1,4 +1,5 @@
 pytest
-pytest-cov==2.5.0
+pytest-cov
 codecov
-coverage
+coverage
+urllib3 <=1.26.15 # https://github.com/psf/requests/issues/6432#issuecomment-1535149114