Skip to content

Commit 83d99ae

Browse files
authored
Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool (#315)
* Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool Template: ``` { "template": "git@github.com:networktocode-llc/cookiecutter-ntc.git", "dir": "python", "ref": "main", "path": null } ``` Cookie: ``` { "remote": "https://github.com/networktocode/diffsync.git", "path": "/Users/justin.drew/Projects/outputs/diffsync", "repository_path": "/Users/justin.drew/Projects/outputs/diffsync", "dir": "", "branch_prefix": "drift-manager/develop", "context": { "codeowner_github_usernames": "@glennmatthews @michalis1 @jdrew82", "full_name": "Network to Code, LLC", "email": "info@networktocode.com", "github_org": "networktocode", "description": "Library to easily sync/diff/update 2 different data sources", "project_name": "diffsync", "project_slug": "diffsync", "repo_url": "https://github.com/networktocode/diffsync", "base_url": "diffsync", "project_python_name": "diffsync", "project_python_base_version": "3.10", "project_with_config_settings": "no", "generate_docs": "yes", "version": "2.2.0", "original_publish_year": "2025", "_template": "git@github.com:networktocode-llc/cookiecutter-ntc.git", "_output_dir": "/Users/justin.drew/Projects/outputs", "_repo_dir": "/Users/justin.drew/.cookiecutters/cookiecutter-ntc/python", "_checkout": "main" }, "drift_managed_branch": "develop", "remote_name": "origin", "pull_request_strategy": "PullRequestStrategy.CREATE", "post_actions": [], "baked_commit_ref": "", "draft": false } ``` CLI Arguments: ``` { "cookie_dir": "", "input": true, "json_filename": "", "output_dir": "../outputs", "push": true, "template": "git@github.com:networktocode-llc/cookiecutter-ntc.git", "template_dir": "python", "template_ref": "main", "pull_request": null, "post_action": [], "disable_post_actions": false, "draft": null, "drift_managed_branch": "develop" } ``` * Fix merge conflicts * Fixes for merge conflicts * Fix formating and missed merge conflicts * Fix linter warnings and update dependencies to latest * Fix docs conf * Fix imports * Fix generation script to use correct path * Fix merge conflicts * test: 🚨 Fix errors from ruff * ci: Fix PYTHON_VER reference * test: 🚨 Fix complaint from pylint
1 parent 8ec1fb3 commit 83d99ae

File tree

90 files changed

+3742
-1480
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+3742
-1480
lines changed

.bandit.yml

Lines changed: 0 additions & 5 deletions
This file was deleted.

.cookiecutter.json

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
{
2+
"cookiecutter": {
3+
"codeowner_github_usernames": "@glennmatthews @michalis1 @jdrew82",
4+
"full_name": "Network to Code, LLC",
5+
"email": "info@networktocode.com",
6+
"github_org": "networktocode",
7+
"description": "Library to easily sync/diff/update 2 different data sources",
8+
"project_name": "diffsync",
9+
"project_slug": "diffsync",
10+
"repo_url": "https://github.com/networktocode/diffsync",
11+
"base_url": "diffsync",
12+
"project_python_name": "diffsync",
13+
"project_python_base_version": "3.10",
14+
"project_with_config_settings": "no",
15+
"generate_docs": "yes",
16+
"version": "2.2.0",
17+
"original_publish_year": "2025",
18+
"_drift_manager": {
19+
"template": "git@github.com:networktocode-llc/cookiecutter-ntc.git",
20+
"template_dir": "python",
21+
"template_ref": "main",
22+
"cookie_dir": "",
23+
"pull_request_strategy": "create",
24+
"post_actions": [],
25+
"draft": false,
26+
"baked_commit_ref": "bc789d65fa90182c0eb392664e1cba02ea187ab1",
27+
"drift_managed_branch": "develop"
28+
}
29+
}
30+
}

.dockerignore

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<<<<<<< HEAD
12
**/*.pyc
23
**/*.pyo
34
**/*.log
@@ -6,4 +7,33 @@
67
Dockerfile
78
docker-compose.yml
89
.env
9-
docs/_build
10+
docs/_build
11+
=======
12+
# Docker related
13+
development/Dockerfile
14+
development/docker-compose*.yml
15+
development/*.env
16+
*.env
17+
environments/
18+
19+
# Python
20+
**/*.pyc
21+
**/*.pyo
22+
**/__pycache__/
23+
**/.pytest_cache/
24+
**/.venv/
25+
26+
27+
# Other
28+
docs/_build
29+
FAQ.md
30+
.git/
31+
.gitignore
32+
.github
33+
tasks.py
34+
LICENSE
35+
**/*.log
36+
**/.vscode/
37+
invoke*.yml
38+
tasks.py
39+
>>>>>>> c5f3eb1 (Cookie initialy baked by NetworkToCode Cookie Drift Manager Tool)

.flake8

Lines changed: 0 additions & 5 deletions
This file was deleted.

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
# Default owners for all files in this repository
1+
# Default owner(s) of all files in this repository
22
* @glennmatthews @michalis1 @jdrew82

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,25 @@
11
---
22
name: 🐛 Bug Report
3-
about: Report a reproducible bug in the current release of DiffSync
3+
about: Report a reproducible bug in the current release of diffsync
44
---
55

66
### Environment
7+
* Python version: <!-- Example: 3.10 -->
78
* DiffSync version: <!-- Example: 1.0.0 -->
8-
* Python version <!-- Example: 3.7.7 -->
9-
10-
<!-- What happened instead? -->
11-
### Observed Behavior
129

1310
<!-- What did you expect to happen? -->
11+
1412
### Expected Behavior
1513

14+
<!-- What happened instead? -->
15+
16+
### Observed Behavior
17+
1618
<!--
1719
Describe in detail the exact steps that someone else can take to reproduce
1820
this bug using the current release.
1921
-->
22+
2023
### Steps to Reproduce
2124
1.
2225
2.

.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,19 @@ about: Propose a new feature or enhancement
44
---
55

66
### Environment
7+
78
* DiffSync version: <!-- Example: 1.0.0 -->
89

910
<!--
1011
Describe in detail the new functionality you are proposing.
1112
-->
12-
### Proposed Functionality
1313

14+
### Proposed Functionality
1415

1516
<!--
1617
Convey an example use case for your proposed feature. Write from the
1718
perspective of a user who would benefit from the proposed
1819
functionality and describe how.
1920
-->
20-
### Use Case
2121

22+
### Use Case
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
## New Pull Request
2+
3+
Have you:
4+
- [ ] Updated the README if necessary?
5+
- [ ] Updated any configuration settings?
6+
- [ ] Written a unit test?
7+
8+
## Change Notes
9+
10+
## Justification

0 commit comments

Comments
 (0)