Skip to content

Commit d05f77f

Browse files
matsoftwarematsoftware
authored
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
1 parent 09a85ff commit d05f77f

File tree

6 files changed

+67
-11
lines changed

6 files changed

+67
-11
lines changed

‎CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8+
## [1.5.4](https://github.com/matsoftware/swift-code-metrics/releases/tag/1.5.4) - 2023-08-18
9+
10+
### Fixed
11+
12+
- [PR-45](https://github.com/matsoftware/swift-code-metrics/pull/45) Apple frameworks list update per Xcode 15 beta and CI evergreening
13+
814
## [1.5.3](https://github.com/matsoftware/swift-code-metrics/releases/tag/1.5.3) - 2023-03-17
915

1016
### Fixed

‎install.sh

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,17 @@ set -e
55
top="$(dirname "$0")"
66
python3 -m venv "${top}"/venv
77

8-
"${top}"/venv/bin/python3 "${top}"/venv/bin/pip3 install wheel
8+
pip_install="${top}/venv/bin/python3 ${top}/venv/bin/pip3 install"
9+
10+
$pip_install --upgrade "pip>=23.0"
11+
12+
$pip_install wheel
913

1014
if arch | grep -q 'arm64'; then
1115
echo "Overriding pygraphviz setup for M1 architecture"
12-
"${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
16+
$pip_install --global-option=build_ext --global-option="-I$(brew --prefix graphviz)/include" --global-option="-L$(brew --prefix graphviz)/lib" pygraphviz
1317
fi
1418

15-
"${top}"/venv/bin/python3 "${top}"/venv/bin/pip3 install -r requirements.txt
19+
$pip_install -r requirements.txt
1620

17-
"${top}"/venv/bin/python3 "${top}"/venv/bin/pip3 install -r tests-requirements.txt
21+
$pip_install -r tests-requirements.txt

‎setup.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
long_description = fh.read()
66

77
install_requires = [
8-
"matplotlib >= 2",
9-
"adjustText < 1",
8+
"matplotlib > 2",
9+
"adjustText",
1010
"pygraphviz > 1.5",
11-
"pyfunctional >= 1.2",
12-
"numpy >= 1.22.0",
11+
"pyfunctional > 1.2",
12+
"numpy > 1.22.0",
1313
"dataclasses"
1414
]
1515

‎swift_code_metrics/_helpers.py

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,27 +26,39 @@ class AnalyzerHelpers:
2626
'Accelerate',
2727
'Accessibility',
2828
'Accounts',
29+
'ActivityKit',
2930
'AddressBook',
3031
'AddressBookUI',
32+
'AdServices',
3133
'AdSupport',
3234
'AGL',
35+
'Algorithms',
3336
'AppClip',
3437
'AppKit',
38+
'AppIntents',
3539
'AppleArchive',
40+
'AppleTextureEncoder',
3641
'ApplicationServices',
3742
'AppTrackingTransparency',
43+
'ArgumentParser',
3844
'ARKit',
3945
'AssetsLibrary',
46+
'Atomics',
4047
'AudioToolbox',
4148
'AudioUnit',
4249
'AuthenticationServices',
50+
'AutomatedDeviceEnrollment',
4351
'AutomaticAssessmentConfiguration',
52+
'AVFAudio',
4453
'AVFoundation',
4554
'AVKit',
55+
'AVRouting',
4656
'BackgroundTasks',
57+
'BusinessChat',
4758
'CallKit',
4859
'CarPlay',
4960
'CFNetwork',
61+
'Cinematic',
5062
'ClassKit',
5163
'ClockKit',
5264
'CloudKit',
@@ -76,19 +88,24 @@ class AnalyzerHelpers:
7688
'CoreServices',
7789
'CoreSpotlight',
7890
'CoreTelephony',
91+
'CoreTransferable',
7992
'CoreText',
8093
'CoreVideo',
8194
'CoreWLAN',
8295
'CreateML',
96+
'CreateMLComponents',
8397
'CryptoKit',
8498
'CryptoTokenKit',
8599
'DarwinNotify',
86100
'DeveloperToolsSupport',
87101
'DeviceActivity',
88102
'DeviceCheck',
103+
'DeviceDiscoveryExtension',
89104
'DiskArbitration',
90105
'Dispatch',
106+
'Distributed',
91107
'dnssd',
108+
'DockKit',
92109
'DriverKit',
93110
'EndpointSecurity',
94111
'EventKit',
@@ -97,6 +114,8 @@ class AnalyzerHelpers:
97114
'ExecutionPolicy',
98115
'ExposureNotification',
99116
'ExternalAccessory',
117+
'ExtensionFoundation',
118+
'ExtensionKit',
100119
'FamilyControls',
101120
'FileProvider',
102121
'FileProviderUI',
@@ -108,6 +127,7 @@ class AnalyzerHelpers:
108127
'GameController',
109128
'GameKit',
110129
'GameplayKit',
130+
'GenerateManual',
111131
'GLKit',
112132
'GroupActivities',
113133
'GSS',
@@ -117,6 +137,7 @@ class AnalyzerHelpers:
117137
'HTTPLiveStreaming',
118138
'Hypervisor',
119139
'iAd',
140+
'ImageIO',
120141
'InputMethodKit',
121142
'IOBluetooth',
122143
'IOBluetoothUI',
@@ -134,15 +155,23 @@ class AnalyzerHelpers:
134155
'ManagedSettings',
135156
'ManagedSettingsUI',
136157
'MapKit',
158+
'Matter',
159+
'MatterSupport'
137160
'MediaAccessibility',
138161
'MediaLibrary',
139162
'MediaPlayer',
140163
'MediaSetup',
141164
'Messages',
142165
'MessageUI',
166+
'Metal',
167+
'MetalFX',
143168
'MetalKit',
169+
'MetalPerformanceShaders',
170+
'MetalPerformanceShadersGraph',
144171
'MetricKit',
172+
'MLCompute',
145173
'MobileCoreServices',
174+
'ModelIO',
146175
'MultipeerConnectivity',
147176
'MusicKit',
148177
'NaturalLanguage',
@@ -152,29 +181,40 @@ class AnalyzerHelpers:
152181
'NetworkingDriverKit',
153182
'NewsstandKit',
154183
'NotificationCenter',
184+
'networkext',
155185
'ObjectiveC',
186+
'OpenAL',
156187
'OpenDirectory',
157188
'OpenGL',
158189
'os',
190+
'os_object',
159191
'ParavirtualizedGraphics',
160192
'PassKit',
161193
'PDFKit',
162194
'PencilKit',
195+
'PHASE',
163196
'PhotoKit',
197+
'ProximityReader',
164198
'PushKit',
199+
'PushToTalk',
165200
'QTKit',
166201
'QuartzCore',
167202
'QuickLook',
168203
'QuickLookThumbnailing',
169204
'RealityKit',
205+
'RegexBuilder',
170206
'ReplayKit',
207+
'RoomPlan',
171208
'SafariServices',
209+
'SafetyKit',
172210
'SceneKit',
211+
'ScreenCaptureKit',
173212
'ScreenSaver',
174213
'ScreenTime',
175214
'Security',
176215
'SecurityFoundation',
177216
'SecurityInterface',
217+
'SensitiveContentAnalysis',
178218
'SensorKit',
179219
'ServiceManagement',
180220
'ShazamKit',
@@ -187,10 +227,14 @@ class AnalyzerHelpers:
187227
'SpriteKit',
188228
'StoreKit',
189229
'StoreKitTest',
230+
'SwiftData',
190231
'SwiftUI',
232+
'Symbols',
191233
'System',
192234
'SystemConfiguration',
193235
'SystemExtensions',
236+
'TabularData',
237+
'ThreadNetwork'
194238
'TVML',
195239
'TVMLKit JS',
196240
'TVMLKit',
@@ -210,6 +254,7 @@ class AnalyzerHelpers:
210254
'WatchKit',
211255
'WebKit',
212256
'WidgetKit',
257+
'WorkoutKit',
213258
'XCTest',
214259
'XPC'
215260
]

‎swift_code_metrics/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
VERSION = "1.5.3"
1+
VERSION = "1.5.4"

‎tests-requirements.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
pytest
2-
pytest-cov==2.5.0
2+
pytest-cov
33
codecov
4-
coverage
4+
coverage
5+
urllib3 <=1.26.15 # https://github.com/psf/requests/issues/6432#issuecomment-1535149114

0 commit comments

Comments
 (0)