From 670a1f3d6b56e3c42fced59cfb2c61bac7606d8e Mon Sep 17 00:00:00 2001 From: zhenyu-ms <111329301+zhenyu-ms@users.noreply.github.com> Date: Fri, 6 Dec 2024 14:47:12 +0800 Subject: [PATCH] misc --- .github/actions/pip-cache/action.yml | 4 +- doc/en/getting_started.rst | 8 ++-- pyproject.toml | 3 -- pytest.ini | 12 ++--- requirements-basic.txt | 44 ------------------- requirements-rtd.txt | 5 --- .../testing/multitest/driver/http/client.py | 2 +- .../testing/multitest/driver/http/server.py | 2 +- tests/unit/testplan/test_parser.py | 3 -- 9 files changed, 15 insertions(+), 68 deletions(-) delete mode 100644 requirements-basic.txt delete mode 100644 requirements-rtd.txt diff --git a/.github/actions/pip-cache/action.yml b/.github/actions/pip-cache/action.yml index b85cd5b28..82c99dad2 100644 --- a/.github/actions/pip-cache/action.yml +++ b/.github/actions/pip-cache/action.yml @@ -6,5 +6,5 @@ runs: - name: Restore Pip Cache uses: actions/cache@v4 with: - path: ~/.cache/pip - key: ${{ hashFiles('setup.py') }}-${{ hashFiles('requirements.txt') }} + path: ${{ runner.os == 'Linux' && '~/.cache/pip' || '~\AppData\Local\pip\Cache' }} + key: ${{ runner.os }}-${{ hashFiles('pyproject.toml') }} diff --git a/doc/en/getting_started.rst b/doc/en/getting_started.rst index 5dba3c891..3a9bcc957 100644 --- a/doc/en/getting_started.rst +++ b/doc/en/getting_started.rst @@ -76,7 +76,7 @@ Also find all our downloadable examples :ref:`here `. Working with the source ----------------------- - + You will need a working python 3.7+ interrpreter preferably a venv, and for the interactive ui you need node installed. We are using `doit `_ as the taskrunner ``doit list`` can show all the commands. @@ -85,10 +85,10 @@ We are using `doit `_ as the taskrunner ``doit git clone https://github.com/morganstanley/testplan.git cd testplan - # install all dev requirements - pip install -r requirements-txt # this install testplan in editable mode + # install testplan in editable mode & all dev requirements + pip install -e . - #build the interactive UI (if you do not like it is opening a browserwindow remove the `-o`) + # build the interactive UI (if you do not like it is opening a browserwindow remove the `-o`) doit build_ui -o Internal tests diff --git a/pyproject.toml b/pyproject.toml index 5e179d852..90309e991 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -34,12 +34,9 @@ "setuptools", "pytest", "pytest-mock", - "py", "psutil", "schema", - "pytz", "lxml", - "python-dateutil", "reportlab", "marshmallow", "termcolor", diff --git a/pytest.ini b/pytest.ini index 328b7dd2e..8c10f8750 100644 --- a/pytest.ini +++ b/pytest.ini @@ -1,10 +1,12 @@ [pytest] filterwarnings = ignore::pytest.PytestWarning - ignore::DeprecationWarning:flask_restx.*: - ignore::DeprecationWarning:jinja2.*: - ignore::DeprecationWarning:jsonschema.*: - ignore::DeprecationWarning:marshmallow.*: - ignore::DeprecationWarning:werkzeug.*: + ignore:.*flask_restx.*:DeprecationWarning + ; jsonschema warning from flask_restx + ignore:.*jsonschema.*:DeprecationWarning + ignore:.*load_module.*:DeprecationWarning + ignore:.*LogMatcher.*:UserWarning + ; under most cases, included files are not hit + ignore:No data was collected:coverage.exceptions.CoverageWarning norecursedirs=tests/helpers diff --git a/requirements-basic.txt b/requirements-basic.txt deleted file mode 100644 index 9e0760a14..000000000 --- a/requirements-basic.txt +++ /dev/null @@ -1,44 +0,0 @@ -pytest -py -psutil>=5.6.7 -setuptools -schema -pytz -lxml -python-dateutil -reportlab -marshmallow -termcolor -colorama -pyzmq -terminaltables -requests>=2.4.3 -flask>2.0.0 -werkzeug>2.0.0 -flask_restx -cheroot -boltons -validators<=0.20.0 -Pillow -plotly -rpyc -coverage -memoization -typing_extensions -click>=8.1.0 - -# Documentation -# --------------- -# sphinx -# sphinx_rtd_theme -# sphinx-click - -# matplot assertion -# ----------------- -matplotlib -numpy - -# Data science -# ------------ -# scikit-learn -# scipy diff --git a/requirements-rtd.txt b/requirements-rtd.txt deleted file mode 100644 index 941be7a12..000000000 --- a/requirements-rtd.txt +++ /dev/null @@ -1,5 +0,0 @@ -docutils<0.18 -Jinja2<3.1.0 -sphinx<2 --r ./requirements.txt -./releaseherald \ No newline at end of file diff --git a/testplan/testing/multitest/driver/http/client.py b/testplan/testing/multitest/driver/http/client.py index be6c9b243..31053b2c5 100644 --- a/testplan/testing/multitest/driver/http/client.py +++ b/testplan/testing/multitest/driver/http/client.py @@ -195,7 +195,7 @@ def send(self, method, api, **kwargs): args=(method, api, drop_response, self.timeout), kwargs=kwargs, ) - request_thread.setDaemon(True) + request_thread.daemon = True request_thread.start() self.request_threads.append((request_thread, drop_response)) diff --git a/testplan/testing/multitest/driver/http/server.py b/testplan/testing/multitest/driver/http/server.py index e8eb2096b..0757f0c25 100644 --- a/testplan/testing/multitest/driver/http/server.py +++ b/testplan/testing/multitest/driver/http/server.py @@ -454,7 +454,7 @@ def starting(self): timeout=self.timeout, logger=self.logger, ) - self._server_thread.setName(self.name) + self._server_thread.name = self.name self._server_thread.start() while not hasattr(self._server_thread.server, "server_port"): diff --git a/tests/unit/testplan/test_parser.py b/tests/unit/testplan/test_parser.py index 1222287c8..b387ba1b7 100644 --- a/tests/unit/testplan/test_parser.py +++ b/tests/unit/testplan/test_parser.py @@ -1,7 +1,4 @@ -from jsonschema.cli import parse_args - from testplan import TestplanMock -from testplan.parser import TestplanParser from testplan.testing.listing import SimpleJsonLister, NameLister