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

Update Releases Batched for Next (next) #2116

Merged
merged 5 commits into from
Jul 29, 2022

Conversation

renovate[bot]
Copy link
Contributor

@renovate renovate bot commented Jul 28, 2022

Mend Renovate

This PR contains the following updates:

Package Change Age Adoption Passing Confidence
Jinja2 (changelog) ~3.0.3 -> ~3.1.0 age adoption passing confidence
Jinja2 (changelog) ==3.0.3 -> ==3.1.2 age adoption passing confidence
Markdown ~3.3.7 -> ~3.4.0 age adoption passing confidence
Pillow (source, changelog) ~9.1.1 -> ~9.2.0 age adoption passing confidence
black (changelog) ~22.3.0 -> ~22.6.0 age adoption passing confidence
django-cacheops 6.0 -> 6.1 age adoption passing confidence
django-celery-beat ~2.2.1 -> ~2.3.0 age adoption passing confidence
django-constance ~2.8.0 -> ~2.9.0 age adoption passing confidence
django-cryptography 1.0 -> 1.1 age adoption passing confidence
django-debug-toolbar (changelog) ~3.4.0 -> ~3.5.0 age adoption passing confidence
django-extensions (changelog) ~3.1.5 -> ~3.2.0 age adoption passing confidence
drf-spectacular ~0.22.1 -> ~0.23.0 age adoption passing confidence
drf-yasg ~1.20.0 -> ~1.21.0 age adoption passing confidence
importlib-metadata ~4.4 -> ~4.12.0 age adoption passing confidence
jsonschema (changelog) ~4.4.0 -> ~4.8.0 age adoption passing confidence
mkdocs (source) ==1.3.0 -> ==1.3.1 age adoption passing confidence
mkdocs-include-markdown-plugin ~3.2.3 -> ~3.6.0 age adoption passing confidence
mkdocs-include-markdown-plugin ==3.2.3 -> ==3.6.1 age adoption passing confidence
requests (source, changelog) ~2.27.1 -> ~2.28.0 age adoption passing confidence
social-auth-core ~4.2.0 -> ~4.3.0 age adoption passing confidence

Configuration

📅 Schedule: Branch creation - "before 2am" (UTC), Automerge - At any time (no schedule defined).

🚦 Automerge: Disabled by config. Please merge this manually once you are satisfied.

Rebasing: Renovate will not automatically rebase this PR, because other commits have been found.

👻 Immortal: This PR will be recreated if closed unmerged. Get config help if that's undesired.


  • If you want to rebase/retry this PR, click this checkbox. ⚠ Warning: custom changes will be lost.

This PR has been generated by Mend Renovate. View repository job log here.

@renovate renovate bot added the dependencies Pull requests that update a dependency file label Jul 28, 2022
@renovate
Copy link
Contributor Author

renovate bot commented Jul 28, 2022

⚠ Artifact update problem

Renovate failed to update artifacts related to this branch. You probably do not want to merge this PR as-is.

♻ Renovate will retry this branch, including artifacts, only when one of the following happens:

  • any of the package files in this branch needs updating, or
  • the branch becomes conflicted, or
  • you click the rebase/retry checkbox if found above, or
  • you rename this PR's title to start with "rebase!" to trigger it manually

The artifact failure details are included below:

File name: poetry.lock
Installing v1 tool poetry v1.1.14
The canonical source for Poetry's installation script is now https://install.python-poetry.org. Please update your usage to reflect this.
Retrieving Poetry metadata

# Welcome to Poetry!

This will download and install the latest version of Poetry,
a dependency and package manager for Python.

It will add the `poetry` command to Poetry's bin directory, located at:

/home/ubuntu/poetry/1.1.14/bin

You can uninstall at any time by executing this script with the --uninstall option,
and these changes will be reverted.

Installing Poetry (1.1.14)
Installing Poetry (1.1.14): Creating environment
Installing Poetry (1.1.14): Installing Poetry
Installing Poetry (1.1.14): Creating script
Installing Poetry (1.1.14): Done

Poetry (1.1.14) is installed now. Great!

To get started you need Poetry's bin directory (/home/ubuntu/poetry/1.1.14/bin) in your `PATH`
environment variable.

Add `export PATH="/home/ubuntu/poetry/1.1.14/bin:$PATH"` to your shell configuration file.

Alternatively, you can call Poetry explicitly with `/home/ubuntu/poetry/1.1.14/bin/poetry`.

You can test that everything is set up by executing:

`poetry --version`

