Skip to content

Add Core System and Upgrade APIs info and actions#72

Merged
Quentame merged 30 commits intoProtoThis:masterfrom
mib1185:master
Oct 18, 2020
Merged

Add Core System and Upgrade APIs info and actions#72
Quentame merged 30 commits intoProtoThis:masterfrom
mib1185:master

Conversation

@mib1185
Copy link
Copy Markdown
Contributor

@mib1185 mib1185 commented Oct 4, 2020 •
edited
Loading

Hello,
this PR contains:

  • shutdown and reboot function
  • some detailed system informations
  • check for available DSM update

regards,
Michael

@mib1185
Copy link
Copy Markdown
Contributor Author

mib1185 commented Oct 11, 2020

Hi @ProtoThis ,
I would lovely like to see this features in your great python-synology module, because I´m planning to also add some additional features to synology-dsm integration in home-assistant based on this PR.
So if you have any concerns about my PR, please let me know.
regards,
Michael

Quentame
Quentame requested changes Oct 14, 2020
View reviewed changes
Copy link
Copy Markdown
Collaborator

@Quentame Quentame left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add the test data accordingly.

In tests/api_data/dsm_6/core/, see other exemple for filename and const pattern.
Don't worry if you don't add a test, but at least the raw_data so someone else can do so.

Comment thread synology_dsm/synology_dsm.py Outdated
Comment thread synology_dsm/synology_dsm.py Outdated
Comment thread synology_dsm/api/core/upgrade.py Outdated
Comment thread synology_dsm/api/core/upgrade.py Outdated
Comment thread synology_dsm/api/core/upgrade.py Outdated
Comment thread synology_dsm/api/core/upgrade.py
Comment thread synology_dsm/api/core/system.py Outdated
Comment thread README.rst
Comment thread README.rst
@Quentame
Migrate to Python 3.6+ (#70)
212f029 
* Migrate to Python 3.6+

Drop support of Python < 3.6
- remove six + future deps + usage
- update deps
- remove encoding
- remove (object)

* Fix pylint

- pip3 super() style
- remove simplejson dep + usage

* Black format

* lint setup

* Travix CI py version

* Use f string

* Basic Typing

* Revert setup version bump
@Quentame
Copy link
Copy Markdown
Collaborator

Quentame commented Oct 14, 2020

Be aware for Python 3.6+ now : #70

@mib1185
Copy link
Copy Markdown
Contributor Author

mib1185 commented Oct 16, 2020

Hi @Quentame

Thanks for your review.
I have pushed some commits to resolve your comments and some I have i only commented, too.

Be aware for Python 3.6+ now : #70

Because my dev environment is running on python 3.8.2, I asume no problems with #70
regards,
Michael

Quentame
Quentame requested changes Oct 16, 2020
View reviewed changes
Copy link
Copy Markdown
Collaborator

@Quentame Quentame left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is conflits to resolve, then we are good to merge

Comment thread README.rst Outdated
Comment thread synology_dsm/api/core/system.py Outdated
Comment thread synology_dsm/api/core/upgrade.py Outdated
Comment thread tests/api_data/dsm_6/core/const_6_core_upgrade.py Outdated
Comment thread tests/api_data/dsm_6/core/const_6_core_system.py Outdated
@Quentame
Copy link
Copy Markdown
Collaborator

Quentame commented Oct 16, 2020

To solve conflits I recommand you to rebase on master, manage rebase conflicts, then force push

@mib1185
Copy link
Copy Markdown
Contributor Author

mib1185 commented Oct 16, 2020

thanks for hint to solve conflicts, but I'm a beginner when it comes to git and therefore I do not have any idea how to do this :/

@Quentame
Copy link
Copy Markdown
Collaborator

Quentame commented Oct 16, 2020

Do you want to try ?
Or I can do it.

@mib1185
Copy link
Copy Markdown
Contributor Author

mib1185 commented Oct 16, 2020

I tried it now three times, but did not get it solved :(
I think the problem is, that i do not have created a new branch on my fork (instead used the master) and now rebase my master to the projects master removes my commits/changes on my local working copy.
so yes, plaese resolve the conflict :)

@mib1185
Copy link
Copy Markdown
Contributor Author

mib1185 commented Oct 16, 2020

yeah ... I get the conflict resolved :)

Quentame
Quentame reviewed Oct 18, 2020
View reviewed changes
Comment thread synology_dsm/synology_dsm.py Outdated
Quentame
Quentame reviewed Oct 18, 2020
View reviewed changes
Comment thread synology_dsm/synology_dsm.py Outdated
Quentame
Quentame reviewed Oct 18, 2020
View reviewed changes
Comment thread synology_dsm/synology_dsm.py Outdated
Quentame
Quentame reviewed Oct 18, 2020
View reviewed changes
Comment thread synology_dsm/api/core/upgrade.py Outdated
@Quentame Quentame changed the title Add system info and actions Add Core System and Upgrade APIs info and actions Oct 18, 2020
@Quentame Quentame merged commit 590f2d9 into ProtoThis:master Oct 18, 2020
@mib1185 mib1185 mentioned this pull request Oct 18, 2020
Open
@Quentame Quentame added this to the 1.0.0 milestone Oct 20, 2020
@Quentame Quentame added enhancement Hacktoberfest https://hacktoberfest.digitalocean.com/ hacktoberfest-accepted labels Oct 21, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Quentame Quentame Quentame approved these changes

Assignees

No one assigned

Labels

enhancement Hacktoberfest https://hacktoberfest.digitalocean.com/ hacktoberfest-accepted

Projects

None yet

Milestone

1.0.0

Development

Successfully merging this pull request may close these issues.

2 participants

@mib1185 @Quentame