Extra parameters aan lijst toegevoegd

.drone.yml

@@ -11,9 +11,9 @@ platform:
 steps:
   - name: Run unit test
     environment:
-      PYTHONPATH: .
+      PYTHONPATH: src
     commands:
-      - python3 setup.py test
+      - python3 tests/main.py
 
 ---
 kind: pipeline
@@ -28,9 +28,9 @@ platform:
 steps:
   - name: Run unit test
     environment:
-      PYTHONPATH: .
+      PYTHONPATH: src
     commands:
-      - python3 setup.py test
+      - python3 tests/main.py
 
 ---
 kind: pipeline
@@ -45,9 +45,9 @@ platform:
 steps:
   - name: Run unit test
     environment:
-      PYTHONPATH: .
+      PYTHONPATH: src
     commands:
-      - python3 setup.py test
+      - python3 tests/main.py
 
 ---
 kind: pipeline
@@ -62,9 +62,9 @@ platform:
 steps:
   - name: Run unit test
     environment:
-      PYTHONPATH: .
+      PYTHONPATH: src
     commands:
-      - python3 setup.py test
+      - tox
 
 ---
 kind: pipeline
@@ -75,10 +75,10 @@ steps:
   - name: Run unit test
     image: python:3.6
     environment:
-      PYTHONPATH: .
+      PYTHONPATH: src
     commands:
       - pip install python-dateutil
-      - python setup.py test
+      - python tests/main.py
 
 ---
 kind: pipeline
@@ -89,11 +89,11 @@ steps:
   - name: Run unit test
     image: python:latest
     environment:
-      PYTHONPATH: .
+      PYTHONPATH: src
     commands:
       - pip install python-dateutil
       - python --version
-      - python setup.py test
+      - python tests/main.py
 
 ---
 kind: pipeline
@@ -108,8 +108,10 @@ platform:
 steps:
   - name: Build package files
     commands:
-      - python3 setup.py sdist bdist_wheel
+      - python3 -m build
-
+  - name: Run final test after build
+    commands:
+      - tox
   - name: Versie toevoegen aan download
     environment:
       DOWNLOADDIR: /usr/share/nginx/html/download/python/lmwsip
@@ -121,13 +123,20 @@ steps:
         do
           if [ -f "$${DOWNLOADDIR}/$${f}" ]
           then
-            echo version error
+            echo Version already availeble
-            exit 1
           else
             cp "$${f}" "$${DOWNLOADDIR}";
           fi
         done
       - ls -l "$${DOWNLOADDIR}"
+  - name: Versie upload naar pypi test
+    environment:
+      TWINE_USERNAME:
+        from_secret: twine_username
+      TWINE_PASSWORD:
+        from_secret: twine_password
+    commands:
+      - python3 -m twine upload dist/*
     when:
       branch:
         - master
@@ -151,13 +160,13 @@ steps:
     # Make sure we run the pip installed version
     commands:
       - rm -rf lmwsip
-      - pip install --extra-index-url https://marceln.org/download/python lmwsip
+      - pip install lmwsip
       - python -c "import lmwsip"
       - python -c "import lmwsip; print(lmwsip.__version__)"
       - >
        [ $(python -c "import lmwsip; print(lmwsip.__version__)") =
        $(python setup.py --version) ]
-      - python -m unittest -v lmwsip.tests
+      - python tests/main.py
     when:
       branch:
         - master

.gitignore

@@ -7,3 +7,4 @@ lmwsip_marceln.egg-info
 test/__pycache__
 lmwsip.egg-info
 *.swp
+.tox

README.md

@@ -12,12 +12,10 @@ how to use it.
 
 ## Installing
 
-The package is not available on [PyPI](https://pypi.org/).
+Just install the package with 'pip':
-At the moment the package is hosted at https://marceln.org/download/python.
 
-You can install the package with pip:
 ``` 
-pip install --extra-index-url https://marceln.org/download/python lmwsip
+pip install lmwsip
 ``` 
 
 ## Examples

githooks/pre-commit

@@ -2,9 +2,9 @@
 
 set -e
 
-VERSION=$(grep version setup.py | sed -e 's/.*="//' -e 's/",//')
+VERSION=$(grep version setup.cfg | sed 's/.*= *//')
-sed -i "s/^__version__ = .*/__version__ = '${VERSION}'/"  lmwsip/__init__.py
+sed -i "s/^__version__ = .*/__version__ = '${VERSION}'/"  src/lmwsip/__init__.py
-git add lmwsip/__init__.py
+git add src/lmwsip/__init__.py
 
