Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
runs-on: windows-2019
strategy:
matrix:
python-version: [3.9]
python-version: '3.10'

steps:
- name: Checkout
Expand Down Expand Up @@ -71,7 +71,7 @@ jobs:
runs-on: ubuntu-18.04
strategy:
matrix:
python-version: [3.9]
python-version: '3.10'

steps:
- name: Checkout
Expand Down Expand Up @@ -99,7 +99,7 @@ jobs:
runs-on: macos-10.15
strategy:
matrix:
python-version: [3.9]
python-version: '3.10'

steps:
- name: Checkout
Expand Down
18 changes: 9 additions & 9 deletions INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ sudo apt-get install -y git
sudo apt-get install -y libportaudio2
```

3. Install python 3.9 and related build tools
3. Install python 3.10 and related build tools
```
sudo apt-get install -y python3.9-dev
sudo apt-get install -y python3.10-dev
```

4. Clone the repository
Expand All @@ -43,30 +43,30 @@ git checkout origin/<branchName>
6. Update `pip`, `setuptools` and `virtualenv`

```
sudo python3.9 -m pip install --upgrade pip
sudo pip3.9 install --upgrade setuptools
sudo pip3.9 install --upgrade virtualenv
sudo python3.10 -m pip install --upgrade pip
sudo pip3.10 install --upgrade setuptools
sudo pip3.10 install --upgrade virtualenv
```

7. Create a virtualenv and activate it
```
virtualenv -p /usr/bin/python3.9 buildenv
virtualenv -p /usr/bin/python3.10 buildenv
source ./buildenv/bin/activate
```

8. Install Friture requirements (PyQt5, etc.)
```
pip3.9 install -r requirements.txt
pip3.10 install -r requirements.txt
```

9. Build Cython extensions
```
python3.9 setup.py build_ext --inplace
python3.10 setup.py build_ext --inplace
```

10. Run Friture
```
python3.9 main.py
python3.10 main.py
```

## Running Friture from source on Windows
Expand Down
2 changes: 1 addition & 1 deletion choco/packages.config
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="python" version="3.9.1" />
<package id="python" version="3.10.8" />
<!-- Microsoft Visual Build Tools and C++ workload for Cython, Numpy, etc. -->
<package id="visualstudio2017buildtools" version="15.9.4.0" />
<package id="visualstudio2017-workload-vctools" version="1.3.1" packageParameters="--add Microsoft.VisualStudio.Component.VC.140"/>
Expand Down