From 9215fefdfa24200d7da389c38a4d6d7b13db3077 Mon Sep 17 00:00:00 2001 From: Enrico Faulhaber Date: Tue, 7 Apr 2020 11:12:14 +0200 Subject: [PATCH] =?UTF-8?q?fix=20py2/py3=20incompat=20f=C3=BCr=20pkgbuildi?= =?UTF-8?q?ng?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ia0c1f58f6121d6715d21c408030106561eca1b13 Reviewed-on: https://forge.frm2.tum.de/review/c/sine2020/secop/playground/+/22891 Tested-by: JenkinsCodeReview Reviewed-by: Markus Zolliker --- doc/Makefile | 2 +- requirements.txt | 1 + secop/__init__.py | 10 ---------- setup.py | 1 + 4 files changed, 3 insertions(+), 11 deletions(-) mode change 100644 => 100755 setup.py diff --git a/doc/Makefile b/doc/Makefile index 26def46..72dfcb8 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -3,7 +3,7 @@ # You can set these variables from the command line. SPHINXOPTS = -SPHINXBUILD = python -msphinx +SPHINXBUILD = python3 -msphinx SPHINXPROJ = SECoP SOURCEDIR = source BUILDDIR = _build diff --git a/requirements.txt b/requirements.txt index 1a63e15..69dd60b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,5 @@ #--extra-index-url https://forge.frm2.tum.de/simple +setuptools pyserial mlzlog >=0.2.0 # for generating docu diff --git a/secop/__init__.py b/secop/__init__.py index d90e39d..89b362c 100644 --- a/secop/__init__.py +++ b/secop/__init__.py @@ -22,13 +22,3 @@ # Markus Zolliker # # ***************************************************************************** - -# allow to import the most important classes from 'secop' -from secop.datatypes import * -from secop.lib.enum import Enum -from secop.modules import Module, Readable, Writable, Drivable, Communicator, Attached -from secop.params import Parameter, Command, Override -from secop.metaclass import Done -from secop.iohandler import IOHandler, IOHandlerBase -from secop.stringio import StringIO, HasIodev -from secop.proxy import SecNode, Proxy, proxy_class diff --git a/setup.py b/setup.py old mode 100644 new mode 100755 index 2f60237..48e4152 --- a/setup.py +++ b/setup.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # ***************************************************************************** # MLZ Tango client tool