Skip to content

Commit

Permalink
release-script: Merge branch 'release/v1.11.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
aoeftiger committed Mar 15, 2017
2 parents eb54214 + 76d6a9c commit 4d1793e
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 9 deletions.
2 changes: 1 addition & 1 deletion PyHEADTAIL/_version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '1.11.0'
__version__ = '1.11.1'
5 changes: 4 additions & 1 deletion PyHEADTAIL/testing/unittests/testsuite.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
has_pycuda = False
print 'No PyCUDA installation found.'

from pprint import pprint

from test_slicing import TestSlicing
from test_particles import TestParticles
from test_generators import TestParticleGenerators
Expand Down Expand Up @@ -50,7 +52,8 @@
test = test_load.loadTestsFromTestCase(case)
case_list.append(test)
test_suite = unittest.TestSuite(case_list)
print('Running unit tests ' + str(test_list))
print('Running unit tests:')
pprint(test_list)
runner = unittest.TextTestRunner()
ret = not runner.run(test_suite).wasSuccessful()
sys.exit(ret)
10 changes: 3 additions & 7 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@ PyHEADTAIL
CERN PyHEADTAIL numerical n-body simulation code
for simulating macro-particle beam dynamics with collective effects.

Currently only a git-clone of the repository is supported.
The available zip files on github are missing the versioning
and will not allow ./install to work.

Installation
------------

Expand Down Expand Up @@ -40,13 +36,13 @@ And there you go, start using PyHEADTAIL!
In [1]: import PyHEADTAIL
PyHEADTAIL v1.4.0-0-g8422af8081
PyHEADTAIL v1.11.1
-------------------------------------------------------------------------------

Please use the pre-push script ``pre-push.py`` if you want to contribute
Please use the pre-push script ``prepush.py`` if you want to contribute
to the repository. It only lets you push to the develop and master branch if
no unit tests fail.

To install (creates a symlink): ``ln -s ../../pre-push.py .git/hooks/pre-push``
To install (creates a symlink): ``ln -s ../../prepush.py .git/hooks/pre-push``

0 comments on commit 4d1793e

Please sign in to comment.