diff --git a/.github/workflows/build-test.yaml b/.github/workflows/build-test.yaml index b4cbc258..ebb6cc9f 100644 --- a/.github/workflows/build-test.yaml +++ b/.github/workflows/build-test.yaml @@ -16,17 +16,14 @@ jobs: with: python-version: ${{ matrix.python-version }} - uses: actions/checkout@v3 - - name: Install dependencies + - name: Install osmesa run: | sudo apt-get update && sudo apt-get upgrade - sudo apt install libgl1-mesa-dri libegl1-mesa libgbm1 libosmesa6 libosmesa6-dev - python -m pip install --upgrade pip - python -m pip install pytest - if [ -f tests/test_requirements.txt ]; then python -m pip install -r tests/test_requirements.txt; fi - python -m pip install --upgrade numpy PyOpenGL_accelerate + sudo apt-get install libosmesa6-dev + - name: Upgrade pip + run: python -m pip install --upgrade pip - name: Setup yt_idv - run: | - python -m pip install -e . + run: python -m pip install -e .[test] - name: Run Tests env: PYOPENGL_PLATFORM: osmesa diff --git a/setup.cfg b/setup.cfg index 002876dc..6f170ee5 100644 --- a/setup.cfg +++ b/setup.cfg @@ -51,18 +51,12 @@ console_scripts = [options.extras_require] dev = Sphinx==1.8.5 - black==19.10b0 - bump2version==0.5.11 - coverage==4.5.4 - flake8==3.7.8 - isort==5.6.4 - pytest>=6.2.4 - pytest-html==3.1.1 - pytest-runner==5.1 - tox==3.14.0 twine==1.14.0 - watchdog==0.9.0 wheel==0.33.6 +test = + PyOpenGL-accelerate + pytest>=6.2.4 + pytest-html [bdist_wheel] universal = 1 diff --git a/tests/test_requirements.txt b/tests/test_requirements.txt deleted file mode 100644 index d0686ac7..00000000 --- a/tests/test_requirements.txt +++ /dev/null @@ -1,14 +0,0 @@ -pytest==6.1.2 -pytest-html==3.1.0 -yt>=4.1.0 -pyOpenGL==3.1.5 -Click==7.0 -traitlets>=5.0.5 -pyOpenGL==3.1.5 -traittypes>=0.2.1 -matplotlib>=3.0 -numpy>=1.18.0 -git+https://github.com/pyglet/pyglet.git#egg=pyglet -pyyaml>=5.3.1 -imgui>=1.2.0 -more_itertools>=8.6.0 diff --git a/tox.ini b/tox.ini deleted file mode 100644 index feb3f544..00000000 --- a/tox.ini +++ /dev/null @@ -1,20 +0,0 @@ -[tox] -envlist = py36, py37, py38, py39, flake8 - - -[testenv:flake8] -basepython = python -deps = flake8 -commands = flake8 yt_idv tests - -[testenv] -setenv = - PYTHONPATH = {toxinidir} -deps = - -r{toxinidir}/requirements_dev.txt -; If you want to make tox run the tests with the same versions, create a -; requirements.txt with the pinned versions and uncomment the following line: -; -r{toxinidir}/requirements.txt -commands = - pip install -U pip - pytest --basetemp={envtmpdir} diff --git a/tests/__init__.py b/yt_idv/tests/__init__.py similarity index 100% rename from tests/__init__.py rename to yt_idv/tests/__init__.py diff --git a/tests/test_yt_idv.py b/yt_idv/tests/test_yt_idv.py similarity index 100% rename from tests/test_yt_idv.py rename to yt_idv/tests/test_yt_idv.py