Skip to content
Snippets Groups Projects
Commit 8943caa1 authored by Denis Arrivault's avatar Denis Arrivault
Browse files

Up with a setup approach

parent 128c8386
No related branches found
No related tags found
No related merge requests found
Pipeline #
...@@ -84,7 +84,7 @@ pytests_results.txt ...@@ -84,7 +84,7 @@ pytests_results.txt
.coverage .coverage
.html .html
.png .png
htmlcov/ .eggs
LtfatPyt.egg-info/ LtfatPyt.egg-info/
.cache/ .cache/
dist/ dist/
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
stages: stages:
- build - build
- test - test
- dist
# Global runner/docker image definition # Global runner/docker image definition
image: ubuntu:latest image: ubuntu:latest
...@@ -28,16 +29,29 @@ build: ...@@ -28,16 +29,29 @@ build:
tags: tags:
- docker - docker
script: script:
- pip3 install -e . - python setup.py install
# Tests # Tests
test: test:
stage: test stage: test
tags: tags:
- docker - docker
dependencies:
- build
script: script:
- python setup.py test
artifacts:
when: always
untracked: true
paths:
- build/
expire_in: 8d
# Installation and test with pip
dist:
stage: dist
tags:
- docker
script:
- pip install -e .
- nosetests - nosetests
artifacts: artifacts:
when: always when: always
...@@ -45,3 +59,6 @@ test: ...@@ -45,3 +59,6 @@ test:
paths: paths:
- build/ - build/
expire_in: 8d expire_in: 8d
after_script:
- pip3 uninstall ltfatpy
\ No newline at end of file
...@@ -325,9 +325,9 @@ def setup_package(): ...@@ -325,9 +325,9 @@ def setup_package():
author='Denis Arrivault and Florent Jaillet', author='Denis Arrivault and Florent Jaillet',
author_email='denis.arrivault@lif.univ-mrs.fr ' + author_email='denis.arrivault@lif.univ-mrs.fr ' +
'florent.jaillet@lif.univ-mrs.fr', 'florent.jaillet@lif.univ-mrs.fr',
# install_requires=['numpy'],
ext_modules=extensions, ext_modules=extensions,
tests_require=['pytest'], test_suite='nose.collector',
tests_require=['nose', 'coverage'],
cmdclass={'build_ext': m_build_ext, cmdclass={'build_ext': m_build_ext,
'clean': m_clean, 'sdist': m_sdist}, 'clean': m_clean, 'sdist': m_sdist},
classifiers=['Development Status :: 5 - Production/Stable', classifiers=['Development Status :: 5 - Production/Stable',
...@@ -344,7 +344,7 @@ def setup_package(): ...@@ -344,7 +344,7 @@ def setup_package():
'Topic :: Scientific/Engineering :: Mathematics', 'Topic :: Scientific/Engineering :: Mathematics',
'Topic :: Scientific/Engineering' 'Topic :: Scientific/Engineering'
], ],
install_requires=['numpy>=1.8', 'matplotlib>=1.4', 'six>=1.10'], install_requires=['scipy>=0.18', 'numpy>=1.8', 'matplotlib>=1.4', 'six>=1.10'],
) )
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment