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

Issue #228: Fix missed relative imports, and some indents. #240

Merged
merged 3 commits into from Sep 26, 2019

Conversation

AndrewLister-STFC
Copy link
Contributor

Description of Work

Fixes #228

Updated imports that were missed in last PR for this issue.

Testing Instructions

  1. Run tests

@tyronerees
Copy link
Member

This doesn't run for me -- I get

~/fitbenchmarking$ python example_scripts/example_runScripts.py
Traceback (most recent call last):
  File "example_scripts/example_runScripts.py", line 18, in <module>
    from fitbenchmarking.fitting_benchmarking import do_fitting_benchmark as fitBenchmarking
ImportError: No module named fitbenchmarking.fitting_benchmarking

Running sudo setup.py install again makes no difference.

@AndrewLister-STFC
Copy link
Contributor Author

This doesn't run for me -- I get
~/fitbenchmarking$ python example_scripts/example_runScripts.py
Traceback (most recent call last):
File "example_scripts/example_runScripts.py", line 18, in
from fitbenchmarking.fitting_benchmarking import do_fitting_benchmark as fitBenchmarking
ImportError: No module named fitbenchmarking.fitting_benchmarking

Running sudo setup.py install again makes no difference.

Talked wth Tyrone. Issues seem to come from package data in setup.py?

@arm61
Copy link
Contributor

arm61 commented Sep 20, 2019

In order to get tests passing (where the are .dat, .txt files) I added some stuff to the package data in the setup.py. This may be causing issues (that really travis should be catching but oh well :) )

@AndrewLister-STFC
Copy link
Contributor Author

In order to get tests passing (where the are .dat, .txt files) I added some stuff to the package data in the setup.py. This may be causing issues (that really travis should be catching but oh well :) )

My next task is adding the example scripts to the test suite for just this reason.

@tyronerees
Copy link
Member

@AndrewLister-STFC -- just to record what I told you earlier: I need package_data={'fitbenchmarking': ['resproc/color_definitions.txt']} to get the example script running, but not the others (although I haven't run the tests locally).

As reported by @Anders-Markvardsen in #225 (comment), adding benchmark_problems to package_data actually seems to break the example script for me too.

@AndrewLister-STFC
Copy link
Contributor Author

This is pretty closely related to #226 (in that thats where the fixes for the setup have been added)

@tyronerees tyronerees self-assigned this Sep 25, 2019
Copy link
Member

@tyronerees tyronerees left a comment

Choose a reason for hiding this comment

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

This is pretty closely related to #226 (in that thats where the fixes for the setup have been added)

Yes -- this shouldn't hold up this PR. @AndrewLister-STFC -- could you resolve the merge conflicts? Then I'll give it another glance over and we can tick this one off

Copy link
Member

@tyronerees tyronerees left a comment

Choose a reason for hiding this comment

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

Looks good to me!

@tyronerees tyronerees merged commit 901656a into master Sep 26, 2019
@tyronerees tyronerees deleted the 228_additional_relative_imports branch September 26, 2019 09:31
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.

In example scripts have all import at the top
3 participants