Poetry version 1.1.14
Installed v1 poetry in 35 seconds
Creating virtualenv nautobot-6Z2DpQq9-py3.7 in /home/ubuntu/.cache/pypoetry/virtualenvs
Updating dependencies
Resolving dependencies...

  SolverProblemError

  Because example-plugin (1.0.0) depends on importlib-metadata (~4.4)
   and nautobot depends on importlib-metadata (~4.12.0), example-plugin is forbidden.
  So, because nautobot depends on example-plugin (1.0.0), version solving failed.

  at ~/poetry/1.1.14/venv/lib/python3.7/site-packages/poetry/puzzle/solver.py:241 in _solve
      237│             packages = result.packages
      238│         except OverrideNeeded as e:
      239│             return self.solve_in_compatibility_mode(e.overrides, use_latest=use_latest)
      240│         except SolveFailure as e:
    → 241│             raise SolverProblemError(e)
      242│ 
      243│         results = dict(
      244│             depth_first_search(
      245│                 PackageNode(self._package, packages), aggregate_package_nodes


File name: poetry.lock
Installing v1 tool poetry v1.1.14
The canonical source for Poetry's installation script is now https://install.python-poetry.org. Please update your usage to reflect this.
Retrieving Poetry metadata

# Welcome to Poetry!

This will download and install the latest version of Poetry,
a dependency and package manager for Python.

It will add the `poetry` command to Poetry's bin directory, located at:

/home/ubuntu/poetry/1.1.14/bin

You can uninstall at any time by executing this script with the --uninstall option,
and these changes will be reverted.

Installing Poetry (1.1.14)
Installing Poetry (1.1.14): Creating environment
Installing Poetry (1.1.14): Installing Poetry
Installing Poetry (1.1.14): Creating script
Installing Poetry (1.1.14): Done

Poetry (1.1.14) is installed now. Great!

To get started you need Poetry's bin directory (/home/ubuntu/poetry/1.1.14/bin) in your `PATH`
environment variable.

Add `export PATH="/home/ubuntu/poetry/1.1.14/bin:$PATH"` to your shell configuration file.

Alternatively, you can call Poetry explicitly with `/home/ubuntu/poetry/1.1.14/bin/poetry`.

You can test that everything is set up by executing:

`poetry --version`

Poetry version 1.1.14
Installed v1 poetry in 37 seconds
Creating virtualenv nautobot-6Z2DpQq9-py3.7 in /home/ubuntu/.cache/pypoetry/virtualenvs
Updating dependencies
Resolving dependencies...

  SolverProblemError

  Because example-plugin (1.0.0) depends on importlib-metadata (~4.4)
   and nautobot depends on importlib-metadata (~4.12.0), example-plugin is forbidden.
  So, because nautobot depends on example-plugin (1.0.0), version solving failed.

  at ~/poetry/1.1.14/venv/lib/python3.7/site-packages/poetry/puzzle/solver.py:241 in _solve
      237│             packages = result.packages
      238│         except OverrideNeeded as e:
      239│             return self.solve_in_compatibility_mode(e.overrides, use_latest=use_latest)
      240│         except SolveFailure as e:
    → 241│             raise SolverProblemError(e)
      242│ 
      243│         results = dict(
      244│             depth_first_search(
      245│                 PackageNode(self._package, packages), aggregate_package_nodes


@renovate renovate bot force-pushed the renovate/next-releases-batched-for-next branch from ddca4d3 to de71139 Compare July 28, 2022 19:42
@renovate renovate bot force-pushed the renovate/next-releases-batched-for-next branch from de71139 to ea21d7a Compare July 28, 2022 22:25
@bryanculver
Copy link
Member

This is a culmination of the feedback of #2021 (comment), #2021 (comment), and reopened after a tweak to Renovate config for holding back flake8.

Copy link
Contributor

@glennmatthews glennmatthews left a comment

Choose a reason for hiding this comment

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

Re 7056f6a, does manually editing the PR to exclude certain packages for now prevent renovate from ever updating those packages, or will it immediately open a new PR for just those packages after this one gets merged, or how does that work?

pyproject.toml Outdated
Comment on lines 101 to 102
# Python 3.8+ where our direct dependency becomes part of stdlib.
importlib-metadata = {version = "^4.4", python = "<3.10"}
Copy link
Contributor

Choose a reason for hiding this comment

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

Just wondering - given the comment, should this be python = "<3.8" instead?

Copy link
Member

Choose a reason for hiding this comment

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

🤷

I would like to but someone updated to <3.10 at some point. In my analysis we only use it for the __version__ "function" which is available in some of the earliest versions of importlib-metadata, which should be no longer needed when we drop 3.7 support.

Even see the note here:

try:
from importlib import metadata
except ImportError:
# Running on pre-3.8 Python; use importlib-metadata package
import importlib_metadata as metadata

@bryanculver
Copy link
Member

Re 7056f6a, does manually editing the PR to exclude certain packages for now prevent renovate from ever updating those packages, or will it immediately open a new PR for just those packages after this one gets merged, or how does that work?

Yeah I was going to drop comment here because Renovate replaced my edits to the PR description above.

Renovate should seeing what gets merged into next and open a new PR to bump those (it's SOT is the branch, not the PRs).

Like we discussed offline I'll open a PR to update the renovate config to no longer clump updates so we can deal with problematic bumps one PR at a time, this is just a batch to get us closer to current.

@bryanculver
Copy link
Member

Package Change Age Adoption Passing Confidence
Pillow (source, changelog) ~9.1.1 -> ~9.2.0 age adoption passing confidence
black (changelog) ~22.3.0 -> ~22.6.0 age adoption passing confidence
coverage 6.4.1 -> 6.4.2 age adoption passing confidence
django-cacheops 6.0 -> 6.1 age adoption passing confidence
django-cryptography 1.0 -> 1.1 age adoption passing confidence
django-debug-toolbar (changelog) ~3.4.0 -> ~3.5.0 age adoption passing confidence
django-extensions (changelog) ~3.1.5 -> ~3.2.0 age adoption passing confidence
drf-yasg ~1.20.0 -> ^1.20.0 age adoption passing confidence
importlib-metadata ~4.4 -> ^4.4.0 age adoption passing confidence
jsonschema (changelog) ~4.4.0 -> ~4.8.0 age adoption passing confidence
mkdocs (source) 1.3.0 -> 1.3.1 age adoption passing confidence
mkdocs (source) ==1.3.0 -> ==1.3.1 age adoption passing confidence
mkdocs-include-markdown-plugin ~3.2.3 -> ~3.6.0 age adoption passing confidence
mkdocs-include-markdown-plugin ==3.2.3 -> ==3.6.1 age adoption passing confidence
social-auth-core ~4.2.0 -> ~4.3.0 age adoption passing confidence
svgwrite 1.4.2 -> 1.4.3 age adoption passing confidence

@bryanculver bryanculver merged commit 3d5aabc into next Jul 29, 2022
bryanculver added a commit that referenced this pull request Jul 29, 2022
smk4664 added a commit to smk4664/nautobot that referenced this pull request Jul 29, 2022
* next: (26 commits)
  Include relationships and associations on object REST APIs (nautobot#2092)
  Add release-note for nautobot#2116
  Update Releases Batched for Next (next) (nautobot#2116)
  Re-ordered migrations
  Add release-note for nautobot#1226, nautobot#1739, nautobot#2115
  Add custom job intervals (nautobot#2084)
  Implement Notes Model (nautobot#1984)
  Update Lock-file Patch Releases for Develop (nautobot#2115)
  update paginator to enforce max_page_size setting in web ui views (nautobot#2112)
  Add missing location status migration (nautobot#2100)
  update release-notes for issue nautobot#2060
  added peer_id filter for relationship associations (nautobot#2113)
  Add release-note for nautobot#2025
  Cleanup group names, manual approval for flake8 (nautobot#2025)
  updated documentations for nautobot#2109 and nautobot#2111
  fixed one to many relationship source filter and apply AND operator between filters (nautobot#2111)
  Version bump to v1.3.10-beta.1, seeded next version in docs.
  Add release-note for nautobot#860, nautobot#1694, nautobot#2081. Update release date, version.
  Fix nautobot#2077 - handle case on object detail views where a relationship involves a non-installed model (nautobot#2078)
  Fix error raised if status connected not found when creating a cable (nautobot#2089)
  ...

# Conflicts:
#	nautobot/circuits/api/serializers.py
#	nautobot/core/api/serializers.py
#	nautobot/dcim/api/serializers.py
#	nautobot/docs/development/best-practices.md
#	nautobot/docs/development/style-guide.md
#	nautobot/docs/release-notes/version-1.4.md
#	nautobot/extras/api/nested_serializers.py
#	nautobot/extras/api/relationships.py
#	nautobot/extras/api/serializers.py
#	nautobot/extras/tests/integration/test_notes.py
#	nautobot/extras/tests/test_api.py
#	nautobot/utilities/testing/api.py
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dependencies Pull requests that update a dependency file
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants