Merge pull request #304 from MelbourneHighSchoolRobotics/upgrade-v2.2.3

glipR · web-flow · commit 034b6eb520fd · 2023-02-10T18:24:13.000+11:00
Upgrade v2.2.3
diff --git a/.github/workflows/docs_check.yml b/.github/workflows/docs_check.yml
@@ -22,7 +22,7 @@ jobs:
     - name: Install dependencies
       run: |
         sudo apt-get update
-        sudo apt-get install python3-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-ttf2.0-dev   libsdl1.2-dev libsmpeg-dev python-numpy subversion libportmidi-dev ffmpeg libswscale-dev libavformat-dev libavcodec-dev
+        sudo apt-get install python3-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-ttf2.0-dev   libsdl1.2-dev libsmpeg-dev subversion libportmidi-dev ffmpeg libswscale-dev libavformat-dev libavcodec-dev
         python -m pip install --upgrade pip
         if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
         if [ -f requirements-dev.txt ]; then pip install -r requirements-dev.txt; fi
diff --git a/.github/workflows/docs_deploy.yml b/.github/workflows/docs_deploy.yml
@@ -1,9 +1,9 @@
- 
+
 name: Docs github pages deploy
 
 on:
   push:
-    branches:    
+    branches:
       - main
 
 jobs:
@@ -18,11 +18,11 @@ jobs:
       uses: actions/setup-python@v2
       with:
         python-version: 3.9
-    
+
     - name: Install dependencies
       run: |
         sudo apt-get update
-        sudo apt-get install python3-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-ttf2.0-dev   libsdl1.2-dev libsmpeg-dev python-numpy subversion libportmidi-dev ffmpeg libswscale-dev libavformat-dev libavcodec-dev
+        sudo apt-get install python3-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-ttf2.0-dev   libsdl1.2-dev libsmpeg-dev subversion libportmidi-dev ffmpeg libswscale-dev libavformat-dev libavcodec-dev
         python -m pip install --upgrade pip
         if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
         if [ -f requirements-dev.txt ]; then pip install -r requirements-dev.txt; fi
@@ -32,7 +32,7 @@ jobs:
         pip install -r requirements.txt
         make html
       working-directory: ./docs
-        
+
     # Create an artifact of the html output.
     - uses: actions/upload-artifact@v1
       with:
diff --git a/.github/workflows/pypi_release.yml b/.github/workflows/pypi_release.yml
@@ -1,7 +1,7 @@
 # This workflow will install Python dependencies, run tests and lint with a variety of Python versions
 # For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
 
-name: Build and deploy to PyPi 
+name: Build and deploy to PyPi
 
 on:
   release:
@@ -20,7 +20,7 @@ jobs:
     - name: Install dependencies
       run: |
         sudo apt-get update
-        sudo apt-get install python3-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-ttf2.0-dev   libsdl1.2-dev libsmpeg-dev python-numpy subversion libportmidi-dev ffmpeg libswscale-dev libavformat-dev libavcodec-dev
+        sudo apt-get install python3-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-ttf2.0-dev   libsdl1.2-dev libsmpeg-dev subversion libportmidi-dev ffmpeg libswscale-dev libavformat-dev libavcodec-dev
         python -m pip install --upgrade pip
         pip install pytest
         if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
@@ -31,5 +31,5 @@ jobs:
       uses: pypa/gh-action-pypi-publish@master
       with:
         user: __token__
-        password: ${{ secrets.pypi_password }} 
+        password: ${{ secrets.pypi_password }}
 
diff --git a/.github/workflows/python_lint.yml b/.github/workflows/python_lint.yml
@@ -21,7 +21,7 @@ jobs:
     - name: Install dependencies
       run: |
         sudo apt-get update
-        sudo apt-get install python3-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-ttf2.0-dev   libsdl1.2-dev libsmpeg-dev python-numpy subversion libportmidi-dev ffmpeg libswscale-dev libavformat-dev libavcodec-dev
+        sudo apt-get install python3-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-ttf2.0-dev   libsdl1.2-dev libsmpeg-dev subversion libportmidi-dev ffmpeg libswscale-dev libavformat-dev libavcodec-dev
         python -m pip install --upgrade pip
         pip install pytest
         if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
