sync with cookiecutter

manuphatak · Dec 6, 2015 · 0c3400f · 0c3400f
1 parent 3926b52
commit 0c3400f
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 12 deletions.
diff --git a/.gitignore b/.gitignore
@@ -65,8 +65,6 @@ target/
 # pip wheels
 wheelhouse/
 
-# TODO remove
-.old/
-
 # Travis deploy key script
 travis_pypi_setup.py
+rst_to_markdown.py
diff --git a/.travis.yml b/.travis.yml
@@ -39,4 +39,4 @@ deploy:
   on:
     tags: true
     repo: bionikspoon/Hangman
-    condition: $TOXENV == py35
+    condition: $TOXENV == py34
diff --git a/Makefile b/Makefile
@@ -53,8 +53,8 @@ clean-test:
 	rm -fr htmlcov/
 
 clean-docs:
-	rm -f $(DOCSBUILDDIR)/lanyrd.rst
-	rm -f $(DOCSBUILDDIR)/modules.rst
+	rm -f $(DOCSSOURCEDIR)/lanyrd.rst
+	rm -f $(DOCSSOURCEDIR)/modules.rst
 	$(MAKE) -C docs clean
 
 lint:
@@ -98,8 +98,8 @@ register:
 
 requirements:
 	pip install --quiet pip-tools
-	pip-compile requirements_dev.in > /dev/null
 	pip-compile requirements.in > /dev/null
+	pip-compile requirements_dev.in > /dev/null
 	pip-sync requirements_dev.txt > /dev/null
 	pip install --quiet -r requirements.txt
 	pip wheel --quiet -r requirements.txt

diff --git a/requirements.in b/requirements.in
@@ -1,6 +1,2 @@
 click
 future
-pytest
-wheel
-mock
-coverage
diff --git a/setup.cfg b/setup.cfg
@@ -10,4 +10,3 @@ tag_name = {new_version}
 
 [wheel]
 universal = 1
-
diff --git a/tests/__init__.py b/tests/__init__.py
@@ -0,0 +1 @@
+# coding=utf-8