Skip to content

GitLab

Commit 2743a0c0 authored by payno's avatar payno
Browse files

Merge branch 'add_representation' into 'master' 

Add representation

Closes #1

See merge request !2
parents 6fb7b786 03e88d35
Pipeline #24533 passed with stages
in 1 minute and 49 seconds
Hide whitespace changes
Inline Side-by-side
.gitignore
View file @ 2743a0c0
......@@ -3,3 +3,10 @@
.settings
*.pyc
.idea
# oython eggs folder
*.eggs
*egg-info/
# build
build
\ No newline at end of file
.gitlab-ci.yml 0 → 100644
View file @ 2743a0c0
stages:
- build
- test
- deploy
variables:
http_proxy: http://proxy.esrf.fr:3128
https_proxy: http://proxy.esrf.fr:3128
no_proxy: .esrf.fr,localhost
doc:
stage: build
image: python:3.7-buster
tags:
- linux
before_script:
- arch
- which python
- python --version
- python -m pip install pip --upgrade
- python -m pip install setuptools --upgrade
- python -m pip install sphinx
- git submodule update --init --recursive
- rm -rf artifacts
- mkdir artifacts
script:
- python setup.py build
- python setup.py build_sphinx
- mv build/sphinx/html artifacts/doc
artifacts:
paths:
- artifacts/doc/
when: on_success
expire_in: 2h
only:
- master
.build_template: &test_linux_template
stage: test
before_script:
- arch
- python --version
- python -m pip install pip --upgrade
- python -m pip install setuptools --upgrade
- git submodule update --init --recursive
script:
- python -m pip install .
- python run_tests.py -v
test:python3.5-stretch-pyqt5:
image: python:3.7-buster
<<: *test_linux_template
# deploy
pages:
stage: deploy
tags:
- linux
image: python:3.7-buster
script:
- rm -rf public
# doc
- mv artifacts/doc public
after_script:
- ls -Rl public
artifacts:
paths:
- public
expire_in: 1h
only:
- master
.gitmodules 0 → 100644
View file @ 2743a0c0
[submodule "pypushflow/representation"]
path = pypushflow/representation
url = https://gitlab.esrf.fr/workflow/representation.git
.idea/inspectionProfiles/Project_Default.xml deleted 100644 → 0
View file @ 6fb7b786
<component name="InspectionProjectProfileManager">
<profile version="1.0">
<option name="myName" value="Project Default" />
<inspection_tool class="PyPep8NamingInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true">
<option name="ignoredErrors">
<list>
<option value="N806" />
<option value="N803" />
<option value="N802" />
</list>
</option>
</inspection_tool>
</profile>
</component>
\ No newline at end of file
.idea/misc.xml deleted 100644 → 0
View file @ 6fb7b786
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.7" project-jdk-type="Python SDK" />
</project>
\ No newline at end of file
.idea/modules.xml deleted 100644 → 0
View file @ 6fb7b786
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/pypushflow.iml" filepath="$PROJECT_DIR$/.idea/pypushflow.iml" />
</modules>
</component>
</project>
\ No newline at end of file
.idea/pypushflow.iml deleted 100644 → 0
View file @ 6fb7b786
<?xml version="1.0" encoding="UTF-8"?>
<module type="PYTHON_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/pypushflow" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
<component name="TestRunnerService">
<option name="PROJECT_TEST_RUNNER" value="Unittests" />
</component>
</module>
\ No newline at end of file
.idea/workspace.xml deleted 100644 → 0
View file @ 6fb7b786
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="c576ef19-b019-42bf-aa79-4f42108f323d" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/pypushflow.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/pypushflow.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pypushflow/RouterActor.py" beforeDir="false" afterPath="$PROJECT_DIR$/pypushflow/RouterActor.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pypushflow/StopActor.py" beforeDir="false" afterPath="$PROJECT_DIR$/pypushflow/StopActor.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pypushflow/Submodel.py" beforeDir="false" afterPath="$PROJECT_DIR$/pypushflow/Submodel.py" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pypushflow/test/pythonActor1.py">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/pypushflow/test/TestWorkflow.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="273">
<caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
<folding>
<element signature="e#1198#1238#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pypushflow/test/test_Workflows.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="534">
<caret line="63" column="31" selection-start-line="63" selection-start-column="31" selection-end-line="63" selection-end-column="31" />
<folding>
<element signature="e#1198#1212#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>parent</find>
</findStrings>
<replaceStrings>
<replace>errorHandler</replace>
</replaceStrings>
<dirStrings>
<dir>$PROJECT_DIR$</dir>
</dirStrings>
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/pypushflow/PythonActor.py" />
<option value="$PROJECT_DIR$/pypushflow/Submodel.py" />
<option value="$PROJECT_DIR$/pypushflow/test/TestWorkflow.py" />
<option value="$PROJECT_DIR$/pypushflow/test/test_Workflows.py" />
</list>
</option>
</component>
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="-3" />
<option name="y" value="49" />
<option name="width" value="1372" />
<option name="height" value="589" />
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="ProjectView">
<navigator proportions="" version="1">
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
<path>
<item name="pypushflow" type="b2602c69:ProjectViewProjectNode" />
<item name="pypushflow" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="pypushflow" type="b2602c69:ProjectViewProjectNode" />
<item name="pypushflow" type="462c0819:PsiDirectoryNode" />
<item name="pypushflow" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="pypushflow" type="b2602c69:ProjectViewProjectNode" />
<item name="pypushflow" type="462c0819:PsiDirectoryNode" />
<item name="pypushflow" type="462c0819:PsiDirectoryNode" />
<item name="test" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
</pane>
</panes>
</component>
<component name="PropertiesComponent">
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../pybes" />
<property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PythonContentEntriesConfigurable" />
</component>
<component name="RunDashboard">
<option name="ruleStates">
<list>
<RuleState>
<option name="name" value="ConfigurationTypeDashboardGroupingRule" />
</RuleState>
<RuleState>
<option name="name" value="StatusDashboardGroupingRule" />
</RuleState>
</list>
</option>
</component>
<component name="RunManager" selected="Python tests.Unittests in test">
<configuration name="System" type="PythonConfigurationType" factoryName="Python">
<module name="pypushflow" />
<option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" />
<envs>
<env name="PYTHONUNBUFFERED" value="1" />
</envs>
<option name="SDK_HOME" value="/usr/bin/python3.7" />
<option name="WORKING_DIRECTORY" value="" />
<option name="IS_MODULE_SDK" value="false" />
<option name="ADD_CONTENT_ROOTS" value="true" />
<option name="ADD_SOURCE_ROOTS" value="true" />
<option name="SCRIPT_NAME" value="" />
<option name="PARAMETERS" value="" />
<option name="SHOW_COMMAND_LINE" value="false" />
<option name="EMULATE_TERMINAL" value="false" />
<option name="MODULE_MODE" value="false" />
<option name="REDIRECT_INPUT" value="false" />
<option name="INPUT_FILE" value="" />
<method v="2" />
</configuration>
<configuration name="Unittests in test" type="tests" factoryName="Unittests" temporary="true" nameIsGenerated="true">
<module name="pypushflow" />
<option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" />
<option name="SDK_HOME" value="$USER_HOME$/miniconda3/bin/python" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/pypushflow/test" />
<option name="IS_MODULE_SDK" value="false" />
<option name="ADD_CONTENT_ROOTS" value="true" />
<option name="ADD_SOURCE_ROOTS" value="true" />
<option name="_new_pattern" value="&quot;&quot;" />
<option name="_new_additionalArguments" value="&quot;&quot;" />
<option name="_new_target" value="&quot;$PROJECT_DIR$/pypushflow/test&quot;" />
<option name="_new_targetType" value="&quot;PATH&quot;" />
<method v="2" />
</configuration>
<configuration name="Unittests in test_Actors.py" type="tests" factoryName="Unittests" temporary="true" nameIsGenerated="true">
<module name="pypushflow" />
<option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" />
<option name="SDK_HOME" value="" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/pypushflow/test" />
<option name="IS_MODULE_SDK" value="true" />
<option name="ADD_CONTENT_ROOTS" value="true" />
<option name="ADD_SOURCE_ROOTS" value="true" />
<option name="_new_additionalArguments" value="&quot;&quot;" />
<option name="_new_target" value="&quot;$PROJECT_DIR$/pypushflow/test/test_Actors.py&quot;" />
<option name="_new_targetType" value="&quot;PATH&quot;" />
<method v="2" />
</configuration>
<configuration name="Unittests in test_Workflows.py" type="tests" factoryName="Unittests" temporary="true" nameIsGenerated="true">
<module name="pypushflow" />
<option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" />
<option name="SDK_HOME" value="" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/pypushflow/test" />
<option name="IS_MODULE_SDK" value="true" />
<option name="ADD_CONTENT_ROOTS" value="true" />
<option name="ADD_SOURCE_ROOTS" value="true" />
<option name="_new_additionalArguments" value="&quot;&quot;" />
<option name="_new_target" value="&quot;$PROJECT_DIR$/pypushflow/test/test_Workflows.py&quot;" />
<option name="_new_targetType" value="&quot;PATH&quot;" />
<method v="2" />
</configuration>
<list>
<item itemvalue="Python.System" />
<item itemvalue="Python tests.Unittests in test_Actors.py" />
<item itemvalue="Python tests.Unittests in test_Workflows.py" />
<item itemvalue="Python tests.Unittests in test" />
</list>
<recent_temporary>
<list>
<item itemvalue="Python tests.Unittests in test" />
<item itemvalue="Python tests.Unittests in test_Workflows.py" />
<item itemvalue="Python tests.Unittests in test_Actors.py" />
</list>
</recent_temporary>
</component>
<component name="SvnConfiguration">
<configuration />
</component>
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="c576ef19-b019-42bf-aa79-4f42108f323d" name="Default Changelist" comment="" />
<created>1561208870733</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1561208870733</updated>
</task>
<servers />
</component>
<component name="TestHistory">
<history-entry file="Unittests_in_test - 2019.06.24 at 09h 35m 30s.xml">
<configuration name="Unittests in test" configurationId="tests" />
</history-entry>
<history-entry file="Unittests_in_test - 2019.06.24 at 09h 38m 39s.xml">
<configuration name="Unittests in test" configurationId="tests" />
</history-entry>
<history-entry file="Unittests_in_test - 2019.06.24 at 09h 38m 42s.xml">
<configuration name="Unittests in test" configurationId="tests" />
</history-entry>
<history-entry file="Unittests_in_test - 2019.06.24 at 09h 39m 26s.xml">
<configuration name="Unittests in test" configurationId="tests" />
</history-entry>
<history-entry file="Unittests_in_test - 2019.06.24 at 09h 41m 31s.xml">
<configuration name="Unittests in test" configurationId="tests" />
</history-entry>
<history-entry file="Unittests_in_test - 2019.06.24 at 09h 41m 44s.xml">
<configuration name="Unittests in test" configurationId="tests" />
</history-entry>
<history-entry file="Unittests_in_test - 2019.06.24 at 09h 42m 37s.xml">
<configuration name="Unittests in test" configurationId="tests" />
</history-entry>
<history-entry file="Unittests_in_test - 2019.06.24 at 09h 42m 51s.xml">
<configuration name="Unittests in test" configurationId="tests" />
</history-entry>
<history-entry file="Unittests_in_test - 2019.06.24 at 09h 46m 08s.xml">
<configuration name="Unittests in test" configurationId="tests" />
</history-entry>
<history-entry file="Unittests_in_test - 2019.06.24 at 10h 23m 37s.xml">
<configuration name="Unittests in test" configurationId="tests" />
</history-entry>
</component>
<component name="ToolWindowManager">
<frame x="46" y="31" width="1877" height="1172" extended-state="6" />
<editor active="true" />
<layout>
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24432433" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Favorites" order="2" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" />
<window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.3288719" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="bottom" id="Version Control" order="7" weight="0.3298279" />
<window_info anchor="bottom" id="Terminal" order="8" />
<window_info anchor="bottom" id="Event Log" order="9" side_tool="true" />
<window_info anchor="bottom" id="Python Console" order="10" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
</layout>
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
<breakpoints>
<line-breakpoint enabled="true" suspend="THREAD" type="python-line">
<url>file://$PROJECT_DIR$/pypushflow/test/TestWorkflow.py</url>
<line>25</line>
<option name="timeStamp" value="1" />
</line-breakpoint>
</breakpoints>
</breakpoint-manager>
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/pypushflow/AbstractActor.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="90">
<caret line="6" column="82" selection-start-line="6" selection-start-column="82" selection-end-line="6" selection-end-column="82" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pypushflow/test/test_Actors.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="960">
<caret line="73" column="47" selection-start-line="73" selection-end-line="74" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pypushflow/Workflow.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="675">
<caret line="46" selection-start-line="46" selection-end-line="46" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pypushflow/PythonActor.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2460">
<caret line="173" column="13" selection-start-line="173" selection-start-column="13" selection-end-line="173" selection-end-column="13" />
<folding>
<element signature="e#1198#1207#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pypushflow/test/pythonErrorHandlerTest.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="450">
<caret line="30" selection-start-line="30" selection-end-line="30" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pypushflow/Submodel.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="219">
<caret line="56" column="6" selection-start-line="56" selection-start-column="6" selection-end-line="56" selection-end-column="6" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pypushflow/test/pythonActor1.py">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/pypushflow/test/test_Workflows.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="534">
<caret line="63" column="31" selection-start-line="63" selection-start-column="31" selection-end-line="63" selection-end-column="31" />
<folding>
<element signature="e#1198#1212#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/pypushflow/test/TestWorkflow.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="273">
<caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
<folding>
<element signature="e#1198#1238#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
CHANGELOG.rst 0 → 100644
View file @ 2743a0c0
Change Log
==========
0.1.0: xxx
----------
* add 'representation' submodule
* features:
LICENSE 0 → 100644
View file @ 2743a0c0
The pypushflow library goal is to provide some usefull process for acquisition/reconstruction automation.
pypushflow is distributed under the MIT license.
The MIT license follows:
Copyright (c) European Synchrotron Radiation Facility (ESRF)
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 0 → 100644
View file @ 2743a0c0
# Description
TODO
# installation
using pypi:
pip install pypushflow
from the [git repository](https://gitlab.esrf.fr/workflow/est/)
git clone https://gitlab.esrf.fr/workflow/est/ --recursive
cd pypushflow
pip install .
copyright 0 → 100644
View file @ 2743a0c0
Files: *
Copyright: 2020 European Synchrotron Radiation Facility
License: MIT
doc/Makefile 0 → 100644
View file @ 2743a0c0
# Minimal makefile for Sphinx documentation
#
# You can set these variables from the command line, and also
# from the environment for the first two.
SPHINXOPTS ?=
SPHINXBUILD ?= sphinx-build
SOURCEDIR = source
BUILDDIR = build
# Put it first so that "make" without argument is like "make help".
help:
@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
.PHONY: help Makefile
# Catch-all target: route all unknown targets to Sphinx using the new
# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS).
%: Makefile
@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
doc/conf.py 0 → 100644
View file @ 2743a0c0
# Configuration file for the Sphinx documentation builder.
#
# This file only contains a selection of the most common options. For a full
# list see the documentation:
# https://www.sphinx-doc.org/en/master/usage/configuration.html
# -- Path setup --------------------------------------------------------------
# If extensions (or modules to document with autodoc) are in another directory,
# add these directories to sys.path here. If the directory is relative to the
# documentation root, use os.path.abspath to make it absolute, like shown here.
#
# import os
# import sys
# sys.path.insert(0, os.path.abspath('.'))
# -- Project information -----------------------------------------------------
project = 'pypushflow'
copyright = '2020, O. Svensson, H. Payno'
author = 'O. Svensson, H. Payno'
# The full version, including alpha/beta/rc tags
release = '0.1'
# -- General configuration ---------------------------------------------------
# Add any Sphinx extension module names here, as strings. They can be
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
# ones.
extensions = [
'sphinx.ext.autodoc',
]
# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
#
# This is also used if you do content translation via gettext catalogs.