Skip to content

Commit

Permalink
Remove pytest-runner, Update docs to use pytest directly, remove unus…
Browse files Browse the repository at this point in the history
…ed scripts (#86)

* Remove pytest-runner, Update docs to use pytest directly, remove unused scripts

* use pytest directly on travis

* Install pytest on appveyor
  • Loading branch information
ksunden committed Feb 29, 2020
1 parent b0dcb3c commit f4455cc
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 59 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ install:
- pip install -U pytest "coverage<5"
services:
- xvfb
script: python setup.py test
script: pytest
deploy:
provider: pypi
user: __token__
Expand All @@ -25,4 +25,4 @@ deploy:
on:
tags: true
distributions: "sdist bdist_wheel"
skip_existing: true
skip_existing: true
3 changes: 2 additions & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@ init:

install:
- "%PYTHON%\\Scripts\\pip3 install -e ."
- "%PYTHON%\\Scripts\\pip3 install pytest pytest-cov"

build: false # Not a C# project, build stuff at the test step instead.

test_script:
- "%PYTHON%/python setup.py test"
- "%PYTHON%/python -m pytest"
4 changes: 2 additions & 2 deletions docs/contributing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Preparing

.. code-block:: bash
$ python setup.py test
$ pytest
Contributing
Expand All @@ -49,7 +49,7 @@ Contributing

.. code-block:: bash
$ python setup.py test
$ pytest
#. make your changes, commiting often

Expand Down
21 changes: 0 additions & 21 deletions scripts/checklists.org

This file was deleted.

31 changes: 0 additions & 31 deletions scripts/upload.sh

This file was deleted.

2 changes: 0 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@ def read(fname):
packages=find_packages(exclude=("tests", "tests.*")),
package_data=extra_files,
python_requires=">=3.5",
setup_requires=["pytest-runner"],
tests_require=["pytest", "pytest-cov"],
install_requires=["WrightTools>=3.2.5", "numpy", "scipy", "matplotlib", "tidy_headers"],
extras_require={
"dev": ["black", "pre-commit"],
Expand Down

0 comments on commit f4455cc

Please sign in to comment.