Merge pull request psychopy#6732 from peircej/release-merge-dev

Release merge dev

.github/release.yaml

@@ -0,0 +1,23 @@
+
+# https://docs.github.com/en/repositories/releasing-projects-on-github/automatically-generated-release-notes
+
+changelog:
+  exclude:
+    labels:
+      - ignore-for-release
+      - "📦 packaging" 
+    authors:
+      - octocat
+  categories:
+    - title: New and Improved 🎉
+      labels:
+        - "🌟 enhancement" 
+    - title: 🐛 Bug Fixes
+      labels:
+        - "🐞 bug"
+    - title: "📓 Docs & Demos" 
+      labels:
+        - "📓 docs & demos" 
+    - title: Other Changes
+      labels:
+        - "*"

.github/workflows/CodeQL.yaml

@@ -0,0 +1,63 @@
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ 'dev' ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ 'dev' ]
+  schedule:
+    - cron: '8 3 * * 3'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'python', 'javascript' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v3
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+
+        # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+        # queries: security-extended,security-and-quality
+
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, Go, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v3
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+
+    #   If the Autobuild fails above, remove it and uncomment the following three lines.
+    #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
+
+    # - run: |
+    #   echo "Run, Build Application using script"
+    #   ./location_of_script_within_repo/buildscript.sh
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v3
+      with:
+        category: "/language:${{matrix.language}}"

.github/workflows/pytests.yaml

@@ -14,8 +14,9 @@ jobs:
 
     runs-on: ${{ matrix.os }}
     strategy:
+      fail-fast: false
       matrix:
-        os: [macos-11, ubuntu-latest]
+        os: [macos-13, ubuntu-latest]
         python-version: ['3.8', '3.10']
 
     steps:
@@ -69,7 +70,6 @@ jobs:
         python -m pip install --upgrade pip
         pip install wheel
         pip install six  # for configobj and wxpython
-        pip install distro  # used by createInitFile
         pip install attrdict3  # used by wxpython setup
         python ./building/plat_custom_installs.py
 
@@ -141,19 +141,19 @@ jobs:
 
     - name: upload failed app data
       if: always()
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
-        name: prefs for ${{ matrix.os }}_${{ matrix.python-version }}
+        name: prefs_files_${{ matrix.os }}_${{ matrix.python-version }}
         path: |
           ~/.psychopy3
           !~/.psychopy3/versions
           !~/.psychopy3/fonts
 
     - name: upload failed screenshots
       if: always()
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
-        name: test artifacts
+        name: failed_test_data_${{ github.run_id }}_${{ matrix.python-version }}_${{ matrix.os }}
         path: |
           psychopy/tests/fails
           !**/*.mp4

.gitignore

@@ -1,4 +1,9 @@
 
+#########################################
+# keep version files in and manually update if needed
+GIT_SHA
+VERSION
+
 #########################################
 # Editor temporary/working/backup files #
 .#*
@@ -71,7 +76,7 @@ nonSVN
 # Things specific to this project #
 ###################################
 # pdm.lock will include platform-specific libs so not portable
-pdm.lock
+# pdm.lock
 
 psychopy/demos/coder/misc/frame*
 psychopy/demos/**/data/*.psydat

MANIFEST.in

@@ -1,9 +1,10 @@
 include LICENSE
+include psychopy/VERSION
+include psychopy/GIT_SHA
 recursive-include psychopy *.txt
 recursive-include psychopy *.zip
 
-recursive-include psychopy *.png
-recursive-include psychopy/app/themes *.json
+recursive-include psychopy *.png *.json
 recursive-include psychopy/app/Resources *.icns
 recursive-include psychopy/app/Resources *.ico
 recursive-include psychopy/app/Resources *.ttf
@@ -18,12 +19,11 @@ recursive-include psychopy/experiment *.tmpl experiment.xsd
 recursive-include psychopy/monitors *.ico
 
 recursive-include psychopy/iohub *.yaml
-recursive-include psychopy/iohub/devices/eyetracker/hw/sr_research/eyelink/win32 *.pyc *.dll *.pyd
 
 recursive-include psychopy/visual/textbox/fonts *.ttf
 recursive-include psychopy/experiment *.xltx
 
-recursive-include psychopy/demos/coder *.mov *.jpg *.ttf *.yaml *.py *.part *.xlsx *.xls
+recursive-include psychopy/demos/coder *.mov *.jpg *.ttf *.yaml *.py *.part *.xlsx
 recursive-include psychopy/demos/builder *.psyexp *.csv *.xlsx *.wav *.yaml
 
 recursive-include psychopy/preferences *.spec
@@ -37,6 +37,5 @@ recursive-include docs/source/_templates *.html
 prune docs/build
 prune docs/source/nonSphinx
 prune windlls
-include version
 
 recursive-include psychopy/alerts *.yaml

README.md

@@ -38,9 +38,9 @@ and the developers documentation at [https://www.psychopy.org/developers](https:
 
 ## Code Status
 
-[![Language grade: Python](https://img.shields.io/lgtm/grade/python/g/psychopy/psychopy.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/psychopy/psychopy/context:python)  
-Dev branch tests: [![GH tests](https://github.com/psychopy/psychopy/actions/workflows/pytests.yaml/badge.svg?branch=dev)](https://github.com/psychopy/psychopy/actions/workflows/pytests.yaml?query=branch%3Adev)  
-Release tests: [![GH tests](https://github.com/psychopy/psychopy/actions/workflows/pytests.yaml/badge.svg?branch=release)](https://github.com/psychopy/psychopy/actions/workflows/pytests.yaml?query=branch%3Arelease)
+Dev branch: [![GH tests dev](https://github.com/psychopy/psychopy/actions/workflows/pytests.yaml/badge.svg?branch=dev)](https://github.com/psychopy/psychopy/actions/workflows/pytests.yaml?query=branch%3Adev)  [![CodeQL (dev)](https://github.com/psychopy/psychopy/actions/workflows/CodeQL.yaml/badge.svg?branch=dev)](https://github.com/psychopy/psychopy/actions/workflows/CodeQL.yaml?query=branch%3Adev) 
+
+Release branch: [![GH tests release](https://github.com/psychopy/psychopy/actions/workflows/pytests.yaml/badge.svg?branch=release)](https://github.com/psychopy/psychopy/actions/workflows/pytests.yaml?query=branch%3Arelease) [![CodeQL (release)](https://github.com/psychopy/psychopy/actions/workflows/CodeQL.yaml/badge.svg?branch=release)](https://github.com/psychopy/psychopy/actions/workflows/CodeQL.yaml?query=branch%3Arelease)
 
 ## More information
 

buildWinDistributions.ps1

@@ -15,7 +15,7 @@ $names = @("PsychoPy")
 $archs = @("win64")
 
 # read from the version file
-$versionfile = Join-Path $pwd "version"
+$versionfile = Join-Path $pwd "psychopy\VERSION"
 $v = [Io.File]::ReadAllText($versionfile).Trim()
 
 for ($i=0; $i -lt $pyPaths.Length; $i++) {