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

Release v0.3 #326

Merged
merged 173 commits into from
May 12, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
173 commits
Select commit Hold shift + click to select a range
af115b6
Use chia's own 'chia plots create' argument parser
altendky Apr 16, 2021
8334931
Manually handle --help
altendky Apr 16, 2021
be7c4e5
Change less
altendky Apr 16, 2021
17a2b83
fix: use .params
altendky Apr 16, 2021
30ad3f6
fix: tmp2dir is optionally None now
altendky Apr 16, 2021
18cd480
fix: make user_interface configuration optional
altendky Apr 17, 2021
10ce09c
Merge branch 'development' into defaults_for_user_interface
altendky Apr 17, 2021
2fefb9f
Merge branch 'development' into use_chia_cli_parser
altendky Apr 17, 2021
4c8f200
fix: handle -h as well
altendky Apr 17, 2021
f3114a5
fix: get defaults back
altendky Apr 17, 2021
8dde509
refactor: isolate chia cli parsing and test it
altendky Apr 17, 2021
ef87c2b
refactor: some more testing and adjusting
altendky Apr 18, 2021
a4737c0
fix: skip jobs whose arguments fail to be parsed
altendky Apr 18, 2021
82a4522
Merge branch 'development' into use_chia_cli_parser
altendky Apr 18, 2021
3b1d4b3
Merge branch 'development' into use_chia_cli_parser
altendky Apr 18, 2021
7cc18b1
Merge branch 'development' into defaults_for_user_interface
altendky Apr 19, 2021
0fce189
Include job age any time that a plot is held off; Insert the last del…
13thProgression Apr 19, 2021
7ad30b9
chore: remove unused threading imports
altendky Apr 20, 2021
845750a
ci: also build on pushes to main
altendky Apr 20, 2021
7e93927
fix: only report archive dirs if configured
altendky Apr 20, 2021
1112b3d
add support for chia installed via macOS dmg installer
davidtaylorhq Apr 20, 2021
3e09838
Merge branch 'development' into features/Log_instances_of_delays_and_…
13thProgression Apr 21, 2021
741f4db
Update process detection logic to work on OSX
BasilHorowt Apr 21, 2021
6ad536d
fixup! Update process detection logic to work on OSX
BasilHorowt Apr 21, 2021
6bd8e9d
Merge pull request #137 from ericaltendorf/build_main
altendky Apr 22, 2021
8ae04c4
Merge branch 'main' into main_back_to_development
altendky Apr 22, 2021
4f222b7
Merge branch 'development' into osx_process_detection
altendky Apr 22, 2021
f0bb720
Merge pull request #146 from altendky/main_back_to_development
altendky Apr 22, 2021
7f1a5ff
Merge branch 'development' into osx_process_detection
altendky Apr 22, 2021
a6d821c
Merge pull request #142 from BasilHorowt/osx_process_detection
altendky Apr 22, 2021
5794f71
Merge branch 'development' into defaults_for_user_interface
altendky Apr 22, 2021
b0d7e8d
Merge pull request #119 from altendky/defaults_for_user_interface
altendky Apr 22, 2021
22bafbb
Merge branch 'development' into drop_threading_imports
altendky Apr 22, 2021
54a6921
Merge pull request #134 from altendky/drop_threading_imports
altendky Apr 22, 2021
55ac18a
Merge branch 'development' into only_report_archive_dirs_if_configured
altendky Apr 22, 2021
9209830
Merge branch 'development' into use_chia_cli_parser
altendky Apr 22, 2021
2b4fcc5
chore: remove unused code
altendky Apr 22, 2021
7229b43
Update README.md
davidtaylorhq Apr 22, 2021
852af07
Merge branch 'main' into macos
altendky Apr 22, 2021
39a6c1b
Merge branch 'development' into macos
altendky Apr 22, 2021
5c02e7b
Merge branch 'development' into patch-2
altendky Apr 22, 2021
3cf08ae
Merge pull request #150 from altendky/cleanup
altendky Apr 22, 2021
7004100
Merge branch 'development' into macos
altendky Apr 22, 2021
bd6a32b
Merge pull request #140 from davidtaylorhq/macos
altendky Apr 22, 2021
5200b13
fix: handle AccessDenied in report for macOS
altendky Apr 23, 2021
a390c35
chore: correct multi-type exception handling syntax
altendky Apr 23, 2021
97dbc60
raise TerminalTooSmallError
altendky Apr 23, 2021
68e3746
Merge branch 'development' into use_chia_cli_parser
altendky Apr 23, 2021
242a834
chore: fix mismerge
altendky Apr 23, 2021
4362b9c
Merge branch 'development' into features/Log_instances_of_delays_and_…
13thProgression Apr 25, 2021
2d15d25
Update default buffer option to 3389 to match Chia default
BasilHorowt Apr 25, 2021
a43f9b2
fix: correct error message when kill does not find jobs
altendky Apr 25, 2021
d8a11e8
fix: ignore jobs without phases when checking dstdirs
altendky Apr 25, 2021
f16d5b3
Merge branch 'development' into buffer-3389
altendky Apr 25, 2021
b390cd7
Merge pull request #164 from BasilHorowt/buffer-3389
altendky Apr 26, 2021
da35839
fix: also skip Nones in dstdirs_to_youngest_phase()
altendky Apr 26, 2021
9d2a435
fix: support -a, --alt_fingerprint parameter
ilazycat Apr 26, 2021
2630951
fix: skip missing files in plot_util.list_k32_plots()
altendky Apr 26, 2021
11921d7
Merge pull request #170 from ilazycat/development
altendky Apr 26, 2021
16a7f69
Merge pull request #1 from ericaltendorf/development
cmeyer90 Apr 26, 2021
9352d9c
Created spawn_archive_process function
Apr 26, 2021
65d8a4a
archiving_status = None
Apr 27, 2021
8cb707d
Merge pull request #173 from cmeyer90/fix-plotman-archive-command
altendky Apr 27, 2021
2e72254
Improve compatibility and precision of date information in log filenames
BasilHorowt Apr 27, 2021
9896bc5
Merge branch 'development' into only_report_archive_dirs_if_configured
altendky Apr 28, 2021
fd59bb2
Merge pull request #138 from ericaltendorf/only_report_archive_dirs_i…
altendky Apr 28, 2021
6b42d8b
Use isoformat instead of custom built format string
BasilHorowt Apr 28, 2021
dca40d0
Merge branch 'development' into improve_log_format
BasilHorowt Apr 28, 2021
06de974
Merge pull request #174 from BasilHorowt/improve_log_format
altendky Apr 28, 2021
00f0680
fix: typo _
altendky Apr 28, 2021
7787ab5
Merge branch 'development' into report_access_denied
altendky Apr 28, 2021
c068ab7
Merge pull request #152 from ericaltendorf/report_access_denied
altendky Apr 28, 2021
8cc44fe
Edit default config to add helpful documentation
artorantala Apr 29, 2021
8b25204
Clarifying scheduling settings
roybotbot Apr 29, 2021
2763b2b
Merge branch 'development' into warn_about_terminal_size_maybe_too_small
altendky Apr 30, 2021
f842acc
Merge pull request #154 from altendky/warn_about_terminal_size_maybe_…
altendky Apr 30, 2021
4673872
Merge branch 'development' into fix_error_on_kill_unknown
altendky Apr 30, 2021
9c81724
Merge pull request #166 from altendky/fix_error_on_kill_unknown
altendky Apr 30, 2021
518b6d0
Merge branch 'development' into skip_missing_in_list_k32_plots
altendky Apr 30, 2021
9c3ca00
Merge pull request #172 from ericaltendorf/skip_missing_in_list_k32_p…
altendky Apr 30, 2021
6bdbab4
Merge branch 'development' into use_chia_cli_parser
altendky Apr 30, 2021
c0fa13a
refactor: copy in chia plots create click options
altendky Apr 30, 2021
1561c6f
chore: add chia-blockchain license file to manifest
altendky Apr 30, 2021
6d9646d
Merge branch 'development' into fix_dst_sorting_with_unknown_phases
altendky Apr 30, 2021
ae8ace6
fix: archiving status could be None
altendky Apr 30, 2021
6404bb5
Revert "fix: archiving status could be None"
altendky Apr 30, 2021
c89356d
fix: archiving status could be None (maybe more cleanly)
altendky Apr 30, 2021
2c0be22
fix: add \`<pending>\` to avoid an empty archive pid list
altendky Apr 30, 2021
7c391c7
Merge branch 'development' into features/Log_instances_of_delays_and_…
altendky Apr 30, 2021
c668512
Merge branch 'development' into patch-1
altendky Apr 30, 2021
3ea61ea
Merge pull request #190 from artorantala/patch-1
altendky Apr 30, 2021
6d14a48
Merge branch 'development' into fixup_archiving_status
altendky Apr 30, 2021
52c8be2
Merge pull request #193 from altendky/fixup_archiving_status
altendky Apr 30, 2021
0ca7929
Merge branch 'development' into patch-2
altendky Apr 30, 2021
a190bf6
Merge pull request #192 from royimous/patch-2
altendky Apr 30, 2021
dc866f8
Merge branch 'development' into features/Log_instances_of_delays_and_…
altendky Apr 30, 2021
e1a195c
Merge pull request #132 from 13thProgression/features/Log_instances_o…
altendky Apr 30, 2021
c3e9573
Merge branch 'development' into use_chia_cli_parser
altendky Apr 30, 2021
732a1f1
Merge branch 'development' into fix_dst_sorting_with_unknown_phases
altendky Apr 30, 2021
2b2d6f4
Update LICENSE-chia-blockchain
altendky Apr 30, 2021
37306bf
ci: add coverage (preliminary)
altendky May 1, 2021
4805e2c
ci: check needs test
altendky May 1, 2021
03ce5ee
ci: enable coverage for the tests
altendky May 1, 2021
1f5cfaa
ci: add .coveragerc
altendky May 1, 2021
7b20ba8
chore: add .coveragerc to manifest
altendky May 1, 2021
524eb3e
ci: help with coverage file locations
altendky May 1, 2021
e3233dd
ci: more coverage stuff
altendky May 1, 2021
caaefcd
ci: exploration
altendky May 1, 2021
d12a1d0
ci: maybe
altendky May 1, 2021
a926588
ci: require coverage checks jobs
altendky May 1, 2021
528c9d5
ci: actualy install coverage...
altendky May 1, 2021
0b30823
ci: explore
altendky May 1, 2021
afd3e24
ci: hmm
altendky May 1, 2021
1a04bd7
ci: coverage include */site-packages
altendky May 1, 2021
8798e53
ci: allow 35% coverage
altendky May 1, 2021
e4c5663
ci: rework
altendky May 1, 2021
5e18bc5
ci: --show-missing
altendky May 1, 2021
3921ab9
doc: add markers for start and end of copied code
altendky May 2, 2021
1b5db4e
chore: copy in chia plots create cli parser for 1.1.3
altendky May 2, 2021
e784731
doc: add MAINTENANCE.md and a description fo the chia code copying
altendky May 2, 2021
28f5b41
doc: change code copying example link to use ericaltendorf repo
altendky May 2, 2021
bccf012
Merge pull request #116 from altendky/use_chia_cli_parser
altendky May 2, 2021
84fd011
Merge branch 'development' into coverage
altendky May 2, 2021
808073a
ci: do not require that coverage pass
altendky May 2, 2021
418d62b
fix: explain failure to open new log files
altendky May 3, 2021
a06ab34
fix: avoid creation of multiple plot processes logging to a single file
altendky May 3, 2021
1e3fd65
feat: collapse split tmpdir tables into one table
ericaltendorf May 3, 2021
5ace5e7
feat: abbreviate tmpdir phase list too
ericaltendorf May 3, 2021
2512be3
Add a link to the Archiving wiki to help new users
mjsr May 5, 2021
dea952d
Merge branch 'development' into default-config-point-to-archiving-wiki
ericaltendorf May 6, 2021
6ea09ab
Merge pull request #241 from mjsr/default-config-point-to-archiving-wiki
ericaltendorf May 6, 2021
acb3c66
Merge branch 'development' into coverage
altendky May 6, 2021
de598b0
Merge pull request #200 from altendky/coverage
altendky May 6, 2021
ac69346
Merge branch 'development' into fix_dst_sorting_with_unknown_phases
altendky May 6, 2021
d0b0406
Merge pull request #168 from altendky/fix_dst_sorting_with_unknown_ph…
altendky May 6, 2021
c0bb151
Merge branch 'development' into altendky-patch-3
altendky May 6, 2021
59b9dda
Merge pull request #220 from ericaltendorf/altendky-patch-3
altendky May 6, 2021
c0c99e1
Merge branch 'development' into altendky-patch-2
altendky May 6, 2021
3514c12
Merge pull request #219 from ericaltendorf/altendky-patch-2
altendky May 6, 2021
b76a6bc
Merge branch 'development' into consolidate-tmp-tables
altendky May 6, 2021
4860616
Merge pull request #223 from ericaltendorf/consolidate-tmp-tables
altendky May 6, 2021
8accca4
Merge branch 'development' into abbreviate-tmpdir-joblist
altendky May 6, 2021
d13628a
Merge pull request #225 from ericaltendorf/abbreviate-tmpdir-joblist
altendky May 6, 2021
54d870d
fix: rank unknown phases
altendky May 7, 2021
6a8fe8a
unicode filename in archive drive
Ed-Yang May 7, 2021
07407ef
Merge branch 'development' into unicode
Ed-Yang May 7, 2021
1acee7a
Merge pull request #264 from Ed-Yang/unicode
altendky May 7, 2021
309f9d0
Merge branch 'development' into rank_unknown_phases
altendky May 7, 2021
8dc476c
switch to attrs.frozen
altendky May 8, 2021
394ccf8
fix: disable rsync compression
altendky May 8, 2021
562883b
Merge pull request #271 from altendky/attrs
altendky May 8, 2021
6e5e77d
Merge branch 'development' into rsync_no_compress
altendky May 8, 2021
6763bf3
Merge pull request #272 from ericaltendorf/rsync_no_compress
altendky May 8, 2021
2c2563a
refactor: configuration I/O to the outside
altendky May 8, 2021
c4e9551
Merge pull request #273 from altendky/less_mockery
altendky May 8, 2021
dcef07b
Merge branch 'development' into rank_unknown_phases
altendky May 8, 2021
cdbb6e3
refactor: introduce Phase class
altendky May 8, 2021
792c3fc
refactor: go back a bit
altendky May 8, 2021
bcc2a2a
fix: known not unknown
altendky May 8, 2021
f5e4c34
fix: more phase corners
altendky May 8, 2021
e37f50a
fix: and yet more
altendky May 8, 2021
6e66c2e
fix: handle None dirs when checking for tmp files
altendky May 8, 2021
5487b05
Merge pull request #278 from ericaltendorf/altendky-patch-2
altendky May 8, 2021
97f0059
Merge branch 'development' into rank_unknown_phases
altendky May 9, 2021
78e8825
Merge pull request #258 from altendky/rank_unknown_phases
altendky May 9, 2021
0157abc
fix: another tuple -> job.Phase
altendky May 11, 2021
17e93d5
Merge pull request #325 from ericaltendorf/phase_not_tuple
altendky May 11, 2021
616ad4b
set version to v0.3
altendky May 11, 2021
161a898
Fix phase visualizer
lopesmcc May 11, 2021
482843e
fixup tests
altendky May 12, 2021
6705fe2
Merge pull request #338 from lopesmcc/fix_phase_visualizer
altendky May 12, 2021
943abab
Merge branch 'development' into release/v0.3
altendky May 12, 2021
a727040
Merge branch 'main' into release/v0.3
altendky May 12, 2021
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
19 changes: 19 additions & 0 deletions .coveragerc
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
[paths]
source =
src
*/site-packages

[report]
precision = 1
exclude_lines =
pragma: no cover
abc\.abstractmethod
typing\.overload
if typing.TYPE_CHECKING:
^\s*pass\s*$
^\s*...\s*$

[run]
branch = True
source =
plotman
121 changes: 118 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ name: CI

on:
push:
branches: [ development ]
branches:
- main
- development
tags: [ "**" ]
pull_request:
branches: [ "**" ]
Expand All @@ -13,7 +15,8 @@ defaults:

jobs:
build:
name: ${{ matrix.task.name}} - ${{ matrix.os.name }} ${{ matrix.python.name }}
# Should match JOB_NAME below
name: ${{ matrix.task.name }} - ${{ matrix.os.name }} ${{ matrix.python.name }}
runs-on: ${{ matrix.os.runs-on }}
strategy:
fail-fast: false
Expand All @@ -30,6 +33,10 @@ jobs:
- name: Build
tox: build

env:
# Should match name above
JOB_NAME: ${{ matrix.task.name }} - ${{ matrix.os.name }} ${{ matrix.python.name }}

steps:
- uses: actions/checkout@v2
with:
Expand Down Expand Up @@ -71,7 +78,8 @@ jobs:
path: dist/

test:
name: ${{ matrix.task.name}} - ${{ matrix.os.name }} ${{ matrix.python.name }}
# Should match JOB_NAME below
name: ${{ matrix.task.name }} - ${{ matrix.os.name }} ${{ matrix.python.name }}
runs-on: ${{ matrix.os.runs-on }}
needs:
- build
Expand All @@ -98,6 +106,7 @@ jobs:
task:
- name: Test
tox: test
coverage: true
include:
- task:
name: Check
Expand All @@ -111,6 +120,8 @@ jobs:


env:
# Should match name above
JOB_NAME: ${{ matrix.task.name }} - ${{ matrix.os.name }} ${{ matrix.python.name }}
TOXENV: ${{ matrix.task.tox }}${{ fromJSON('["", "-"]')[matrix.python.tox != null] }}${{ matrix.python.tox }}

steps:
Expand Down Expand Up @@ -157,12 +168,116 @@ jobs:
run: |
tox --skip-pkg-install

- name: Coverage Processing
if: matrix.task.coverage
run: |
mkdir coverage_reports
cp .coverage "coverage_reports/.coverage.${{ env.JOB_NAME }}"
cp coverage.xml "coverage_reports/coverage.${{ env.JOB_NAME }}.xml"

- name: Publish Coverage
if: matrix.task.coverage
uses: actions/upload-artifact@v2
with:
name: coverage
path: coverage_reports/*

coverage:
# Should match JOB_NAME below
name: ${{ matrix.task.name }} - ${{ matrix.os.name }} ${{ matrix.python.name }}
runs-on: ${{ matrix.os.runs-on }}
needs:
- test
strategy:
fail-fast: false
matrix:
include:
- os:
name: Linux
runs-on: ubuntu-latest
python:
name: CPython 3.8
action: 3.8
task:
name: Coverage
tox: check-coverage
coverage: false
download_coverage: true

env:
# Should match name above
JOB_NAME: ${{ matrix.task.name }} - ${{ matrix.os.name }} ${{ matrix.python.name }}
TOXENV: ${{ matrix.task.tox }}${{ fromJSON('["", "-"]')[matrix.task.tox != null && matrix.python.tox != null] }}${{ matrix.python.tox }}

steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0
ref: ${{ github.event.pull_request.head.sha }}

- name: Download package files
uses: actions/download-artifact@v2
with:
name: dist
path: dist/

- name: Download Coverage
if: matrix.task.download_coverage
uses: actions/download-artifact@v2
with:
name: coverage
path: coverage_reports

- name: Set up ${{ matrix.python.name }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python.action }}

- name: Install dependencies
run: |
python -m pip install --upgrade pip setuptools wheel
pip install tox

- name: Prepare tox environment
run: |
tox --notest --installpkg dist/*.whl

- name: Runner info
uses: twisted/python-info-action@v1

- name: Tox info
uses: twisted/python-info-action@v1
with:
python-path: .tox/${{ env.TOXENV }}/*/python

- name: Run tox environment
env:
BASE_REF: ${{ fromJSON(format('[{0}, {1}]', toJSON(github.event.before), toJSON(format('origin/{0}', github.base_ref))))[github.base_ref != ''] }}
run: |
tox --skip-pkg-install -- --compare-branch="${BASE_REF}"

- name: Coverage Processing
if: always()
run: |
mkdir all_coverage_report
cp .coverage "all_coverage_report/.coverage.all"
cp coverage.xml "all_coverage_report/coverage.all.xml"

- name: Upload Coverage
if: always()
uses: actions/upload-artifact@v2
with:
name: coverage
path: all_coverage_report/*

all:
name: All
runs-on: ubuntu-latest
needs:
- build
- test
# TODO: make this required when we have a better testing situation
# - coverage
steps:
- name: This
shell: python
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
__pycache__
venv
.DS_Store
.vscode
Loading