Skip to content

Various packaging changes and bug fixes #22

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

Merged
merged 5 commits into from
Aug 26, 2014

Conversation

dwighthubbard
Copy link
Contributor

I've been working on my fork and realized some of the changes may be of use upstream.

Added sphinx documentation directory and basic configuration to allow creating library documentation using the same tools as the python core libraries. This should also make it simpler to put the results on the http://readthedocs.org site in the future.

Updated the init.py to correctly import solidpython on both python 2.x and python 3.x interpreters.

Update the tests to run correctly if run from the parent directory.

Add a missing png requirement (which is used by one of the examples) to the settings.py

Subclass the unittest testcase class to output a diff of the differences when an assertEqual fails because the strings in the failures can be rather long and very similar.

Change from using install_data in the setup.py to using a manifest.in that includes all files needed in the sdist package.

Add a tox.ini configuration file to allow for using tox to generate the python package and install and run the unit tests in python virtual environments run with different python interpreters (see issues due to python version differences)

Updated the .gitignore to ignore temp files created by tox and sphinx

Some whitespace/formatting changes to use PEP8 formatting.

dwighthubbard and others added 5 commits April 30, 2014 23:19
Added a tox.ini to allow tox to run tests in virtualenv

Add .gitignore to ignore the .tox directory created by tox and the .idea directory created by pycharm.
@etjones
Copy link
Contributor

etjones commented May 6, 2014

That's really excellent, work, Dwight! Thanks for your contributions. It will take me a couple days to finish the pull, but I'm really thankful for the infrastructure work here.

On May 6, 2014, at 10:56 AM, Dwight Hubbard [email protected] wrote:

I've been working on my fork and realized some of the changes may be of use upstream.

Added sphinx documentation directory and basic configuration to allow creating library documentation using the same tools as the python core libraries. This should also make it simpler to put the results on the http://readthedocs.org site in the future.

Updated the init.py to correctly import solidpython on both python 2.x and python 3.x interpreters.

Update the tests to run correctly if run from the parent directory.

Add a missing png requirement (which is used by one of the examples) to the settings.py

Subclass the unittest testcase class to output a diff of the differences when an assertEqual fails because the strings in the failures can be rather long and very similar.

Change from using install_data in the setup.py to using a manifest.in that includes all files needed in the sdist package.

Add a tox.ini configuration file to allow for using tox to generate the python package and install and run the unit tests in python virtual environments run with different python interpreters (see issues due to python version differences)

Updated the .gitignore to ignore temp files created by tox and sphinx

Some whitespace/formatting changes to use PEP8 formatting.

You can merge this Pull Request by running

git pull https://github.com/dwighthubbard/SolidPython master
Or view, comment on, or merge it at:

#22

Commit Summary

Fix issues with install_data missing from the sdist package.
Expand test cases to output a diff on assertEqual failing instead of the strings which are hard to understand.
Add missing png requirement
Fix tests to not fail if run from the parent directory
Start adding sphinx documentation
File Changes

M .gitignore (4)
A Doc/Makefile (177)
A Doc/conf.py (264)
A Doc/index.rst (30)
A Doc/make.bat (242)
A MANIFEST.in (3)
M setup.py (48)
M solid/init.py (5)
M solid/solidpython.py (6)
A solid/test/ExpandedTestCase.py (23)
M solid/test/test_screw_thread.py (11)
M solid/test/test_solidpython.py (25)
M solid/test/test_utils.py (7)
A tox.ini (9)
Patch Links:

https://github.com/SolidCode/SolidPython/pull/22.patch
https://github.com/SolidCode/SolidPython/pull/22.diff

Reply to this email directly or view it on GitHub.

etjones added a commit that referenced this pull request Aug 26, 2014
Ridiculously delayed pull merge.  Various packaging changes and bug fixes for dwighthubbard's
@etjones etjones merged commit 57a4528 into SolidCode:master Aug 26, 2014
@etjones
Copy link
Contributor

etjones commented Aug 26, 2014

Hi Dwight - I got distracted months ago and just got back to this pull request. So I pulled it and made all the changes to get things ready for Python3. Thanks again for the work you put in here.

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