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 psutil to 6, furo to 2024, markupsafe to <3 #304

Merged
merged 3 commits into from
Nov 20, 2024

Conversation

irisbian504
Copy link

@irisbian504 irisbian504 commented Nov 3, 2024

fix #240
fix #241
fix #242

@anth-volk anth-volk self-requested a review November 4, 2024 13:26
Copy link
Contributor

@anth-volk anth-volk left a comment

Choose a reason for hiding this comment

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

Thanks for this @irisbian504!

It looks like you committed the ipython version update off of a local master branch, then opened this one in order to add the later commits. Unfortunately, this breaks two parts of our CI/CD Actions. In order to fix this, could you do the following:

  1. Run git pull upstream master, then git push origin master (or in GitHub, click the button to keep your local fork up-to-date)
  2. Switch to your branch, then run git rebase master. You'll probably hit a couple merge conflicts, but the changelog should only contain your most recent changes, and the version number in setup.py should be the most recent one, 3.11.1.

@anth-volk
Copy link
Contributor

I took the liberty of rebasing, per the instructions above, as I work through some backlogged PRs.

changelog_entry.yaml Outdated Show resolved Hide resolved
changelog_entry.yaml Outdated Show resolved Hide resolved
setup.py Show resolved Hide resolved
@anth-volk anth-volk self-requested a review November 19, 2024 22:54
changelog_entry.yaml Outdated Show resolved Hide resolved
@MaxGhenis MaxGhenis merged commit f9bbce6 into PolicyEngine:master Nov 20, 2024
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update markupsafe to <3 Update to furo 2024 Update to psutil 6
3 participants