summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaulo Henrique Silva <ph.silva@gmail.com>2019-11-25 15:38:43 -0300
committerGitHub <noreply@github.com>2019-11-25 15:38:43 -0300
commit2830fd268dbcdc52fdf67221a00e3a72cb4e9cb9 (patch)
tree1c4cae8995ef7ee767f53c649158ec3ab7411cf9
parent2e32abef6ad46e5604cbd6f6086d857b8bc4f7be (diff)
parent2b6ea5ead81ac069452d73e00f3b19d4325611d0 (diff)
downloadgerbonara-2830fd268dbcdc52fdf67221a00e3a72cb4e9cb9.tar.gz
gerbonara-2830fd268dbcdc52fdf67221a00e3a72cb4e9cb9.tar.bz2
gerbonara-2830fd268dbcdc52fdf67221a00e3a72cb4e9cb9.zip
Merge pull request #106 from curtacircuitos/ph-upgrade-requirements
Upgrade nose and coverage
-rw-r--r--.travis.yml3
-rw-r--r--README.md4
-rw-r--r--doc-requirements.txt4
-rw-r--r--requirements-dev.txt5
-rw-r--r--requirements-docs.txt6
-rw-r--r--requirements.txt2
-rw-r--r--test-requirements.txt4
7 files changed, 15 insertions, 13 deletions
diff --git a/.travis.yml b/.travis.yml
index 7525487..d4c40c8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,8 +8,7 @@ python:
# command to install dependencies
install:
- - "pip install -r requirements.txt"
- - "pip install -r test-requirements.txt"
+ - "pip install -r requirements-dev.txt"
- "pip install coveralls"
# command to run tests
diff --git a/README.md b/README.md
index f741f80..42c90f4 100644
--- a/README.md
+++ b/README.md
@@ -48,11 +48,11 @@ Documentation:
Development and Testing:
------------------------
-Dependencies for developing and testing pcb-tools are listed in test-requirements.txt. Use of a virtual environment is strongly recommended.
+Dependencies for developing and testing pcb-tools are listed in requirements-dev.txt. Use of a virtual environment is strongly recommended.
$ virtualenv venv
$ source venv/bin/activate
- (venv)$ pip install -r test-requirements.txt
+ (venv)$ pip install -r requirements-dev.txt
(venv)$ pip install -e .
We use nose to run pcb-tools's suite of unittests and doctests.
diff --git a/doc-requirements.txt b/doc-requirements.txt
deleted file mode 100644
index a163c9b..0000000
--- a/doc-requirements.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-# Doc requirements
-Sphinx==1.2.3
-numpydoc==0.5
-
diff --git a/requirements-dev.txt b/requirements-dev.txt
new file mode 100644
index 0000000..c1e695d
--- /dev/null
+++ b/requirements-dev.txt
@@ -0,0 +1,5 @@
+# install base requirements
+-r requirements.txt
+
+coverage==4.5.4
+nose==1.3.7
diff --git a/requirements-docs.txt b/requirements-docs.txt
new file mode 100644
index 0000000..a2cc5a1
--- /dev/null
+++ b/requirements-docs.txt
@@ -0,0 +1,6 @@
+# install base requirements
+-r requirements.txt
+
+# documentation generation support
+Sphinx==1.2.3
+numpydoc==0.5
diff --git a/requirements.txt b/requirements.txt
index a7f5f01..1f769f2 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1,2 @@
-## The following requirements were added by pip --freeze:
+# cairo rendering support
cairocffi==0.6
diff --git a/test-requirements.txt b/test-requirements.txt
deleted file mode 100644
index 826da33..0000000
--- a/test-requirements.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-# Test requirements
-cairocffi==0.6
-coverage==3.7.1
-nose==1.3.4