From 4b6ae68f7ec7af73d98a43e0b5231483e6df5545 Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Mon, 7 Mar 2016 19:20:17 +0200
Subject: [PATCH] - Renamed basic assertions test for readability, clarity. -
Didn't specify minor Python versions (just 2 and 3). - Removed test make
target, instead use tox. - The make clean target removes just
unshare/constants.py now. - Removed testing packages from dev dependencies
and the test dependency list, dev depends just on tox (the other packages
are install in the virtualenv). - Cleaned tox.ini a bit.
---
Makefile | 8 ++------
setup.py | 7 +++----
...asic_assertions.py => basic_assertions_test.py} | 0
tox.ini | 14 +++++++-------
4 files changed, 12 insertions(+), 17 deletions(-)
rename tests/{test_basic_assertions.py => basic_assertions_test.py} (100%)
diff --git a/Makefile b/Makefile
index 947ccd9..2546071 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-.PHONY: clean test all
+.PHONY: clean all
all: unshare/constants.py
@@ -10,8 +10,4 @@ unshare/constants.py:
awk '/#define MS_|#define CLONE_/ {print $$2, "=", $$3}' > unshare/constants.py
clean:
- rm -rf unshare/constants.py *.pyc __pycache__ unshare/*.pyc unshare/__pycache__
-
-test: clean all
- python test.py
- python3 test.py
+ rm -rf unshare/constants.py
diff --git a/setup.py b/setup.py
index 6bcfff5..bdec6da 100644
--- a/setup.py
+++ b/setup.py
@@ -13,8 +13,8 @@ setup(
classifiers=[
'Development status :: 3 - Alpha',
'Intended Audience :: Developers',
- 'Programming Language :: Python :: 3.5',
- 'Programming Language :: Python :: 2.7',
+ 'Programming Language :: Python :: 3',
+ 'Programming Language :: Python :: 2',
'Intended Audience :: System Administrators',
'Topic :: Utilities',
],
@@ -22,6 +22,5 @@ setup(
packages=find_packages(exclude=['tests']),
install_requires=[],
extras_require={
- 'dev': ['tox'],
- 'test': ['flake8', 'check-manifest', 'coverage', 'pytest']},
+ 'dev': ['tox']},
)
diff --git a/tests/test_basic_assertions.py b/tests/basic_assertions_test.py
similarity index 100%
rename from tests/test_basic_assertions.py
rename to tests/basic_assertions_test.py
diff --git a/tox.ini b/tox.ini
index 06479f0..bcfe232 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,19 +3,19 @@ ignore=F403
exclude = .tox,*.egg,build,data,unshare/constants.py
[tox]
-envlist = py{27,35}
+envlist = py{2,3}
[testenv]
basepython =
- py27: python2.7
- py35: python3.5
+ py2: python2
+ py3: python3
deps =
check-manifest
- {py27,py35}: readme_renderer
+ readme_renderer
flake8
+ pytest
commands =
check-manifest --ignore tox.ini,tests*
- # py26 doesn't have "setup.py check"
- {py27,py35}: python setup.py check -m -r -s
+ python setup.py check -m -r -s
flake8 .
- py.test tests
+ py.test
--
GitLab