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.

Sign up for GitHub

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

Jump to bottom

Gendata rft #18

Merged
merged 3 commits into from
Jan 16, 2020
Merged

Gendata rft #18

merged 3 commits into from
Jan 16, 2020

Conversation

lars-petter-hauge
Copy link
Contributor

No description provided.

@lars-petter-hauge lars-petter-hauge force-pushed the gendata_rft branch 3 times, most recently from 71e41fb to 0ff41ef Compare January 10, 2020 11:46
jondequinor
jondequinor suggested changes Jan 13, 2020
View reviewed changes
tests/jobs/rft/data/norne/norne.py Outdated Show resolved Hide resolved
oyvindeide
oyvindeide reviewed Jan 13, 2020
View reviewed changes
tests/jobs/rft/test_gendata_rft.py Show resolved Hide resolved
semeio/jobs/rft/gendata_rft.py Outdated Show resolved Hide resolved
semeio/jobs/rft/gendata_rft.py Outdated Show resolved Hide resolved
semeio/jobs/rft/gendata_rft.py Outdated Show resolved Hide resolved
semeio/jobs/rft/gendata_rft.py Outdated Show resolved Hide resolved
semeio/jobs/rft/gendata_rft.py Outdated Show resolved Hide resolved
semeio/jobs/scripts/gendata_rft.py Outdated Show resolved Hide resolved
@lars-petter-hauge
Copy link
Contributor Author

lars-petter-hauge commented Jan 13, 2020 •
edited
Loading

The reason it fails on 2.7 currently is the precision in py2 vs py3 has changed, might need to change filecmp.cmp to reading both files and asserting almost equals.

Edit: I've replaced the filecmp.cmp with a small function that does a line by line compare after casting to float. If this is the best solution.. I believe it's an accepted solution

oysteoh
oysteoh reviewed Jan 16, 2020
View reviewed changes
semeio/jobs/rft/utility.py Outdated Show resolved Hide resolved
oysteoh
oysteoh reviewed Jan 16, 2020
View reviewed changes
semeio/jobs/rft/utility.py Outdated Show resolved Hide resolved
jondequinor
jondequinor previously approved these changes Jan 16, 2020
View reviewed changes
@jondequinor jondequinor dismissed their stale review January 16, 2020 09:24

Requested changes was OK

@lars-petter-hauge lars-petter-hauge force-pushed the gendata_rft branch 2 times, most recently from db09f5d to 6b7c80e Compare January 16, 2020 13:18
ManInFez
ManInFez approved these changes Jan 16, 2020
View reviewed changes
Copy link
Contributor

@ManInFez ManInFez left a comment

Choose a reason for hiding this comment

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

👍

@lars-petter-hauge lars-petter-hauge merged commit d6fcc01 into equinor:master Jan 16, 2020
@lars-petter-hauge lars-petter-hauge deleted the gendata_rft branch January 16, 2020 14:58
@sondreso sondreso mentioned this pull request Jan 17, 2020
Closed
dafeda pushed a commit to dafeda/semeio that referenced this pull request Nov 27, 2024
@dafeda
Added reading seeds from external file, issue equinor#18
75faa2b
dafeda pushed a commit that referenced this pull request Nov 27, 2024
Added reading seeds from external file, issue #18
4b0bd46
dafeda pushed a commit that referenced this pull request Nov 27, 2024
@dafeda
Added reading seeds from external file, issue #18
d7e4547
dafeda pushed a commit that referenced this pull request Nov 27, 2024
@berland
Use pytest tmpdir for fmudesign endpoint testing (#18)
9357fae 
Include blackening the file.

Using pytest avoids repo-clutter.

Reorganize slightly files vs test-functions
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sondreso sondreso sondreso left review comments

@oysteoh oysteoh oysteoh left review comments

@oyvindeide oyvindeide oyvindeide left review comments

@ManInFez ManInFez ManInFez approved these changes

@jondequinor jondequinor jondequinor left review comments

Assignees

@sondreso sondreso

@lars-petter-hauge lars-petter-hauge

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@lars-petter-hauge @sondreso @oysteoh @ManInFez @oyvindeide @jondequinor