RD-1601 py3 py2 agnostic

Author: IliaFeldgun

.gitignore

@@ -1,3 +1,8 @@
 *.pyc
 *.swp
 .idea
+__pycache__
+dist
+build
+*.egg-info
+*.stratolog

Dockerfile.pycommonlog-build

@@ -0,0 +1,8 @@
+FROM rackattack-nas.dc1:5000/ubuntu-dev-base:379308aa77bd0a19ebf12d868e7d19ee35a19d6c
+RUN apt-get install -y python2.7 python2.7-dev
+RUN curl 'https://bootstrap.pypa.io/pip/2.7/get-pip.py' | python2.7
+COPY requirements.txt /tmp/requirements.txt
+COPY dev-requirements.txt /tmp/dev-requirements.txt
+RUN python2.7 -m pip install -r /tmp/requirements.txt -r /tmp/dev-requirements.txt
+RUN python3 -m pip install -r /tmp/requirements.txt -r /tmp/dev-requirements.txt
+RUN rm /tmp/requirements.txt /tmp/dev-requirements.txt

Makefile

@@ -1,7 +1,28 @@
-all: test check_convention
+.PHONY: all test test_py2 test_py3 lint_py2 lint_py3 build
+all: lint test build
 
-test:
-	PYTHONPATH=$(PWD)/py python py/strato/common/log/tests/test.py
+test: test_py2 test_py3
 
-check_convention:
-	pep8 py --max-line-length=109
+test_py3:
+	PYTHONPATH=$(PWD)/py python3 py/strato/common/log/tests/test.py
+
+test_py2:
+	PYTHONPATH=$(PWD)/py python2.7 py/strato/common/log/tests/test.py
+
+lint: lint_py2 lint_py3
+
+lint_py3:
+	python3 -m pep8 py --max-line-length=120
+
+lint_py2:
+	python2.7 -m pep8 py --max-line-length=120
+
+build: dist/pycommonlog-*.tar.gz
+
+clean:
+	find . -name *.pyc -delete
+	find . -name __pycache__ -delete
+	rm -rf dist */*.egg-info build *.stratolog
+
+dist/pycommonlog-*.tar.gz:
+	python3 -m build --wheel

README.md

@@ -0,0 +1,25 @@
+# pycommonlog
+
+# Build
+```bash
+skipper make -i all
+```
+
+# Demo
+
+```python
+from strato.common.log import configurelogging
+configurelogging.configureLogging('test-strato-log', forceDirectory=".")
+import logging  # noqa: E402
+logging.warning('Running test')
+logging.error('Running test')
+logging.progress('Running test')
+logging.step('Running test')
+logging.critical('Running test')
+logging.success('Running test')
+logging.debug('Running test')
+try:
+    raise Exception('Test exception')
+except Exception:
+    logging.exception('Running test')
+```

artifacts.yaml

@@ -0,0 +1,2 @@
+pips:
+  - dist/strato_common_log-*-py2.py3-none-any.whl

dev-requirements.txt

@@ -0,0 +1,3 @@
+build
+pep8
+ipdb

js/main.py

@@ -1,12 +1,15 @@
 import shutil
 import argparse
 import os
-import subprocess
 import SimpleHTTPServer
 import SocketServer
 import socket
+try:
+    import subprocess32 as subprocess
+except ImportError:
+    import subprocess
 
-parser = argparse.ArgumentParser( description = 'Present summary of tests results in a webpage.' )
+parser = argparse.ArgumentParser(description='Present summary of tests results in a webpage.')
 parser.add_argument("--root", default="logs.racktest")
 parser.add_argument("--whiteboxRoot", action="store_true")
 parser.add_argument("--noBrowser", help="avoid openning the browser", action="store_true")

py/strato/__init__.py

@@ -1,2 +0,0 @@
-import upseto.pythonnamespacejoin
-__path__.extend(upseto.pythonnamespacejoin.join(globals()))

py/strato/common/__init__.py

@@ -1,2 +0,0 @@
-import upseto.pythonnamespacejoin
-__path__.extend(upseto.pythonnamespacejoin.join(globals()))

py/strato/common/log/config.py

@@ -39,4 +39,4 @@
     "incremental": True
 }
 
-exec os.environ.get("STRATO_CONFIG_LOGGING", "")
+exec(os.environ.get("STRATO_CONFIG_LOGGING", ""))