From c81ae1442f7d18cab7c63a9544d33da787ca96ef Mon Sep 17 00:00:00 2001
From: David Beniamine <david.beniamine@tetras-libre.fr>
Date: Wed, 12 Sep 2018 15:13:26 +0200
Subject: [PATCH] Better setup.py
---
.gitlab-ci.yml | 2 +-
parallelRunAndWrite/__init__.py | 0
.../parallelRunAndWrite.py | 0
parallelRunAndWrite/tests/__init__.py | 0
{tests => parallelRunAndWrite/tests}/test_prw.py | 6 +++---
setup.py | 14 ++++++++++++++
6 files changed, 18 insertions(+), 4 deletions(-)
create mode 100644 parallelRunAndWrite/__init__.py
rename parallelRunAndWrite.py => parallelRunAndWrite/parallelRunAndWrite.py (100%)
create mode 100644 parallelRunAndWrite/tests/__init__.py
rename {tests => parallelRunAndWrite/tests}/test_prw.py (94%)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3256167..ddc23d2 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 0000000..e69de29
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 0000000..e69de29
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 42716ba..67db0f9 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 3512f33..733a81b 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"],
--
GitLab