-python setup.py test
+tox
 yamllint .drone.yml

pyproject.toml

@@ -0,0 +1,6 @@
+[build-system]
+requires = [
+    "setuptools>=42",
+    "wheel"
+]
+build-backend = "setuptools.build_meta"

setup.cfg

@@ -0,0 +1,25 @@
+[metadata]
+name = lmwsip
+version = 0.9.6
+author = Marcel Nijenhof
+author_email = pypi@marceln.org
+description = Interface for the lmw sip protocol
+long_description = file: README.md
+long_description_content_type = text/markdown
+url = https://git.marceln.org/Werk/lmwsip
+classifiers =
+    Programming Language :: Python :: 3
+    License :: OSI Approved :: MIT License
+    Operating System :: OS Independent
+    Development Status :: 4 - Beta
+
+[options]
+package_dir =
+    = src
+install_requires =
+    python-dateutil
+packages = find:
+python_requires = >= 3.6
+
+[options.packages.find]
+where = src

setup.py

@@ -1,26 +1,4 @@
-import setuptools
+from setuptools import setup
 
-with open("README.md", "r") as fh:
+if __name__ == "__main__":
-    long_description = fh.read()
+    setup()
-
-setuptools.setup(
-    name="lmwsip", # Replace with your own username
-    version="0.9.0",
-    author="Marcel Nijenhof",
-    author_email="pip@marceln.org",
-    description="Interface for the lmw sip protocol",
-    long_description=long_description,
-    long_description_content_type="text/markdown",
-    url="https://marceln.org/git/Werk/lmwsip",
-    packages=setuptools.find_packages(),
-    install_requires=[
-      'python-dateutil'
-    ],
-    classifiers=[
-        "Programming Language :: Python :: 3",
-        "License :: OSI Approved :: MIT License",
-        "Operating System :: OS Independent",
-        "Topic :: Lmw sip interface" 
-    ],
-    python_requires='>=3.6',
-)

src/lmwsip/__init__.py

@@ -12,7 +12,7 @@ from datetime import datetime, timedelta
 from dateutil import tz
 
 """ Version info changed by git hook """
-__version__ = '0.9.0'
+__version__ = '0.9.6'
 
 class LmwSip:
     """Class to connect to the LMW Standard Interface prototcol (sip)
@@ -489,7 +489,12 @@ Support for:
         'xH60': ('WN', 1, 60),
         'xNI60': ('WN', 1, 60),
         'xQ60': ('WN', 1, 60),
-        'xH60R': ('WN', 1, 60)
+        'xH60R': ('WN', 1, 60),
+        'QfQStt10': ('WN', 1, 10),
+        'QfQTr10': ('WN', 1, 10),
+        'QfQSt10': ('WN', 1, 10),
+        'QfHYS10': ('WN', 1, 10),
+        'QfQSy10': ('WN', 1, 10)
     }
 
     def __init__(self, user=None, password=None,
@@ -668,9 +673,9 @@ recieve a answer from the sip server
                 if (len(bytebuf) == 0):
                     c+=1
                     self.log.debug("recv: bytebuf: %s" % bytebuf)
-                    if self.cleartelnet:
+                if self.cleartelnet:
-                        if bytebuf[0] == 255:
+                    if bytebuf[0] == 255:
-                            bytebuf = b''
+                        bytebuf = b''
             except Exception as e:
                 self.log.error("SipLmw.recv: socket timeout: %s", e)
                 self.closesocket()

tests/main.py

@@ -4,10 +4,10 @@ import sys
 import io
 import unittest
 import lmwsip
-import lmwsip.tests.stubSipServer
+import stubSipServer
 import logging
 
-from lmwsip.tests.stubSipServer import sipServer
+from stubSipServer import sipServer
 from lmwsip.run import run
 from datetime import datetime, timedelta
 from dateutil import tz

tox.ini

@@ -0,0 +1,6 @@
+[tox]
+envlist = py36,py37,py38,py310
+
+[testenv]
+deps = python-dateutil
+commands = python tests/main.py