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

Merge in less-sensitive updates from the project template #2095

Merged
merged 160 commits into from Apr 12, 2023

Conversation

pacrob
Copy link
Collaborator

@pacrob pacrob commented Apr 11, 2023

What was wrong?

The project template was updated. This is to merge in many of the changes from it.

Because there are so many changes, this PR is only for files that do not touch dependency or python versions (except for adding pydocstyle). Those will be done separately.

Files that need updating in following pr:

  • setup.py
  • tox.ini
  • mypy.ini
  • .circleci/config.yml

Cute Animal Picture

fselmo and others added 11 commits November 30, 2022 11:57
Do not invoke `setup.py` directly; minor refactor + cleanup
bump docs dependencies, add readthedocs requirements
* convert bash scripts to py
* bump versions in dependencies and ci builds

* move tox to [dev] per issue ethereum#34

* move RTD deps pointer into .readthedocs.yml

* unpin flake8 add flake8-bugbear to lint deps
* remove gitter, testing setup, and pandoc sections, add quotes to dev install
* repin flake8, bump tox to >=4.0.0 as that's where whitelist was deprecated, misc updates
@pacrob pacrob changed the title Merge in most changes from the project template Merge in less-sensitive updates from the project template Apr 11, 2023
@pacrob pacrob force-pushed the join-to-template branch 8 times, most recently from 1e28f4e to df25855 Compare April 11, 2023 15:28
Copy link
Collaborator

@kclowes kclowes left a comment

Choose a reason for hiding this comment

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

Thank you for doing this! I didn't look very closely, but will this throw off the commit history between py-evm and the template next time we merge it in since you didn't take the whole template history?

LICENSE Outdated
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright 2017-2019 Ethereum Foundation
Copyright (c) 2020 The Ethereum Foundation
Copy link
Collaborator

Choose a reason for hiding this comment

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

I have no idea how this works, but should we update this annually? As in, should this be 2023 now?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

As discussed, I'll update to the range of years in which changes were made to the library.

.pydocstyle.ini Outdated
Copy link
Collaborator

Choose a reason for hiding this comment

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

I like that there are comments here that says what each code is!

@pacrob
Copy link
Collaborator Author

pacrob commented Apr 12, 2023

will this throw off the commit history between py-evm and the template next time we merge it in since you didn't take the whole template history?

I did take the entire template commit history, I just accepted local changes for the remaining files when fixing the merge conflicts. I don't think it will cause a problem.

@kclowes
Copy link
Collaborator

kclowes commented Apr 12, 2023

Got it. Sounds good to me! Thanks again!

@pacrob pacrob merged commit 158f0c9 into ethereum:master Apr 12, 2023
33 checks passed
@pacrob pacrob deleted the join-to-template branch April 12, 2023 17:52
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.

None yet

9 participants