diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 32561671cf7aac599f716c0efb74dedcbf8075a0..ddc23d29b57a9d32f8a0acc5a3b3895259840429 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,7 +7,7 @@ stages: before_script: - pip install setuptools - - pip install -e . + - pip install . pytest: stage: test diff --git a/parallelRunAndWrite/__init__.py b/parallelRunAndWrite/__init__.py new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/parallelRunAndWrite.py b/parallelRunAndWrite/parallelRunAndWrite.py similarity index 100% rename from parallelRunAndWrite.py rename to parallelRunAndWrite/parallelRunAndWrite.py diff --git a/parallelRunAndWrite/tests/__init__.py b/parallelRunAndWrite/tests/__init__.py new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/tests/test_prw.py b/parallelRunAndWrite/tests/test_prw.py similarity index 94% rename from tests/test_prw.py rename to parallelRunAndWrite/tests/test_prw.py index 42716bac3a35c88a2282cc9505551486d90d843a..67db0f9b78e58edc6622b2429354874447ab023b 100644 --- a/tests/test_prw.py +++ b/parallelRunAndWrite/tests/test_prw.py @@ -1,4 +1,4 @@ -import parallelRunAndWrite as prw +from parallelRunAndWrite import parallelRunAndWrite as prw from time import sleep, time import os from random import randint @@ -11,7 +11,7 @@ errRegex=r'prw arg \d+ pid \d+' def raiseOrWork(arg): - if(randint(0,100)%2 ==0): + if(arg%2 ==0): raise Exception("prw arg {} pid {} ".format(arg, os.getpid())) return work(arg) @@ -65,4 +65,4 @@ def testRaise(): from pytest import raises with raises(Exception, match=errRegex): prw.parallelRunAndWrite(raiseOrWork, range(rangeSize), outFname) - verifyFiles(err=False,exact=False) + os.unlink(outFname) diff --git a/setup.py b/setup.py index 3512f33e331ccfb713b9e5c85f1b9f57749f81d2..733a81b1db6e9d816275fbfc776e292027a8411b 100644 --- a/setup.py +++ b/setup.py @@ -1,8 +1,22 @@ from setuptools import setup, find_packages +from os import path + +here = path.abspath(path.dirname(__file__)) + +with open(path.join(here, 'Readme.md'), encoding='utf-8') as f: + long_description = f.read() + + setup( name="pyParallelRunAndWrite", + url="https://gitlab.tetras-libre.fr/tetras-libre/pyParallelRunAndWrite", version="1.0", + license="Gpl v3+", + author="Tetras Libre", + author_email="Contact@Tetras-Libre.fr", + description="Scrapping and exraction tools for Agrobase Logigram", + long_description=long_description, packages=find_packages(), install_requires=["pyprind"], setup_requires=["pytest-runner"],