Skip to content

Cgahr/master#36

Open
afonsoguerra wants to merge 38 commits intoadasilva:masterfrom
afonsoguerra:cgahr/master
Open

Cgahr/master#36
afonsoguerra wants to merge 38 commits intoadasilva:masterfrom
afonsoguerra:cgahr/master

Conversation

@afonsoguerra
Copy link
Copy Markdown

No description provided.

@afonsoguerra
Copy link
Copy Markdown
Author

afonsoguerra commented Jun 23, 2024

Hey, I don't seem to have permissions to add to the other pull request or simply do not know how to do it . Let me know if this works better.

@cgahr
Copy link
Copy Markdown

cgahr commented Jun 23, 2024

Thank you for your bug fix!

The way you try to combine your bugfix with my rewrite is somewhat unorthodox. Typically, there are 2 ways of doing that:

  1. the maintainer of this repo merge Complete rewrite to python 3 and general cleanup #35 first. Next, you create a new PR applying your changes on top
  2. you create a PR in my fork under https://github.com/cgahr/journal2ebook/, we iterate on it and everything gets merged together.

Option 1 is the way it is normally done, option 2 is (potentially) better since the profile bug is fixed before the PR is merged onto master.

Your option, pushing your changes onto mine, is frowned up, since essentially you become the author of all the changes I did. This it is also not possible to track in git that I made these changes, which is helpful for future bug fixes.

Finally, I just updated my PR. Now this PR is out of date and doesn't reflect the actual status anymore.

I hope this was helpful! In my PR, I added a section in the readme about getting started developing and fixing bugs. Maybe you can read it, install the tooling and checkout the feedback of the linters. Also, if you want, you can create a PR in my repo https://github.com/cgahr/journal2ebook/ and merge your fix before merging the rewrite.

@afonsoguerra
Copy link
Copy Markdown
Author

Are you sure this overwrites your authorship? You are still tagged here as the author of most of the commits. My priority here was just to make the code available to you nice people today. Very happy to do a PR in your repo and you can merge it there and take it forward. Realistically, I don't have time for 'pet projects' during the week, so it will be nice to ping it back to you to wrap up the release.

self._config = CONFIG_DEFAULT
self._config = CONFIG_DEFAULT.copy() # Use a copy to avoid modifying the original

print(f"Config file should be located at: {self._path}")
Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

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

Suggest using the python logging library instead of print statements. This is best practice because it allows the end user to have more control of the logging level.

@adasilva
Copy link
Copy Markdown
Owner

adasilva commented Jul 2, 2024

Are you sure this overwrites your authorship? You are still tagged here as the author of most of the commits. My priority here was just to make the code available to you nice people today. Very happy to do a PR in your repo and you can merge it there and take it forward. Realistically, I don't have time for 'pet projects' during the week, so it will be nice to ping it back to you to wrap up the release.

First of all, thanks for the bug fix! I just merged @cgahr 's pull request, so if you would be able to fix any conflicts, I can take a look. I also have a "day job" so I totally understand if it takes a few weeks. (Anyone who need the fix today can always pull your branch!)

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.

3 participants