Skip to content

Commit

Permalink
Remove tox, Travis CI and pep8.sh script
Browse files Browse the repository at this point in the history
Update dependencies
  • Loading branch information
grossmj committed Jun 26, 2020
1 parent 83c26f4 commit 9c58b26
Show file tree
Hide file tree
Showing 9 changed files with 10 additions and 95 deletions.
2 changes: 0 additions & 2 deletions .pyup.yml

This file was deleted.

21 changes: 0 additions & 21 deletions .travis.yml

This file was deleted.

22 changes: 0 additions & 22 deletions Dockerfile

This file was deleted.

1 change: 0 additions & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ include AUTHORS
include LICENSE
include MANIFEST.in
include requirements.txt
include tox.ini
recursive-include tests *
recursive-include gns3 *
recursive-include resources *
Expand Down
7 changes: 3 additions & 4 deletions dev-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
-rrequirements.txt

pep8==1.7.0
pytest==4.4.1
pytest-pythonpath==0.7.3 # useful for running tests outside tox
pytest-timeout==1.3.3
pytest==5.4.3
flake8==3.8.3
pytest-timeout==1.4.1
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
jsonschema==3.2.0
sentry-sdk>=0.14.4
psutil==5.6.7
psutil==5.7.0
distro>=1.3.0
19 changes: 0 additions & 19 deletions scripts/pep8.sh

This file was deleted.

12 changes: 6 additions & 6 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
raise SystemExit("Python 3.4 or higher is required")


class Tox(TestCommand):
class PyTest(TestCommand):

def finalize_options(self):
TestCommand.finalize_options(self)
Expand All @@ -33,10 +33,10 @@ def finalize_options(self):

def run_tests(self):
# import here, cause outside the eggs aren't loaded
import tox
errcode = tox.cmdline(self.test_args)
sys.exit(errcode)
import pytest

errcode = pytest.main(self.test_args)
sys.exit(errcode)

if sys.platform.startswith('linux'):
data_files = [
Expand All @@ -61,8 +61,8 @@ def run_tests(self):
version=__import__("gns3").__version__,
url="http://github.com/GNS3/gns3-gui",
license="GNU General Public License v3 (GPLv3)",
tests_require=["tox"],
cmdclass={"test": Tox},
tests_require=["pytest"],
cmdclass={"test": PyTest},
author="Jeremy Grossmann",
author_email="[email protected]",
description="GNS3 graphical interface for the GNS3 server.",
Expand Down
19 changes: 0 additions & 19 deletions tox.ini

This file was deleted.

0 comments on commit 9c58b26

Please sign in to comment.