diff --git a/.github/workflows/python_test.yml b/.github/workflows/python_test.yml
@@ -21,7 +21,7 @@ jobs:
     - name: Install dependencies
       run: |
         sudo apt-get update
-        sudo apt-get install python3-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-ttf2.0-dev   libsdl1.2-dev libsmpeg-dev python-numpy subversion libportmidi-dev ffmpeg libswscale-dev libavformat-dev libavcodec-dev
+        sudo apt-get install python3-dev libsdl-image1.2-dev libsdl-mixer1.2-dev libsdl-ttf2.0-dev   libsdl1.2-dev libsmpeg-dev subversion libportmidi-dev ffmpeg libswscale-dev libavformat-dev libavcodec-dev
         python -m pip install --upgrade pip
         pip install pytest
         if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
diff --git a/.github/workflows/windows_package_create.yml b/.github/workflows/windows_package_create.yml
@@ -7,27 +7,27 @@ on:
 jobs:
   create-exe:
 
-    runs-on: ubuntu-latest
+    runs-on: windows-latest
 
     steps:
     - uses: actions/checkout@v1
 
-    - uses: cachix/install-nix-action@v13
+    - name: Set up Python
+      uses: actions/setup-python@v2
       with:
-        install_url: https://nixos-nix-install-tests.cachix.org/serve/i6laym9jw3wg9mw6ncyrk6gjx4l34vvx/install
-        install_options: '--tarball-url-prefix https://nixos-nix-install-tests.cachix.org/serve'
-        extra_nix_config: |
-          experimental-features = nix-command flakes
-          access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
-    - uses: cachix/cachix-action@v10
-      with:
-        name: melbournehighschoolrobotics
-        authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
+        python-version: 3.9
+
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install -r requirements.txt
+        pip install -r requirements-dev.txt
 
-    - run: nix build --print-build-logs ".#windows"
-    - run: nix flake check
+    - name: Build with pyinstaller
+      run: |
+        python -m build_exe
 
     - uses: actions/upload-artifact@v1
       with:
         name: windows_package
-        path: result/
+        path: dist/ev3sim
diff --git a/config.nsi b/config.nsi
@@ -16,7 +16,7 @@ Function .onInit
 StrCpy $InstDir "$LocalAppData\$(^Name)"
 StrCpy $ExeLocation "$InstDir\python_embed\Scripts\ev3sim.exe"
 SetShellVarContext Current
-FunctionEnd 
+FunctionEnd
 
 ;---------------------------------
 ;Styling
@@ -62,7 +62,7 @@ FunctionEnd
 
 ;--------------------------------
 ;Languages
- 
+
 !insertmacro MUI_LANGUAGE "English"
 
 ;---------------------------------
@@ -83,7 +83,8 @@ File /nonfatal /a /r "dist\"
 WriteRegStr HKCU "Software\EV3Sim" "" $InstDir
 
 ;Run pip install process. pythonw seems to not finish correctly, and so ev3sim doesn't get installed.
-ExecDos::exec '"$InstDir\python_embed\python.exe" -m pip install -f "$InstDir\python_embed\wheels" --no-index ev3sim' "" "$InstDir\pip.log"
+;To use test.pypi: '"$InstDir\python_embed\python.exe" -m pip install --trusted-host pypi.org --trusted-host files.pythonhosted.org -i https://test.pypi.org/simple/ --extra-index-url https://pypi.org/simple ev3sim==2.1.8.post1'
+ExecDos::exec '"$InstDir\python_embed\python.exe" -m pip install --trusted-host pypi.org --trusted-host files.pythonhosted.org ev3sim' "" "$InstDir\pip.log"
 Pop $0
 StrCmp "0" $0 fine
 
diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -1,4 +1,5 @@
 recommonmark==0.6.0
 Sphinx==3.1.2
 sphinx-rtd-theme==0.5.0
-pygments==2.7.4
+pygments==2.7.4
+Jinja2<3.1
diff --git a/ev3sim/__init__.py b/ev3sim/__init__.py
@@ -1 +1 @@
-__version__ = "2.2.2"
+__version__ = "2.2.3"
diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -1,3 +1,4 @@
-black>=20.8b1
+black==20.8b1
+click==8.0.2
 wheel>=0.36.2
 pyinstaller>=4.1

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-__version__ = "2.2.2"`
	`1`	`+__version__ = "2.2.3"`