From d63378a9ef20efa8d1d9ec80fcb7fe1f27e3091f Mon Sep 17 00:00:00 2001 From: Leo Kirchner Date: Thu, 8 Aug 2024 08:06:11 +0200 Subject: [PATCH 1/4] allows version 7 of deepdiff --- changes/773.fixed | 1 + poetry.lock | 13 +++++++------ pyproject.toml | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) create mode 100644 changes/773.fixed diff --git a/changes/773.fixed b/changes/773.fixed new file mode 100644 index 00000000..e8d14c9a --- /dev/null +++ b/changes/773.fixed @@ -0,0 +1 @@ +Fixed deepdiff dependency range \ No newline at end of file diff --git a/poetry.lock b/poetry.lock index d9d3f7f9..9305415e 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 1.8.2 and should not be changed by hand. +# This file is automatically @generated by Poetry 1.8.3 and should not be changed by hand. [[package]] name = "amqp" @@ -1044,17 +1044,18 @@ tests = ["tox"] [[package]] name = "django-pivot" -version = "1.9.0" +version = "1.8.1" description = "Create pivot tables and histograms from ORM querysets" optional = false python-versions = "*" files = [ - {file = "django-pivot-1.9.0.tar.gz", hash = "sha256:5e985d32d9ff2a6b89419dd0292c0fa2822d494ee479b5fd16cdb542abf66a88"}, - {file = "django_pivot-1.9.0-py3-none-any.whl", hash = "sha256:1c60e18e7d5f7e42856faee0961748082ddd05b01ae7c8a4baed64d2bbacd051"}, + {file = "django-pivot-1.8.1.tar.gz", hash = "sha256:7184d3e3f5e96003150428bea106a9963f49f0431fa56f93595316c9b42bcca6"}, + {file = "django_pivot-1.8.1-py3-none-any.whl", hash = "sha256:9bf83b2b61d4dc95c01e5b7a595ee223c5c1f08a4590733673a306b1513174d4"}, ] [package.dependencies] -django = ">=2.2.0" +django = ">=1.10" +six = "*" [[package]] name = "django-prometheus" @@ -4421,4 +4422,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p [metadata] lock-version = "2.0" python-versions = ">=3.8,<3.12" -content-hash = "f5dd5d7406d0c6da2b39dd96b2908c0a2d449ed1ce1c5b636b76558237d981da" +content-hash = "35632aca35ffa6225ba0dc1d0c08b963d1e20a5ff1ebff531727d17efc95ea9c" diff --git a/pyproject.toml b/pyproject.toml index 800e6c52..d92f1819 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -34,7 +34,7 @@ packages = [ [tool.poetry.dependencies] python = ">=3.8,<3.12" -deepdiff = ">=5.5.0,!=6.0,!=6.1,<7" +deepdiff = ">=5.5.0,!=6.0,!=6.1,<8" django-pivot = "^1.8.1" matplotlib = "^3.3.2" nautobot = "^1.6.1" From 75c13a1b081ba254c918b9ffade8deeb053eba88 Mon Sep 17 00:00:00 2001 From: Ken Celenza Date: Thu, 4 Jul 2024 12:24:22 -0400 Subject: [PATCH 2/4] Add FAQ for deepdiff and numpy dependency issue. (#775) --- changes/775.documentation | 1 + docs/user/app_faq.md | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 changes/775.documentation diff --git a/changes/775.documentation b/changes/775.documentation new file mode 100644 index 00000000..df9a283e --- /dev/null +++ b/changes/775.documentation @@ -0,0 +1 @@ +Add FAQ for deepdiff and numpy dependency issue. \ No newline at end of file diff --git a/docs/user/app_faq.md b/docs/user/app_faq.md index e44e917a..de51813e 100644 --- a/docs/user/app_faq.md +++ b/docs/user/app_faq.md @@ -146,4 +146,8 @@ These errors have been accurate so far, that is not to say that there is no way ## _Why is the `_isnull` on DateTime filters considered experimental?_ -There are various ways we can create a programmatic interface, which may change the behavior or name, for now it should be considered experimental as we may update this strategy. \ No newline at end of file +There are various ways we can create a programmatic interface, which may change the behavior or name, for now it should be considered experimental as we may update this strategy. + +## _I received an error `AttributeError: `np.float_` was removed in the NumPy 2.0 release. Use `np.float64` instead.` what should I do?_ + +Due to an incompatiblitly between DeepDiff and numPy, you must find a version of those two that are compatible with each other. See [here](https://github.com/seperman/deepdiff/issues/464) for more information. The easiest thing to do is upgrade them both. From 1e6e9e5ef3b1ac34894247ad50b45ba50b3e54f1 Mon Sep 17 00:00:00 2001 From: Leo Kirchner Date: Mon, 12 Aug 2024 15:14:55 +0200 Subject: [PATCH 3/4] switches to docker compose over docker-compose --- tasks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks.py b/tasks.py index 585e4382..3bb2dbe8 100644 --- a/tasks.py +++ b/tasks.py @@ -92,7 +92,7 @@ def docker_compose(context, command, **kwargs): "PYTHON_VER": context.nautobot_golden_config.python_ver, } compose_command_tokens = [ - "docker-compose", + "docker compose", f"--project-name {context.nautobot_golden_config.project_name}", f'--project-directory "{context.nautobot_golden_config.compose_dir}"', ] From 7258c2c16ef9802f7716d210bc78c9f34f06336a Mon Sep 17 00:00:00 2001 From: Leo Kirchner Date: Mon, 12 Aug 2024 15:44:21 +0200 Subject: [PATCH 4/4] fixes MySQL command --- development/docker-compose.mysql.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/development/docker-compose.mysql.yml b/development/docker-compose.mysql.yml index c7fa6a1f..6e3a031e 100644 --- a/development/docker-compose.mysql.yml +++ b/development/docker-compose.mysql.yml @@ -18,8 +18,6 @@ services: - "development_mysql.env" db: image: "mysql:8" - command: - - "--default-authentication-plugin=mysql_native_password" env_file: - "development.env" - "creds.env"