Skip to content

Python 3.11 support #184

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 5 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 26 additions & 22 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ jobs:
strategy:
matrix:
platform: ['ubuntu-20.04']
python: ['3.6', '3.7', '3.8', '3.9']
python: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11']

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
# Number of commits to fetch. 0 indicates all history for all branches and tags.
with:
fetch-depth: ''
Expand All @@ -29,19 +29,9 @@ jobs:
sudo apt-get install -y libssl-dev

- name: Setup Python
uses: actions/setup-python@v1
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python }}
architecture: x64

- name: Cache pip
uses: actions/cache@v1
with:
path: ~/.cache/pip # This path is specific to Ubuntu
# Look to see if there is a cache hit for the corresponding requirements file
key: ${{ matrix.platform }}-${{ matrix.python }}-pyproject.toml-${{ hashFiles('pyproject.toml') }}
restore-keys: |
${{ matrix.platform }}-${{ matrix.python }}-pyproject.toml-${{hashFiles('pyproject.toml')}}}
python-version: '${{ matrix.python }}'

- name: Install Python dependencies
run: |
Expand All @@ -51,14 +41,28 @@ jobs:
poetry export --dev --without-hashes -o requirements-${{matrix.platform}}-${{matrix.python}}.txt
pip install -r requirements-${{matrix.platform}}-${{matrix.python}}.txt

# - name: Cache Redis
# id: cache-redis
# uses: actions/cache@v1
# with:
# path: redis
# key: ${{ matrix.platform }}-${{ matrix.python }}-redis
# restore-keys: |
# ${{ matrix.platform }}-${{ matrix.python }}-redis
- name: Cache pyton
id: cache-pythonbits
uses: actions/cache@v3
with:
path: |
~/.cache/pip
~/.cache/poetry
~/Library/Caches/pip
~/Library/Caches/poetry
key: ${{ matrix.platform }}-${{ matrix.python }}-${{hashFiles('**/requirements.txt')}}-python
restore-keys: |
${{ matrix.platform }}-${{ matrix.python }}-${{hashFiles('**/requirements.txt')}}-python


- name: Cache Redis
id: cache-redis
uses: actions/cache@v3
with:
path: redis
key: ${{ matrix.platform }}-${{ matrix.python }}-redis
restore-keys: |
${{ matrix.platform }}-${{ matrix.python }}-redis

- name: Install Redis Server test dependencies
# if: steps.cache-redis.outputs.cache-hit != 'true'
Expand Down
2 changes: 1 addition & 1 deletion RLTest/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -573,7 +573,7 @@ def _runTest(self, test, numberOfAssertionFailed=0, prefix='', before=None, afte
if not test.is_method:
Defaults.curr_test_name = testFullName

if len(inspect.getargspec(test.target).args) > 0 and not test.is_method:
if len(inspect.getfullargspec(test.target).args) > 0 and not test.is_method:
try:
env = Env(testName=test.name)
except Exception as e:
Expand Down
11 changes: 5 additions & 6 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "RLTest"
version = "0.5.9"
version = "0.6.0"
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"
Expand All @@ -19,16 +19,16 @@ classifiers = [
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
'Programming Language :: Python :: 3.11',
'License :: OSI Approved :: BSD License',
'Development Status :: 5 - Production/Stable'
]

[tool.poetry.dependencies]
python = ">= 3.6.0"
distro = "^1.5.0"
redis = "^4.2.2"
psutil = "5.8.0" # 5.9.0 currently broken on macOS
pytest-cov = "2.5"
redis = ">=4.3.4"
psutil = ">=5.9.4"

[tool.poetry.urls]
repository = "https://github.com/RedisLabsModules/RLTest"
Expand All @@ -39,10 +39,9 @@ RLTest = 'RLTest.__main__:main'
[tool.poetry.dev-dependencies]
codecov = "*"
flake8 = "*"
rmtest = "^0.7.0"
nose = "^1.3.7"
ml2rt = "^0.2.0"
pytest = "^6.0"
pytest-cov = "^2.5"

[build-system]
requires = ["poetry-core>=1.0.0"]
Expand Down