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

2.0 #29

Merged
merged 11 commits into from
Apr 3, 2023
Merged

2.0 #29

merged 11 commits into from
Apr 3, 2023

Conversation

lampwins
Copy link
Member

@lampwins lampwins commented Nov 5, 2022

TODO:

  • Fix failing bulk edit tests for required and unique rules

@lampwins lampwins marked this pull request as ready for review November 5, 2022 06:08
@lampwins
Copy link
Member Author

lampwins commented Nov 5, 2022

Sorry for the huge PR. This is a super low priority since I am out all week.

@glennmatthews @bryanculver I could use some help in figuring out why the bulk edit tests are failing for my two new models. Also would like to get this app updated to use the new CI pipeline features.

development/nautobot_config.py Outdated Show resolved Hide resolved
development/nautobot_config.py Outdated Show resolved Hide resolved
README.md Show resolved Hide resolved
docs/user/app_use_cases.md Outdated Show resolved Hide resolved
docs/user/app_use_cases.md Outdated Show resolved Hide resolved
nautobot_data_validation_engine/tests/test_filters.py Outdated Show resolved Hide resolved
Co-authored-by: Glenn Matthews <glenn.matthews@networktocode.com>
# Required rules
for rule in RequiredValidationRule.objects.get_for_model(self.model):
field_value = getattr(obj, rule.field)
if field_value is None or field_value == "":
Copy link
Contributor

Choose a reason for hiding this comment

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

Is it possible to have a list [] in field_value?

- Removed all "rq" occurences
- kept in `poetry.lock`

Co-authored-by: Jan Snasel <jan.snasel@networktocode.com>
snaselj and others added 2 commits March 27, 2023 09:31
* chore: Use NautobotFilterSet and bump nautobot 1.5

- Potentially we could use nautobot v1.4 with NautobotFilterSet,
  however, to be sure, it seems to be better to use v1.5

* fix: Nautobot version in tasks.py

---------

Co-authored-by: Jan Snasel <jan.snasel@networktocode.com>
* fix: remove .coverage

* doc

* fix: Missing logger name in nautobot config

* doc: Update compatibility matrix

- mark v2.0.0 to be compatible up to 1.99.99

* doc: Fix links to unique rules images

* fix: Log error in case of jinja exception

- `self.validation_error` raises an Exception and LOGGER would not be
  called this way

* chore: Reformat lists - one item per line

- to better recognize changes in reviews

* cleanup: Unnecessary imports

* fix: Text `required` used for `unique` validator objects

* fix: Replace TestCase with NameSlugFilterTestCase

* fix: Blacklisted fields validation typo

---------

Co-authored-by: Jan Snasel <jan.snasel@networktocode.com>
Co-authored-by: Steven <111259311+DistantVoyager@users.noreply.github.com>
@DistantVoyager DistantVoyager requested a review from a team as a code owner March 27, 2023 15:26
This was linked to issues Mar 31, 2023
@chadell
Copy link
Contributor

chadell commented Apr 3, 2023

@lampwins @DistantVoyager @snaselj is there anything missing in this PR?

@snaselj
Copy link
Contributor

snaselj commented Apr 3, 2023

@lampwins @DistantVoyager @snaselj is there anything missing in this PR?

@chadell

LGTM from my perspective.

IMHO #44 should be merged to next as well before merging this one.

I'm preparing better system to align apps repositories with changes to nautobot-plugin cookiecutter template. It will be much easier then, to keep changes to template synced to baked cookies.

@chadell
Copy link
Contributor

chadell commented Apr 3, 2023

to clarify, there is no "official" next branch (it is actually this branch). so, are you proposing to merge #44 into this one, and them merge this to develop?

@snaselj
Copy link
Contributor

snaselj commented Apr 3, 2023

to clarify, there is no "official" next branch (it is actually this branch). so, are you proposing to merge #44 into this one, and them merge this to develop?

You are right, the official 2.0 branch should be next-2.0. Not sure now, what is better, whether merge #44 => next first or merge this one first. What should be IMHO the final state is:

That will unblock cleanup and merge #30 and #34 to develop.

After that, this repo should be ready to create official next-2.0 branch, WDYT?

@chadell
Copy link
Contributor

chadell commented Apr 3, 2023

Yes, my idea was to merge this PR and #44 into develop, to release a new version of this plugin. (technically, it could be simply a minor update because I don't recall adding any breaking change).
Afterward, we could start working on adopting Nautobot 2.x

@snaselj
Copy link
Contributor

snaselj commented Apr 3, 2023

Yes, my idea was to merge this PR and #44 into develop, to release a new version of this plugin. (technically, it could be simply a minor update because I don't recall adding any breaking change). Afterward, we could start working on adopting Nautobot 2.x

I'll cleanup and prepare for review #30 and #34 , after #29 and #44 gets merged.

* Used cookiecutter template to update tasks and dev

* Updated root files to follow cookiecutter

* Update docs to correspond to cookiecutter template

* Modded pyproject.toml format to match cookiecutter

* Updated github ci.yml using cookiecutter template

* Minor fixes for black formatting

* Removed unused imports for flake8

* Formatting fixes for pydocstyle D200, D202, D415

* Fixed pydocstyle docstring issues D101, D102, D106

* Removed tabs for black formatting

* Updates to mkdocs and gitignore using cookiecutter

* Updated .github dir using cookiecutter-ntc

* Updated development dir using cookiecutter-ntc

* Updated docs dir using cookiecutter-ntc

* Updated inits using cookiecutter-ntc

* Updated root source files using cookiecutter-ntc

* Quick fixes for nautobot version

* Use default ver in dockerfile; update nautobot min

* Update poetry.lock

* More changes to min nautobot 1.5.0

* Removed 1.4 from dockerfile nautobot ver

* Bumped nautobot ver min to 1.5.2 for app rel v2.0

* Disabling some pylint checks to be addressed later

* Handling for skipping a bugged view unit test

* Minor formatting
@DistantVoyager DistantVoyager merged commit b4c3bf7 into develop Apr 3, 2023
16 checks passed
@DistantVoyager
Copy link
Contributor

PRs #29 and #44 have now been merged to develop. Are we ready to do the release for data validation v2.0.0 or @snaselj am I waiting until you submit #30 and #34?

@snaselj
Copy link
Contributor

snaselj commented Apr 3, 2023

PRs #29 and #44 have now been merged to develop. Are we ready to do the release for data validation v2.0.0 or @snaselj am I waiting until you submit #30 and #34?

Hi @DistantVoyager, I just closed #30 and #34 as everything is included in this PR already 👍

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
No open projects
Development

Successfully merging this pull request may close these issues.

Only apply regex rules based on other fields Unique Fields Mandatory Fields
7 participants