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

Clean up outdated code, dependencies, documentation, etc. #532

Merged
merged 19 commits into from Dec 6, 2020

Conversation

srenfo
Copy link
Contributor

@srenfo srenfo commented Nov 13, 2020

Cleans up a bunch of unused code, outdated dependencies, orphaned documentation and obsolete configuration.

The PR is structured such that individual changes can be undone with revert commits.

However, this is not comprehensive. You can find more stuff to remove if you want to. For example, there are more orphaned documentation files and there are old scripts in bin/ where I'm not sure if they're still functional or needed.

I tried to keep the individual commit messages concise and meaningful for easier navigation.

@coveralls
Copy link

Pull Request Test Coverage Report for Build 1281

  • 5 of 5 (100.0%) changed or added relevant lines in 4 files are covered.
  • 42 unchanged lines in 6 files lost coverage.
  • Overall coverage decreased (-0.03%) to 73.593%

Files with Coverage Reduction New Missed Lines %
conpot/protocols/http/command_responder.py 1 61.03%
conpot/protocols/kamstrup/meter_protocol/kamstrup_server.py 1 80.56%
conpot/protocols/IEC104/frames.py 2 75.0%
conpot/protocols/IEC104/IEC104_server.py 2 86.02%
conpot/protocols/ftp/ftp_base_handler.py 14 79.69%
conpot/protocols/ftp/ftp_handler.py 22 81.37%
Totals Coverage Status
Change from base Build 1280: -0.03%
Covered Lines: 5518
Relevant Lines: 7498

💛 - Coveralls

@glaslos
Copy link
Member

glaslos commented Nov 13, 2020

Are you doing a scream test on the mysql logger?

@srenfo
Copy link
Contributor Author

srenfo commented Nov 16, 2020

Are you doing a scream test on the mysql logger?

Hah, walked right into that one. 🤦

In all seriousness though, the MySQL logger has been broken and disabled for two and a half years, ever since the switch from Python 3 apparently. The tests are never run and carry this message:

@unittest.skip("switch for a more generic db solution in py3")
class Test_MySQLlogger(unittest.TestCase):

Only the "wiring" was never removed so the dependencies still needed to be installed.

Since it was commented out code it got swept up in this cleanup.

If you prefer to keep it in I'll push a revert commit for 07b13a8.

EDIT: I fail at math.

@glaslos
Copy link
Member

glaslos commented Nov 16, 2020

Don't get me wrong, I'm all in favor of removing the MySQL logger :)

@glaslos glaslos added this to In progress in 0.7 Release Nov 22, 2020
Copy link
Member

@glaslos glaslos left a comment

Choose a reason for hiding this comment

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

LGTM

@glaslos glaslos merged commit a630594 into mushorg:master Dec 6, 2020
0.7 Release automation moved this from In progress to Done Dec 6, 2020
@glaslos
Copy link
Member

glaslos commented Dec 6, 2020

Nice work @srenfo , your contributions to Conpot are much appreciated.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
0.7 Release
  
Done
Development

Successfully merging this pull request may close these issues.

None yet

4 participants