Skip to content

Pytest contributions#3

Closed
rwest wants to merge 16 commits into
JacksonBurns:pytestfrom
rwest:pytest
Closed

Pytest contributions#3
rwest wants to merge 16 commits into
JacksonBurns:pytestfrom
rwest:pytest

Conversation

@rwest

@rwest rwest commented Jul 28, 2023

Copy link
Copy Markdown

These commits bring your pytest branch up to be the same as my pytest3 branch. I think we already discussed the changes (eg. these commits revert things that you agreed should be dropped) - but am contributing via a pull request so you can double check.
I suggest we then switch the history to be the pytest3 version.

@rwest

rwest commented Jul 31, 2023

Copy link
Copy Markdown
Author

I suggest that when we finally merge this effort to main we use the history that's in the rwest/pytest3 branch (i.e. before we merge ReactionMechanismGenerator#2504 we force push that history to your branch). But I am making commits to this pull request into your JacksonBurns/pytest branch (from my rwest/pytest branch) so that you can see what changes I'm making as small deltas, keeping the tips of the two branches equivalent.

rwest and others added 13 commits July 31, 2023 23:22
Jackson wrote: 
Upon closer inspection, all of the setup_class methods in this file could be 
changed to setup_method, I just missed the others. None of the test_* methods 
change self (they just read it) so we don't need to execute the setup method 
over and over again
This is to reduce the overall impact of the pull request.

Revert "DROP. changes permissions on some examples/arkane."

This reverts commit 57e32774a6fa2ec7ea96a0efd29b021d5ecf0fa4.
This is to reduce the impact of the PR.

This reverts commit dca4906cdbbcbb52f818687196ade5fd580c49f1.
Most of these were changed in
Author: Jackson Burns <jwburns@mit.edu>
Date:   Sat Jul 22 15:35:13 2023 -0400
    fix use of np.float and np.bool
but this one got missed or switched back somehow.
Revert "DROP this. Adds test/arkane/data/H2O2/H2O2.py (which is output)"

This reverts commit 6d9ecdb.
If someone installs this, it should be excluded from their git.
The move is just putting it back where it was so the diff is less.
Adding to the phony list because, well, it's a phony target.
It's not that I don't like black, per se, but the code churn
of running it, in the middle of other things, merged with real changes,
on a PR that's not even about arkane, is what I'm undoing.
This lot was rolled in to the commit 
"more hacks for pytest compat, remove deprecated methods"
@rwest rwest deleted the branch JacksonBurns:pytest August 10, 2023 02:22
@rwest rwest closed this Aug 10, 2023
@rwest rwest deleted the pytest branch August 10, 2023 02:23
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.

2 participants