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

Replace source code: <package>/ __init__.py and version.py #50

Merged
merged 2 commits into from
Jun 22, 2024

Conversation

Tieqiong
Copy link
Contributor

@Tieqiong Tieqiong commented Jun 20, 2024

fix #22
fix #23
replace #46

@sbillinge
Copy link
Collaborator

@Tieqiong this looks good. It would be nice if we could get it to pass pre-commit.ci. @Sparks29032 and I fought with this yesterday for conf.py so we should be able to find a solution here too.

@Sparks29032
Copy link
Collaborator

@Tieqiong can you do a git diff and paste the result here? Once confirmed, seems good to merge!

@Tieqiong
Copy link
Contributor Author

Screenshot 2024-06-21 at 7 16 40 PM Screenshot 2024-06-21 at 7 15 08 PM

@Sparks29032
Copy link
Collaborator

Sparks29032 commented Jun 21, 2024

@sbillinge There does not seem to be a PEP standard for newlines within triple quotes. The example given in the PEP specification has the triple quotes all in one line as @Tieqiong has currently, which is not done in diffpy.utils.

image

@sbillinge
Copy link
Collaborator

@sbillinge There does not seem to be a PEP standard for newlines within triple quotes. The example given in the PEP specification has the triple quotes all in one line as @Tieqiong has currently, which is not done in diffpy.utils.

image

I think I am ok with either way.

@sbillinge sbillinge merged commit 6de300f into Billingegroup:main Jun 22, 2024
1 check failed
@Tieqiong Tieqiong deleted the ver branch June 22, 2024 06:07
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.

diffpy/<package>/version.py diffpy/<package>/__init__.py
3 participants