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

Cleanup Rocky requirements #729

Merged
merged 5 commits into from
Apr 17, 2023
Merged

Cleanup Rocky requirements #729

merged 5 commits into from
Apr 17, 2023

Conversation

praseodym
Copy link
Contributor

Changes

Include runtime requirements in dev requirements, so that we only have to install either.

To include djLint in the formatters, we first have to update robotframework-tidy to 3.4.0 due to a conflict with the path lib dependency:

Fixes conflict with djLint 1.19.16:
    djlint 1.19.16 depends on pathspec<0.12.0 and >=0.11.0
    black 23.1.0 depends on pathspec>=0.9.0
    robotframework-tidy 3.3.3 depends on pathspec<0.10.0 and >=0.9.0

Issue link

n/a

Proof

n/a


Checklists for authors:

Code Checklist

  • This PR only contains functionality relevant to the issue; tickets have been created for newly discovered issues.
  • I have written unit tests for the changes or fixes I made.
  • For any non-trivial functionality, I have added integration and/or end-to-end tests.
  • I have performed a self-review of my code and refactored it to the best of my abilities.

Communication

  • I have informed others of any required .env changes files if required and changed the .env-dist accordingly.
  • I have made corresponding changes to the documentation, if necessary.

Checklist for code reviewers:

  • The code does not violate Model-View-Template and our other architectural principles.
  • The code prioritizes readability over performance where appropriate.
  • The code does not bypass authentication or security mechanisms.
  • The code does not introduce any dependency on a library that has not been properly vetted.
  • The code contains docstrings, comments, and documentation where needed.

Checklist for QA:

  • I have checked out this branch, and successfully ran a fresh make kat.
  • I confirmed that there are no unintended functional regressions in this branch:
    • I have managed to pass the onboarding flow
    • Objects and Findings are created properly
    • Tasks are created and completed properly
  • I confirmed that the PR's advertised feature or hotfix works as intended.

What works:

  • bullet point + screenshot (if useful) per tested functionality

What doesn't work:

  • bullet point + screenshot (if useful) per tested functionality

Bug or feature?:

  • bullet point + screenshot (if useful) if it is unclear whether something is a bug or an intended feature.

Fixes conflict with djLint 1.19.16:
    djlint 1.19.16 depends on pathspec<0.12.0 and >=0.11.0
    black 23.1.0 depends on pathspec>=0.9.0
    robotframework-tidy 3.3.3 depends on pathspec<0.10.0 and >=0.9.0
Include runtime requirements in dev requirements, so that we only have
to install either.
@praseodym praseodym added rocky Issues related to Rocky chore labels Apr 13, 2023
@praseodym praseodym requested a review from a team as a code owner April 13, 2023 14:45
@github-actions
Copy link
Contributor

github-actions bot commented Apr 13, 2023

File Coverage
All files 65%
bits/definitions.py 64%
bits/runner.py 56%
bits/https_availability/https_availability.py 93%
bits/oois_in_headers/oois_in_headers.py 57%
bits/spf_discovery/internetnl_spf_parser.py 55%
bits/spf_discovery/spf_discovery.py 72%
octopoes/api/api.py 89%
octopoes/api/models.py 75%
octopoes/api/router.py 52%
octopoes/core/app.py 69%
octopoes/core/service.py 46%
octopoes/events/events.py 96%
octopoes/events/manager.py 65%
octopoes/models/__init__.py 86%
octopoes/models/datetime.py 66%
octopoes/models/exception.py 83%
octopoes/models/origin.py 70%
octopoes/models/path.py 99%
octopoes/models/types.py 95%
octopoes/models/ooi/certificate.py 96%
octopoes/models/ooi/email_security.py 95%
octopoes/models/ooi/findings.py 94%
octopoes/models/ooi/network.py 97%
octopoes/models/ooi/service.py 91%
octopoes/models/ooi/software.py 71%
octopoes/models/ooi/web.py 81%
octopoes/models/ooi/dns/records.py 95%
octopoes/models/ooi/dns/zone.py 77%
octopoes/repositories/ooi_repository.py 40%
octopoes/repositories/origin_parameter_repository.py 53%
octopoes/repositories/origin_repository.py 53%
octopoes/repositories/scan_profile_repository.py 45%
octopoes/xtdb/client.py 39%
octopoes/xtdb/query_builder.py 69%
octopoes/xtdb/related_field_generator.py 73%
tests/conftest.py 91%

Minimum allowed coverage is 75%

Generated by 🐒 cobertura-action against 99adf92

@praseodym praseodym added this to the OpenKAT v1.9 milestone Apr 13, 2023
@dekkers dekkers merged commit 4365427 into main Apr 17, 2023
@dekkers dekkers deleted the chore/cleanup-rocky-requirements branch April 17, 2023 08:07
jpbruinsslot added a commit that referenced this pull request Apr 17, 2023
* main:
  Update `pre-commit` dependencies and enable Ruff autofix (#739)
  Cleanup Rocky requirements (#729)
  Add (I) to ruff and fix imports (#723)
  Add port-common bit and KAT-OPEN-COMMON-PORT FindingType (#734)
  Use setuptools-scm to write correct version to version.py (#737)
  Enable and disable bits (#732)
  Scan level inheritance chain (#722)
  Octopoes origin param endpoint (#731)
  Do not propagate scan level from DNSSPFMechanismHostname (#721)
  Fix: Unnecessary white space within links (#728)
  chore/refactor katalogus settings setup (#542)
jpbruinsslot added a commit that referenced this pull request Apr 17, 2023
* main:
  Update `pre-commit` dependencies and enable Ruff autofix (#739)
  Cleanup Rocky requirements (#729)
  Add (I) to ruff and fix imports (#723)
  Add port-common bit and KAT-OPEN-COMMON-PORT FindingType (#734)
  Use setuptools-scm to write correct version to version.py (#737)
  Enable and disable bits (#732)
  Scan level inheritance chain (#722)
  Octopoes origin param endpoint (#731)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
chore rocky Issues related to Rocky
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

4 participants