Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge Dev into Latest #79

Merged
merged 56 commits into from
May 12, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
337dbd4
Revert "Revert "Pin mac intel installer to 10.15 (#11209)" (#11210)" …
cmmarslender Apr 19, 2022
7a123af
Fix install.sh test for bookworm (#11227)
cmmarslender Apr 19, 2022
83a7405
aiohttp==3.8.1 for Python 3.10 (#11129)
altendky Apr 20, 2022
0aaa343
replace some asyncio.get_event_loop().run_until_complete() with async…
altendky Apr 20, 2022
a663ece
fix ssl context creation for server vs. client side (#11134)
altendky Apr 20, 2022
dbedf1d
Fix timelord closing. (#10630)
fchirica Apr 20, 2022
6207da3
Up Windows installer build timeout to 50 minutes (#11107)
altendky Apr 20, 2022
ddab10c
locate pyinstaller in dev deps rather than build scripts (#11118)
altendky Apr 20, 2022
e741fe1
remove setting of SCM_VERSION in install-version.py (#11119)
altendky Apr 20, 2022
068b68f
Bump actions/upload-artifact from 2 to 3 (#11144)
dependabot[bot] Apr 20, 2022
547219b
Remove 3.9.11 for Windows Installer (#11226)
hoffmang9 Apr 20, 2022
b5a8ac3
Add cli only rpm (#11236)
cmmarslender Apr 21, 2022
2e42233
Testing postinst/prerm scripts with the UI .deb (#11258)
cmmarslender Apr 21, 2022
ea8cc18
have pyinstaller check platlib for dll's, not ROOT (#11120)
altendky Apr 22, 2022
3bff076
harvester: Use a set instead of a list to speed up availability check…
xdustinface Apr 20, 2022
398d367
harvester: Use a set instead of a list to speed up availability check…
xdustinface Apr 20, 2022
4d6dd2f
check dependency artifacts (#11243)
altendky Apr 22, 2022
9f6f5f6
Debian bookworm now uses 3.10, update the comment (#11278)
altendky Apr 24, 2022
b6370b2
Update setproctitle to 1.2.3 for python 3.10 (#11274)
emlowe Apr 24, 2022
728bba0
Remove multidict from setup.py for python 3.10 (#11272)
emlowe Apr 24, 2022
086de8d
Update PyYAML to 6.0 for python 3.10 (#11273)
emlowe Apr 24, 2022
eb92556
Add Linux Mint to test matrix (#11295)
altendky Apr 25, 2022
74f3ecd
simplify install.sh ubuntu version tracking (#11288)
altendky Apr 25, 2022
38be31b
Fix targeting for arm64 to not land on native arm64 mac runners (#11309)
cmmarslender Apr 25, 2022
9dcc022
Update names of installer workflows so they get grouped together in t…
cmmarslender Apr 26, 2022
0b0b82c
also m1 and arm64 for wheel checks (#11277)
altendky Apr 26, 2022
e0deccd
Upload CLI RPMS to s3, create checksums, etc (#11316)
cmmarslender Apr 26, 2022
ceaca43
Support for Python 3.10 (#9930)
altendky Apr 26, 2022
5b25488
Build installers on push to release branches (#11321)
cmmarslender Apr 26, 2022
ec23a8b
Mark workspace safe for arm installers (#11339)
cmmarslender Apr 27, 2022
aeb5629
Fix issue with missing coins (#11338)
mariano54 Apr 27, 2022
351fd1d
farmer|rpc: Introduce `get_harvesters_summary` RPC endpoint (#11245)
xdustinface Apr 29, 2022
f4d2e77
plot_sync: Introduce `receiver.Sync` (#11267)
xdustinface Apr 29, 2022
5fd88ce
farmer|rpc: Some changes to `get_harvesters{_summary}` RPC endpoints …
xdustinface Apr 30, 2022
630b401
util: Implement `Paginator` class as interface to access a list by pa…
xdustinface Apr 30, 2022
5482086
farmer|rpc: Add `plot_count` to `get_pool_state` RPC endpoint (#11364)
xdustinface May 2, 2022
946d216
test: Give `setup_farmer` and `setup_harvester` a separate chia root …
xdustinface May 3, 2022
8363617
farmer|rpc|tests: Implement paginated harvester plot endpoints (#11365)
xdustinface May 3, 2022
e1255c9
farmer|gui: Enable paginated plot loading and improved state reportin…
xdustinface May 3, 2022
06684f9
streamable: Enable `isort` + more `mypy` (#10539)
xdustinface Apr 20, 2022
8f7f439
harvester: Tweak `get_plots` RPC (#11246)
xdustinface Apr 21, 2022
526eef4
updated gui to 748f99f285cbfd0ccbdadd97adab34b2a4046889 (#11461)
wjblanke May 6, 2022
4d29bbc
updating gui for 1.3.5 dogfood build
wallentx May 6, 2022
b396c3e
updated gui to 32245d869c70eedbb2a5fe77618b107dda70a647 (#11471)
wjblanke May 9, 2022
d77d2d0
Updating CHANGELOG.md with 1.3.5
wallentx May 11, 2022
01cea1b
Formatting CHANGELOG.md for 1.3.5
wallentx May 11, 2022
201603b
Updating CHANGELOG.md with corrections
wallentx May 11, 2022
0f5a6df
Adding correct items to changelog
wallentx May 11, 2022
e055a5f
added dev branch to workflow dispatch
edwardteach42 May 12, 2022
39d9bb7
updated to most recent gui
edwardteach42 May 12, 2022
da83fa1
added to dev
edwardteach42 May 12, 2022
6299db5
Merge remote-tracking branch 'upstream/latest' into dev
edwardteach42 May 12, 2022
eb89266
bugfix
edwardteach42 May 12, 2022
713f3d2
fixed rpm installer
edwardteach42 May 12, 2022
27e2207
lint fixes
edwardteach42 May 12, 2022
3ba61a9
fix uploads
edwardteach42 May 12, 2022
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
9 changes: 5 additions & 4 deletions .github/workflows.disabled/build-macos-m1-installer.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
name: MacOS M1 installer on Python 3.9
name: Build Installer - MacOS arm64

on:
push:
branches:
- main
- 'release/**'
tags:
- '**'
pull_request:
Expand All @@ -17,7 +18,7 @@ concurrency:

jobs:
build:
name: MacOS M1 installer on Python 3.9
name: MacOS arm64 installer
runs-on: [m1]
timeout-minutes: 40
strategy:
Expand Down Expand Up @@ -102,7 +103,7 @@ jobs:
env:
INSTALL_PYTHON_VERSION: ${{ matrix.python-version }}
run: |
arch -arm64 sh install.sh
arch -arm64 sh install.sh -d

- name: Install node 16.x
run: |
Expand All @@ -122,7 +123,7 @@ jobs:
arch -arm64 sh build_macos_m1.sh

- name: Upload MacOS artifacts
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: chinilla-installers-macos-dmg-arm64
path: ${{ github.workspace }}/build_scripts/final_installer/
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows.disabled/build-test-macos-blockchain.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
fail-fast: false
max-parallel: 4
matrix:
python-version: [3.8, 3.9]
python-version: ['3.9', '3.10']
os: [macOS-latest]
env:
CHINILLA_ROOT: ${{ github.workspace }}/.chinilla/vanillanet
Expand Down Expand Up @@ -105,7 +105,7 @@ jobs:
venv/bin/coverage report --rcfile=.coveragerc --show-missing

- name: Publish coverage
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: coverage
path: coverage_reports/*
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows.disabled/build-test-macos-clvm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
fail-fast: false
max-parallel: 4
matrix:
python-version: [3.8, 3.9]
python-version: ['3.9', '3.10']
os: [macOS-latest]
env:
CHINILLA_ROOT: ${{ github.workspace }}/.chinilla/vanillanet
Expand Down Expand Up @@ -91,7 +91,7 @@ jobs:
venv/bin/coverage report --rcfile=.coveragerc --show-missing

- name: Publish coverage
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: coverage
path: coverage_reports/*
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows.disabled/build-test-macos-core-cmds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
fail-fast: false
max-parallel: 4
matrix:
python-version: [3.8, 3.9]
python-version: ['3.9', '3.10']
os: [macOS-latest]
env:
CHINILLA_ROOT: ${{ github.workspace }}/.chinilla/vanillanet
Expand Down Expand Up @@ -91,7 +91,7 @@ jobs:
venv/bin/coverage report --rcfile=.coveragerc --show-missing

- name: Publish coverage
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: coverage
path: coverage_reports/*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
fail-fast: false
max-parallel: 4
matrix:
python-version: [3.8, 3.9]
python-version: ['3.9', '3.10']
os: [macOS-latest]
env:
CHINILLA_ROOT: ${{ github.workspace }}/.chinilla/vanillanet
Expand Down Expand Up @@ -91,7 +91,7 @@ jobs:
venv/bin/coverage report --rcfile=.coveragerc --show-missing

- name: Publish coverage
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: coverage
path: coverage_reports/*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
fail-fast: false
max-parallel: 4
matrix:
python-version: [3.8, 3.9]
python-version: ['3.9', '3.10']
os: [macOS-latest]
env:
CHINILLA_ROOT: ${{ github.workspace }}/.chinilla/vanillanet
Expand Down Expand Up @@ -91,7 +91,7 @@ jobs:
venv/bin/coverage report --rcfile=.coveragerc --show-missing

- name: Publish coverage
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: coverage
path: coverage_reports/*
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows.disabled/build-test-macos-core-daemon.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
fail-fast: false
max-parallel: 4
matrix:
python-version: [3.8, 3.9]
python-version: ['3.9', '3.10']
os: [macOS-latest]
env:
CHINILLA_ROOT: ${{ github.workspace }}/.chinilla/vanillanet
Expand Down Expand Up @@ -109,7 +109,7 @@ jobs:
venv/bin/coverage report --rcfile=.coveragerc --show-missing

- name: Publish coverage
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: coverage
path: coverage_reports/*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
fail-fast: false
max-parallel: 4
matrix:
python-version: [3.8, 3.9]
python-version: ['3.9', '3.10']
os: [macOS-latest]
env:
CHINILLA_ROOT: ${{ github.workspace }}/.chinilla/vanillanet
Expand Down Expand Up @@ -105,7 +105,7 @@ jobs:
venv/bin/coverage report --rcfile=.coveragerc --show-missing

- name: Publish coverage
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: coverage
path: coverage_reports/*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
fail-fast: false
max-parallel: 4
matrix:
python-version: [3.8, 3.9]
python-version: ['3.9', '3.10']
os: [macOS-latest]
env:
CHINILLA_ROOT: ${{ github.workspace }}/.chinilla/vanillanet
Expand Down Expand Up @@ -105,7 +105,7 @@ jobs:
venv/bin/coverage report --rcfile=.coveragerc --show-missing

- name: Publish coverage
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: coverage
path: coverage_reports/*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
fail-fast: false
max-parallel: 4
matrix:
python-version: [3.8, 3.9]
python-version: ['3.9', '3.10']
os: [macOS-latest]
env:
CHINILLA_ROOT: ${{ github.workspace }}/.chinilla/vanillanet
Expand Down Expand Up @@ -105,7 +105,7 @@ jobs:
venv/bin/coverage report --rcfile=.coveragerc --show-missing

- name: Publish coverage
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: coverage
path: coverage_reports/*
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows.disabled/build-test-macos-core-server.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
fail-fast: false
max-parallel: 4
matrix:
python-version: [3.8, 3.9]
python-version: ['3.9', '3.10']
os: [macOS-latest]
env:
CHINILLA_ROOT: ${{ github.workspace }}/.chinilla/vanillanet
Expand Down Expand Up @@ -105,7 +105,7 @@ jobs:
venv/bin/coverage report --rcfile=.coveragerc --show-missing

- name: Publish coverage
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: coverage
path: coverage_reports/*
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows.disabled/build-test-macos-core-ssl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
fail-fast: false
max-parallel: 4
matrix:
python-version: [3.8, 3.9]
python-version: ['3.9', '3.10']
os: [macOS-latest]
env:
CHINILLA_ROOT: ${{ github.workspace }}/.chinilla/vanillanet
Expand Down Expand Up @@ -105,7 +105,7 @@ jobs:
venv/bin/coverage report --rcfile=.coveragerc --show-missing

- name: Publish coverage
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: coverage
path: coverage_reports/*
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows.disabled/build-test-macos-core-util.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
fail-fast: false
max-parallel: 4
matrix:
python-version: [3.8, 3.9]
python-version: ['3.9', '3.10']
os: [macOS-latest]
env:
CHINILLA_ROOT: ${{ github.workspace }}/.chinilla/vanillanet
Expand Down Expand Up @@ -105,7 +105,7 @@ jobs:
venv/bin/coverage report --rcfile=.coveragerc --show-missing

- name: Publish coverage
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: coverage
path: coverage_reports/*
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows.disabled/build-test-macos-core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
fail-fast: false
max-parallel: 4
matrix:
python-version: [3.8, 3.9]
python-version: ['3.9', '3.10']
os: [macOS-latest]
env:
CHINILLA_ROOT: ${{ github.workspace }}/.chinilla/vanillanet
Expand Down Expand Up @@ -105,7 +105,7 @@ jobs:
venv/bin/coverage report --rcfile=.coveragerc --show-missing

- name: Publish coverage
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: coverage
path: coverage_reports/*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
fail-fast: false
max-parallel: 4
matrix:
python-version: [3.8, 3.9]
python-version: ['3.9', '3.10']
os: [macOS-latest]
env:
CHINILLA_ROOT: ${{ github.workspace }}/.chinilla/vanillanet
Expand Down Expand Up @@ -105,7 +105,7 @@ jobs:
venv/bin/coverage report --rcfile=.coveragerc --show-missing

- name: Publish coverage
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: coverage
path: coverage_reports/*
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows.disabled/build-test-macos-generator.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
fail-fast: false
max-parallel: 4
matrix:
python-version: [3.8, 3.9]
python-version: ['3.9', '3.10']
os: [macOS-latest]
env:
CHINILLA_ROOT: ${{ github.workspace }}/.chinilla/vanillanet
Expand Down Expand Up @@ -91,7 +91,7 @@ jobs:
venv/bin/coverage report --rcfile=.coveragerc --show-missing

- name: Publish coverage
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: coverage
path: coverage_reports/*
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows.disabled/build-test-macos-plot_sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
fail-fast: false
max-parallel: 4
matrix:
python-version: [3.8, 3.9]
python-version: ['3.9', '3.10']
os: [macOS-latest]
env:
CHINILLA_ROOT: ${{ github.workspace }}/.chinilla/vanillanet
Expand Down Expand Up @@ -105,7 +105,7 @@ jobs:
venv/bin/coverage report --rcfile=.coveragerc --show-missing

- name: Publish coverage
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: coverage
path: coverage_reports/*
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows.disabled/build-test-macos-plotting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
fail-fast: false
max-parallel: 4
matrix:
python-version: [3.8, 3.9]
python-version: ['3.9', '3.10']
os: [macOS-latest]
env:
CHINILLA_ROOT: ${{ github.workspace }}/.chinilla/vanillanet
Expand Down Expand Up @@ -105,7 +105,7 @@ jobs:
venv/bin/coverage report --rcfile=.coveragerc --show-missing

- name: Publish coverage
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: coverage
path: coverage_reports/*
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows.disabled/build-test-macos-pools.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
fail-fast: false
max-parallel: 4
matrix:
python-version: [3.8, 3.9]
python-version: ['3.9', '3.10']
os: [macOS-latest]
env:
CHINILLA_ROOT: ${{ github.workspace }}/.chinilla/vanillanet
Expand Down Expand Up @@ -105,7 +105,7 @@ jobs:
venv/bin/coverage report --rcfile=.coveragerc --show-missing

- name: Publish coverage
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: coverage
path: coverage_reports/*
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows.disabled/build-test-macos-simulation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
fail-fast: false
max-parallel: 4
matrix:
python-version: [3.8, 3.9]
python-version: ['3.9', '3.10']
os: [macOS-latest]
env:
CHINILLA_ROOT: ${{ github.workspace }}/.chinilla/vanillanet
Expand Down Expand Up @@ -109,7 +109,7 @@ jobs:
venv/bin/coverage report --rcfile=.coveragerc --show-missing

- name: Publish coverage
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: coverage
path: coverage_reports/*
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows.disabled/build-test-macos-tools.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
fail-fast: false
max-parallel: 4
matrix:
python-version: [3.8, 3.9]
python-version: ['3.9', '3.10']
os: [macOS-latest]
env:
CHINILLA_ROOT: ${{ github.workspace }}/.chinilla/vanillanet
Expand Down Expand Up @@ -91,7 +91,7 @@ jobs:
venv/bin/coverage report --rcfile=.coveragerc --show-missing

- name: Publish coverage
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: coverage
path: coverage_reports/*
Expand Down
Loading