diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 86587ca1087933e9337366fe39092be2197b6377..9df0b6e715bfd1efef91127ed0275e7bc5e660de 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,6 +2,16 @@ simple_test: script: - source tests/ci-scripts/test.sh + - export destdir=/tmp/bfpsinstall + - if [[ -d $destdir ]] ; then rm -rf $destdir ; fi + - if [[ ! -d $destdir/lib/python3.6/site-packages/ ]] ; then mkdir -p $destdir/lib/python3.6/site-packages/ ; fi + - export PYTHONPATH=$destdir/lib/python3.6/site-packages/:$PYTHONPATH + - export PATH=$destdir/bin/:$PATH + - /home/ubuntu/anaconda3/bin/python3 setup.py compile_library --timing-output 1 + - echo "destdir $destdir" + - /home/ubuntu/anaconda3/bin/python3 setup.py install --prefix=$destdir + - /home/ubuntu/anaconda3/bin/python3 $destdir/bin/bfps.test_NSVEparticles + - if [[ -d $destdir ]] ; then rm -rf $destdir ; fi tags: - fftw3 - hdf5 diff --git a/bfps/__init__.py b/bfps/__init__.py index daecf42d306519ac9216c030e14f6e6c0cdcbb25..6c220e69d877670206e411c5a0f1f1ae78c04d33 100644 --- a/bfps/__init__.py +++ b/bfps/__init__.py @@ -52,3 +52,4 @@ from .FluidResize import FluidResize from .NavierStokes import NavierStokes from .NSVorticityEquation import NSVorticityEquation +#import test diff --git a/bfps/test/__init__.py b/bfps/test/__init__.py new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/setup.py b/setup.py index 2f4fa4acd072b352a0069335c8125df4559e03f1..139a441116dac9013a5bdecef196589cb7f3f592 100644 --- a/setup.py +++ b/setup.py @@ -249,7 +249,7 @@ from setuptools import setup setup( name = 'bfps', - packages = ['bfps'], + packages = ['bfps', 'bfps/test'], install_requires = ['numpy>=1.8', 'h5py>=2.2.1'], cmdclass={'compile_library' : CompileLibCommand}, package_data = {'bfps': header_list + @@ -259,9 +259,9 @@ setup( entry_points = { 'console_scripts': [ 'bfps = bfps.__main__:main', - 'bfps1 = bfps.__main__:main'], + 'bfps1 = bfps.__main__:main', + 'bfps.test_NSVEparticles = bfps.test.test_bfps_NSVEparticles:main'], }, - scripts = ['bfps/test/test_bfps_NSVEparticles.py'], version = VERSION, ######################################################################## # useless stuff folows