fix CI (#164)

dixudx · Jul 24, 2022 · 47e7500 · 47e7500
1 parent eafb31c
commit 47e7500
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 16 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -31,7 +31,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        os: [ubuntu-latest, macos-latest]
         python-version: ["3.5", "3.6", "3.7", "3.8", "3.9", "3.10"]
     steps:
       - uses: actions/checkout@v3
@@ -48,4 +48,5 @@ jobs:
         run: |
           tox -e flake
       - name: Test with pytest
-        run: tox -e test
+        run: |
+          tox -e test
diff --git a/README.rst b/README.rst
@@ -128,6 +128,6 @@ the tests using pytest_ with the following command:
 
     virtualenv
     source .venv/bin/active
-    (venv) tox -e py27
-    (venv) tox -e py35
+    (venv) tox -e test
+    (venv) tox -e flake
     (venv) tox -e pycodestyle
diff --git a/requirements.txt b/requirements.txt
@@ -2,5 +2,5 @@ PySocks>=1.5.6
 jinja2>=2.2
 requests>=2.10.0
 six
-xmltodict
+xmltodict<=0.12.0
 lxml
diff --git a/setup.cfg b/setup.cfg
@@ -1,7 +1,7 @@
 [metadata]
 name = rtcclient
 author = Di Xu
-version = 0.8.1
+version = 0.8.2
 author_email = stephenhsu90@gmail.com
 summary = RTCClient for Rational Team Concert
 description_file = README.rst

diff --git a/tox.ini b/tox.ini
@@ -1,20 +1,18 @@
 [tox]
 minversion = 3.18
-envlist = py35,py36,py37,py38,py39,py310,pycodestyle
+envlist = test,pycodestyle,flake
 skipsdist = True
 
-[testenv]
+[testenv:test]
+description = Invoke pytest to run automated tests
 install_command = pip install -U {opts} {packages}
+sitepackages = True
 setenv =
-  VIRTUAL_ENV={envdir}
-  CLIENT_NAME=pbr
+  TOXINIDIR = {toxinidir}
+  VIRTUAL_ENV = {envdir}
 deps = .
-     -r{toxinidir}/test-requirements.txt
-commands = pytest -v {posargs}
-
-[testenv:test]
-description = Run tests with pytest.
-commands = 
+    -r{toxinidir}/test-requirements.txt
+commands =
     pytest -v {posargs}
 
 [testenv:pycodestyle]