Build with Qt 6.7.0 on windows and macos

.github/workflows/package-macos.yml

@@ -10,7 +10,7 @@ jobs:
  strategy:
  matrix:
  setup:
- - macos-deployment-version: 11
+ - macos-deployment-version: '11.0'
  python-version: 3.12.1-macos11
  python-sha256sum: 6178e42679eb83196240fc58b1438f481c32c2b0557f28ccf43aa7b1b80b7c4a
  env:
@@ -50,8 +50,7 @@ jobs:
  PYINSTALLER_COMPILE_BOOTLOADER: "1"
  - name: Run tests
  timeout-minutes: 30
- run: |
- python3 setup.py test
+ run: pytest --verbose
  - name: Prepare code signing certificate
  run: |
  if [ -n "$CODESIGN_MACOS_P12_URL" ] && [ -n "$AWS_ACCESS_KEY_ID" ]; then

.github/workflows/package-windows.yml

@@ -60,7 +60,7 @@ jobs:
  python setup.py patch_version --platform=$Env:BUILD_NUMBER.$(git rev-parse --short HEAD)
  - name: Run tests
  timeout-minutes: 30
- run: python setup.py test
+ run: pytest --verbose
  - name: Prepare code signing certificate
  if: matrix.type != 'store-app'
  run: |

picard.spec

@@ -132,7 +132,7 @@ else:
  'CFBundleVersion': '%d.%d.%d' % PICARD_VERSION[:3],
  'CFBundleShortVersionString': PICARD_VERSION.short_str(),
  'LSApplicationCategoryType': 'public.app-category.music',
- 'LSMinimumSystemVersion': os.environ.get('MACOSX_DEPLOYMENT_TARGET', '10.14'),
+ 'LSMinimumSystemVersion': os.environ.get('MACOSX_DEPLOYMENT_TARGET', '11.0'),
  'NSHighResolutionCapable': True,
  'NSPrincipalClass': 'NSApplication',
  'NSRequiresAquaSystemAppearance': False,

requirements-build.txt

@@ -1,3 +1,4 @@
 Babel>=2.10.0
 PyInstaller==6.5.0
+pytest>=8.1
 setuptools>=62.4.0

requirements-macos-11.txt → requirements-macos-11.0.txt

@@ -4,8 +4,8 @@ mutagen==1.47.0
 PyJWT==2.8.0
 pyobjc-core==10.1
 pyobjc-framework-Cocoa==10.1
-PyQt6==6.5.3
-PyQt6-Qt6==6.5.3
+PyQt6==6.7.0
+PyQt6-Qt6==6.7.0
 python-dateutil==2.8.2
 PyYAML==6.0.1
 charset-normalizer==3.3.2

requirements-win.txt

@@ -2,8 +2,8 @@ discid==1.2.0
 Markdown==3.5.1
 mutagen==1.47.0
 PyJWT==2.8.0
-PyQt6==6.6.1
-PyQt6-Qt6==6.6.1
+PyQt6==6.7.0
+PyQt6-Qt6==6.7.0
 python-dateutil==2.8.2
 pywin32==306
 PyYAML==6.0.1

requirements.txt

@@ -4,10 +4,8 @@ mutagen~=1.37
 PyJWT~=2.0
 pyobjc-core>=6.2, <11; sys_platform == 'darwin'
 pyobjc-framework-Cocoa>=6.2, <11; sys_platform == 'darwin'
-PyQt6>=6.6.1, <6.7; sys_platform != 'darwin'
-PyQt6==6.5.3; sys_platform == 'darwin'
-PyQt6-Qt6>=6.6.1, <6.7; sys_platform != 'darwin'
-PyQt6-Qt6~=6.5.3; sys_platform == 'darwin'
+PyQt6>=6.7.0
+PyQt6-Qt6>=6.7.0
 python-dateutil~=2.7
 pywin32; sys_platform == 'win32'
 PyYAML>=5.1, <7

test/test_config.py

@@ -47,7 +47,6 @@ def setUp(self):
 
  self.configpath = os.path.join(self.tmp_directory, 'test.ini')
  shutil.copy(os.path.join('test', 'data', 'test.ini'), self.configpath)
- self.addCleanup(os.remove, self.configpath)
 
  self.config = Config.from_file(None, self.configpath)
  self.addCleanup(self.cleanup_config_obj)
@@ -61,6 +60,7 @@ def cleanup_config_obj(self):
  self.config.sync()
  del self.config
  self.config = None
+ os.remove(self.configpath)
 
 
 class TestPicardConfig(TestPicardConfigCommon):

test/test_profiles.py

@@ -58,7 +58,6 @@ def setUp(self):
 
  self.configpath = os.path.join(self.tmp_directory, 'test.ini')
  shutil.copy(os.path.join('test', 'data', 'test.ini'), self.configpath)
- self.addCleanup(os.remove, self.configpath)
 
  self.config = Config.from_file(None, self.configpath)
  self.addCleanup(self.cleanup_config_obj)
@@ -94,6 +93,7 @@ def cleanup_config_obj(self):
  self.config.sync()
  del self.config
  self.config = None
+ os.remove(self.configpath)
 
  def get_profiles(self, enabled=True):
  profiles = []