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

recast std::bad_alloc as a Python exception #704

Merged
merged 5 commits into from
Feb 20, 2015
Merged

recast std::bad_alloc as a Python exception #704

merged 5 commits into from
Feb 20, 2015

Conversation

mr-c
Copy link
Contributor

@mr-c mr-c commented Dec 19, 2014

Will fix #111

@mr-c
Copy link
Contributor Author

mr-c commented Dec 19, 2014

Jenkins, please test this

@mr-c
Copy link
Contributor Author

mr-c commented Dec 19, 2014

Jenkins, retest this please

@ctb
Copy link
Member

ctb commented Dec 20, 2014

How do we put automated tests in place for these branches - any thoughts?

@mr-c
Copy link
Contributor Author

mr-c commented Dec 28, 2014

@ctb For the functions allocating table call them with outrageously huge table sizes.

@mr-c
Copy link
Contributor Author

mr-c commented Dec 29, 2014

Blargh, OS X just kills the process instead of throwing the std::bad_alloc exception which also makes the tests I wrote unusable.

@mr-c
Copy link
Contributor Author

mr-c commented Feb 19, 2015

  • Is it mergable?
  • Did it pass the tests?
  • If it introduces new functionality in scripts/ is it tested?
    Check for code coverage with make clean diff-cover
  • Is it well formatted? Look at make pep8, make diff_pylint_report,
    make cppcheck, and make doc output. Use make format and manual
    fixing as needed.
  • N/A Did it change the command-line interface? Only additions are allowed
    without a major version increment. Changing file formats also requires a
    major version number increment.
  • Is it documented in the ChangeLog?
    http://en.wikipedia.org/wiki/Changelog#Format
  • Was a spellchecker run on the source code and documentation after
    changes were made?

@mr-c
Copy link
Contributor Author

mr-c commented Feb 20, 2015

Jenkins, test this please

@mr-c
Copy link
Contributor Author

mr-c commented Feb 20, 2015

@luizirber @ctb @camillescott Ready for review and merge

@@ -162,7 +168,7 @@ diff-cover.html: coverage-gcovr.xml coverage.xml
--html-report diff-cover.html

nosetests.xml: FORCE
./setup.py nosetests --with-xunit
./setup.py nosetests --with-xunit --attr ${TESTATTR}
Copy link
Member

Choose a reason for hiding this comment

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

does this mean we no longer need setup.cfg?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

setup.cfg provides other default values and acts as a fallback if the Setuptools nosetests command is run outside of the Makefile

ctb added a commit that referenced this pull request Feb 20, 2015
recast std::bad_alloc as a Python exception
@ctb ctb merged commit 68c8f3e into master Feb 20, 2015
@mr-c mr-c deleted the fix/badalloc branch February 20, 2015 21:07
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.

Put useful error message in when large hash tables fail to alloc.
2 participants