Merge branch 'release_0.3' into 'main'

Release 0.3.0.a

See merge request !11

.coveragerc

+[run]
+omit =
+    setup.py
\ No newline at end of file

.gitignore

@@ -6,6 +6,7 @@ __pycache__/
 /build/
 *.egg-info/
 .eggs/
+/dist/
 
 # Eclipse IDE
 /.settings/

.gitlab-ci.yml

+stages:
+  - test
+
+test:
+  stage: test
+  image: python:3.6
+  before_script:
+    - pip install pytest-cov
+    - pip install .[test]
+  script:
+    - pytest --cov=./ .
+  only:
+    refs:
+      - main
+      - merge_requests

LICENSE.md

+# MIT License
+
+**Copyright (c) 2021 European Synchrotron Radiation Facility**
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

README.md

@@ -4,16 +4,15 @@ A task scheduler for cyclic and acyclic graphs
 
 ## Install
 
-:warning: **The pypushflow on pypi is a diverged fork of the core project**
-
-Installation from source
-
-```python
-python -m pip install -e .
+```bash
+python -m pip install pypushflow[mx]
 ```
 
+Use the `mx` option for installation at MX beamlines.
+
 ## Run tests
 
-```python
+```bash
+python -m pip install pypushflow[test]
 pytest
 ```

pypushflow/__init__.py

@@ -23,3 +23,4 @@ __authors__ = ["O. Svensson"]
 __license__ = "MIT"
 __date__ = "28/05/2019"
 
+__version__ = "0.3.0-alpha"

pypushflow/test/test_workflow10.py

@@ -76,44 +76,9 @@ class Workflow10(Workflow):
 
 
 class TestWorkflow10(unittest.TestCase):
-    def test_workflow10_10(self):
+    def test_workflow10(self):
         limit = 10
         workflow10 = Workflow10("Test workflow {0}".format(limit))
         inData = {"value": 1, "limit": limit}
         outData = workflow10.run(inData)
         self.assertEqual(outData["value"], limit)
-
-    def test_workflow10_100(self):
-        limit = 100
-        workflow10 = Workflow10("Test workflow {0}".format(limit))
-        inData = {"value": 1, "limit": limit}
-        outData = workflow10.run(inData)
-        self.assertEqual(outData["value"], limit)
-
-    def test_workflow10_200(self):
-        limit = 200
-        workflow10 = Workflow10("Test workflow {0}".format(limit))
-        inData = {"value": 1, "limit": limit}
-        outData = workflow10.run(inData)
-        self.assertEqual(outData["value"], limit)
-
-    def test_workflow10_500(self):
-        limit = 500
-        workflow10 = Workflow10("Test workflow {0}".format(limit))
-        inData = {"value": 1, "limit": limit}
-        outData = workflow10.run(inData)
-        self.assertEqual(outData["value"], limit)
-
-    def test_workflow10_1000(self):
-        limit = 1000
-        workflow10 = Workflow10("Test workflow {0}".format(limit))
-        inData = {"value": 1, "limit": limit}
-        outData = workflow10.run(inData)
-        self.assertEqual(outData["value"], limit)
-
-    def test_workflow10_5000(self):
-        limit = 5000
-        workflow10 = Workflow10("Test workflow {0}".format(limit))
-        inData = {"value": 1, "limit": limit}
-        outData = workflow10.run(inData)
-        self.assertEqual(outData["value"], limit)

requirements-dev.txt

-pytest
\ No newline at end of file

setup.cfg

+[metadata]
+name = pypushflow
+version = attr: pypushflow.__version__
+author = ESRF
+author_email = svensson@esrf.fr
+description = A task scheduler for cyclic and acyclic graphs
+long_description = file: README.md
+long_description_content_type = text/markdown
+license = MIT
+url = https://gitlab.esrf.fr/workflow/pypushflow
+project_urls = 
+    Bug Tracker = https://gitlab.esrf.fr/workflow/pypushflow/-/issues
+classifiers = 
+    Intended Audience :: Science/Research
+    License :: OSI Approved :: MIT License
+    Programming Language :: Python :: 3
+
+[options]
+packages = find:
+python_requires = >=3.6
+install_requires = 
+
+[options.extras_require]
+mx = 
+    pymongo
+test = 
+    pytest

setup.py

-from setuptools import setup, find_packages
+import setuptools
 
-setup(
-    name="pypushflow",
-    description="A task scheduler for cyclic and acyclic graphs",
-    packages=find_packages(),
-    install_requires=[]
-)
+if __name__ == "__main__":
+    setuptools.setup()