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

Reorganize repo: grouped config files inside spyderlib/config #2575

Merged
merged 3 commits into from
Aug 8, 2015
Merged

Reorganize repo: grouped config files inside spyderlib/config #2575

merged 3 commits into from
Aug 8, 2015

Conversation

goanpeca
Copy link
Member

Repo organization (related to issue #1320)

All dangling ****config.py files were grouped into a single folder, spyderlib/config/

@goanpeca goanpeca changed the title Refactor code, grouped *****config.py files inside a new folder Refactor code: grouped *config.py files inside spyderlib/config/ Jul 31, 2015
@goanpeca goanpeca changed the title Refactor code: grouped *config.py files inside spyderlib/config/ Reorganize repo: grouped *config.py files inside spyderlib/config/ Jul 31, 2015
@goanpeca goanpeca added this to the v3.0 milestone Jul 31, 2015
@goanpeca goanpeca self-assigned this Jul 31, 2015
@ccordoba12
Copy link
Member

This one needs a rebase :-)

@goanpeca
Copy link
Member Author

goanpeca commented Aug 5, 2015

@ccordoba12 done!

@ccordoba12 ccordoba12 changed the title Reorganize repo: grouped *config.py files inside spyderlib/config/ Reorganize repo: grouped config files inside spyderlib/config Aug 8, 2015
@@ -10,7 +10,7 @@
from sphinx import __version__ as sphinx_version

# Local imports
from spyderlib.config import CONF
from spyderlib.config.config import CONF
Copy link
Member

Choose a reason for hiding this comment

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

This an error, right? It should be

from spyderlib.config.main import CONF

Copy link
Member Author

Choose a reason for hiding this comment

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

Oops, good catch,...

@ccordoba12
Copy link
Member

I really don't understand how our tests are passing with the errors I pointed out.

How can that be the case @goanpeca?

@goanpeca
Copy link
Member Author

goanpeca commented Aug 8, 2015

The imports were located in if statements... so they were not being triggered...and the one in the inspector was a sphinx ... so there I do not really know.

@ccordoba12
Copy link
Member

I did a last review, and everything seems in order now :-) Weird that our tests didn't fail...

ccordoba12 added a commit that referenced this pull request Aug 8, 2015
Reorganize repo: grouped config files inside spyderlib/config
@ccordoba12 ccordoba12 merged commit a2914d0 into spyder-ide:master Aug 8, 2015
@goanpeca goanpeca deleted the config branch August 16, 2015 04:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants