Merge pull request #113 from RedisLabsModules/ck-poetry

Author: chayim

.github/workflows/ci.yml

@@ -13,8 +13,8 @@ jobs:
     timeout-minutes: 10
     strategy:
       matrix:
-        platform: [ubuntu-18.04, ubuntu-16.04]
-        python: ['2.7', '3.6', '3.8' ]
+        platform: ['ubuntu-20.04', 'ubuntu-18.04', 'ubuntu-16.04']
+        python: ['3.6', '3.7', '3.8' '3.9']
 
     steps:
     - uses: actions/checkout@v2
@@ -44,9 +44,9 @@ jobs:
 
     - name: Install Python dependencies
       run: |
-        sudo apt-get install -y python-setuptools
-        sudo apt-get install -y python3-setuptools
-        pip install -r requirements.txt
+        sudo apt-get install -y python-setuptools python3-setuptools
+        pip install poetry
+        poetry install
 
     - name: Cache Redis
       id: cache-redis
@@ -72,7 +72,6 @@ jobs:
     - name: Unit Test with pytest
       timeout-minutes: 5
       run: |
-        pip install pytest
         TLS_CERT=./redis/tests/tls/redis.crt \
         TLS_KEY=./redis/tests/tls/redis.key \
         TLS_CACERT=./redis/tests/tls/ca.crt \
@@ -185,8 +184,6 @@ jobs:
     - name: Generate coverage report
       if: matrix.platform == 'ubuntu-18.04' && matrix.python == '3.6'
       run: |
-        pip install pytest
-        pip install pytest-cov
         TLS_CERT=./redis/tests/tls/redis.crt \
         TLS_KEY=./redis/tests/tls/redis.key \
         TLS_CACERT=./redis/tests/tls/ca.crt \

.github/workflows/publish-pypi.yml

@@ -1,50 +1,43 @@
 name: Publish Pypi
 on:
   release:
-    types: [published]
+    types: [ published ]
 
 jobs:
-  publish:
-    name: publish
+  pytest:
+    name: Publish to PyPi
     runs-on: ubuntu-latest
+    env:
+      ACTIONS_ALLOW_UNSECURE_COMMANDS: true
     steps:
       - uses: actions/checkout@master
-      - name: Set up Python 2.7
+      - name: Set up Python 3.7
         uses: actions/setup-python@v1
         with:
-          python-version: 2.7
+          python-version: 3.7
 
-      - name: Install twine
-        run: |
-            pip install twine
-
-      - name: Install wheel
-        run: |
-            pip install wheel
-
-      - name: Create a source distribution
-        run: |
-          python setup.py sdist
+      - name: Install Poetry
+        uses: dschep/[email protected]
 
-      - name: Create a wheel
-        run: |
-            python setup.py bdist_wheel
+      - name: Cache Poetry virtualenv
+        uses: actions/cache@v1
+        id: cache
+        with:
+          path: ~/.virtualenvs
+          key: poetry-${{ hashFiles('**/poetry.lock') }}
+          restore-keys: |
+            poetry-${{ hashFiles('**/poetry.lock') }}
 
-      - name: Create a .pypirc
+      - name: Set Poetry config
         run: |
-            echo -e "[pypi]" >> ~/.pypirc
-            echo -e "username = __token__" >> ~/.pypirc
-            echo -e "password = ${{ secrets.PYPI_TOKEN }}" >> ~/.pypirc
-            echo -e "[testpypi]" >> ~/.pypirc
-            echo -e "username = __token__" >> ~/.pypirc
-            echo -e "password = ${{ secrets.TESTPYPI_TOKEN }}" >> ~/.pypirc
+          poetry config virtualenvs.in-project false
+          poetry config virtualenvs.path ~/.virtualenvs
 
-      - name: Publish to Test PyPI
-        if: github.event_name == 'release'
-        run: |
-          twine upload --skip-existing -r testpypi dist/*
+      - name: Install Dependencies
+        run: poetry install
+        if: steps.cache.outputs.cache-hit != 'true'
 
       - name: Publish to PyPI
         if: github.event_name == 'release'
         run: |
-          twine upload -r pypi dist/*
+          poetry publish -u __token__ -p ${{ secrets.PYPI_TOKEN }} --build

.gitignore

@@ -108,4 +108,7 @@ venv.bak/
 .mypy_cache/
 
 # Covers JetBrains PyCharm
-.idea
+.idea
+
+# vscode
+.vscode

RLTest/_version.py

@@ -1,4 +1,8 @@
 
 # This attribute is the only one place that the version number is written down,
 # so there is only one place to change it when the version number changes.
-__version__ = "0.3.1"
+import pkg_resources
+try:
+    __version__ = pkg_resources.get_distribution('RLTest').version
+except (pkg_resources.DistributionNotFound, AttributeError):
+    __version__ = "99.99.99"  # like redis modules

pyproject.toml

@@ -0,0 +1,55 @@
+[tool.poetry]
+name = "RLTest"
+version = "0.4"
+description="Redis Labs Test Framework, allow to run tests on redis and modules on a variety of environments"
+authors = ["RedisLabs <[email protected]>"]
+license = "BSD-3-Clause"
+readme = "README.md"
+
+packages = [
+    { include = 'RLTest' },
+]
+
+classifiers = [
+    'Topic :: Database',
+    'Programming Language :: Python',
+    'Intended Audience :: Developers',
+    'Programming Language :: Python :: 3.6',
+    'Programming Language :: Python :: 3.7',
+    'Programming Language :: Python :: 3.8',
+    'Programming Language :: Python :: 3.9',
+    'License :: OSI Approved :: BSD License',
+    'Development Status :: 5 - Production/Stable'
+]
+
+[tool.poetry.dependencies]
+python = "^3.6"
+redis = ">=3.0.0"
+redis-py-cluster = ">=2.1.0"
+distro = ">=1.4.0"
+psutil = "^3.0.0"
+
+[tool.poetry.dev-dependencies]
+codecov = "^2.1.11"
+flake8 = "^3.9.2"
+rmtest = "^0.7.0"
+nose = "^1.3.7"
+ml2rt = "^0.2.0"
+tox = ">=3.23.1"
+tox-poetry = "^0.3.0"
+bandit = "^1.7.0"
+pylint = "^2.8.2"
+vulture = "^2.3"
+pytest = "^6.2.4"
+pytest-cov = "^2.12.0"
+
+[tool.poetry.urls]
+repository = "https://github.com/RedisLabsModules/RLTest"
+
+[tool.poetry.scripts]
+RLTest = 'RLTest.__main__:main'
+
+
+[build-system]
+requires = ["poetry-core>=1.0.0"]
+build-backend = "poetry.core.masonry.api"