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

[1.3.latest] Avoid packaging for semver #10679

Merged
merged 3 commits into from
Sep 9, 2024
Merged

Conversation

gshank
Copy link
Contributor

@gshank gshank commented Sep 8, 2024

The latest version of setuptools requires packaging > 22.0, but our old semver code depending on packaging < 22.0. This was fixed in 1.4.latest, so this is a backport of those fixes.

github-actions bot and others added 2 commits September 8, 2024 15:54
* Modify semver.py to not use packaging.version.parse

* Changie

(cherry picked from commit d9424cc)

Co-authored-by: Gerda Shank <gerda@dbtlabs.com>
(cherry picked from commit 915585c)

Co-authored-by: Jeremy Cohen <jeremy@dbtlabs.com>
@gshank gshank added the Skip Changelog Skips GHA to check for changelog file label Sep 8, 2024
@cla-bot cla-bot bot added the cla:yes label Sep 8, 2024
@gshank gshank merged commit 9e85a22 into 1.3.latest Sep 9, 2024
21 of 22 checks passed
@gshank gshank deleted the avoid_packaging_for_semver branch September 9, 2024 21:12
@gshank gshank added the backport 1.2.latest This PR will be backported to the 1.2.latest branch label Sep 9, 2024
github-actions bot pushed a commit that referenced this pull request Sep 9, 2024
* CT 2000 fix semver prerelease comparisons (#6838) (#6958)

* Modify semver.py to not use packaging.version.parse

* Changie

(cherry picked from commit d9424cc)

Co-authored-by: Gerda Shank <gerda@dbtlabs.com>

* Fix regression in semver comparison logic (#7040) (#7041)

(cherry picked from commit 915585c)

Co-authored-by: Jeremy Cohen <jeremy@dbtlabs.com>

* Fix changed name of exception

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Jeremy Cohen <jeremy@dbtlabs.com>
(cherry picked from commit 9e85a22)
@gshank gshank added backport 1.1.latest backport 1.0.latest Tag for PR to be backported to the 1.0.latest branch labels Sep 9, 2024
Copy link
Contributor

github-actions bot commented Sep 9, 2024

The backport to 1.1.latest failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-1.1.latest 1.1.latest
# Navigate to the new working tree
cd .worktrees/backport-1.1.latest
# Create a new branch
git switch --create backport-10679-to-1.1.latest
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 9e85a228f3cb7d29787f26596bfde04874b7e7d4
# Push it to GitHub
git push --set-upstream origin backport-10679-to-1.1.latest
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.1.latest

Then, create a pull request where the base branch is 1.1.latest and the compare/head branch is backport-10679-to-1.1.latest.

Copy link
Contributor

github-actions bot commented Sep 9, 2024

The backport to 1.0.latest failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-1.0.latest 1.0.latest
# Navigate to the new working tree
cd .worktrees/backport-1.0.latest
# Create a new branch
git switch --create backport-10679-to-1.0.latest
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 9e85a228f3cb7d29787f26596bfde04874b7e7d4
# Push it to GitHub
git push --set-upstream origin backport-10679-to-1.0.latest
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.0.latest

Then, create a pull request where the base branch is 1.0.latest and the compare/head branch is backport-10679-to-1.0.latest.

gshank added a commit that referenced this pull request Sep 9, 2024
* CT 2000 fix semver prerelease comparisons (#6838) (#6958)

* Modify semver.py to not use packaging.version.parse

* Changie

(cherry picked from commit d9424cc)

Co-authored-by: Gerda Shank <gerda@dbtlabs.com>

* Fix regression in semver comparison logic (#7040) (#7041)

(cherry picked from commit 915585c)

Co-authored-by: Jeremy Cohen <jeremy@dbtlabs.com>

* Fix changed name of exception

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Jeremy Cohen <jeremy@dbtlabs.com>
gshank added a commit that referenced this pull request Sep 9, 2024
* CT 2000 fix semver prerelease comparisons (#6838) (#6958)

* Modify semver.py to not use packaging.version.parse

* Changie

(cherry picked from commit d9424cc)

Co-authored-by: Gerda Shank <gerda@dbtlabs.com>

* Fix regression in semver comparison logic (#7040) (#7041)

(cherry picked from commit 915585c)

Co-authored-by: Jeremy Cohen <jeremy@dbtlabs.com>

* Fix changed name of exception

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Jeremy Cohen <jeremy@dbtlabs.com>
gshank added a commit that referenced this pull request Sep 10, 2024
* CT 2000 fix semver prerelease comparisons (#6838) (#6958)

* Modify semver.py to not use packaging.version.parse

* Changie

(cherry picked from commit d9424cc)

Co-authored-by: Gerda Shank <gerda@dbtlabs.com>

* Fix regression in semver comparison logic (#7040) (#7041)

(cherry picked from commit 915585c)

Co-authored-by: Jeremy Cohen <jeremy@dbtlabs.com>

* Fix changed name of exception

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Jeremy Cohen <jeremy@dbtlabs.com>
(cherry picked from commit 9e85a22)

Co-authored-by: Gerda Shank <gerda@dbtlabs.com>
gshank added a commit that referenced this pull request Sep 10, 2024
* CT 2000 fix semver prerelease comparisons (#6838) (#6958)

* Modify semver.py to not use packaging.version.parse

* Changie

(cherry picked from commit d9424cc)



* Fix regression in semver comparison logic (#7040) (#7041)

(cherry picked from commit 915585c)



* Fix changed name of exception

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Jeremy Cohen <jeremy@dbtlabs.com>
gshank added a commit that referenced this pull request Sep 10, 2024
* CT 2000 fix semver prerelease comparisons (#6838) (#6958)

* Modify semver.py to not use packaging.version.parse

* Changie

(cherry picked from commit d9424cc)



* Fix regression in semver comparison logic (#7040) (#7041)

(cherry picked from commit 915585c)



* Fix changed name of exception

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Jeremy Cohen <jeremy@dbtlabs.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 1.0.latest Tag for PR to be backported to the 1.0.latest branch backport 1.1.latest backport 1.2.latest This PR will be backported to the 1.2.latest branch cla:yes Skip Changelog Skips GHA to check for changelog file
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants