Merge from the template.

doorstop-dev · Mar 3, 2014 · 30ebd74 · 30ebd74
1 parent 08e1e68
commit 30ebd74
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 21 deletions.
diff --git a/.project b/.project
@@ -16,7 +16,7 @@
 	</natures>
 	<filteredResources>
 		<filter>
-			<id>1386361315223</id>
+			<id>0</id>
 			<name></name>
 			<type>26</type>
 			<matcher>
@@ -25,34 +25,34 @@
 			</matcher>
 		</filter>
 		<filter>
-			<id>1386361315243</id>
+			<id>0</id>
 			<name></name>
 			<type>26</type>
 			<matcher>
 				<id>org.eclipse.ui.ide.multiFilter</id>
-				<arguments>1.0-projectRelativePath-matches-false-false-env</arguments>
+				<arguments>1.0-name-matches-false-false-*.egg-info</arguments>
 			</matcher>
 		</filter>
 		<filter>
-			<id>1386361315263</id>
+			<id>0</id>
 			<name></name>
 			<type>26</type>
 			<matcher>
 				<id>org.eclipse.ui.ide.multiFilter</id>
-				<arguments>1.0-name-matches-false-false-*.egg-info</arguments>
+				<arguments>1.0-name-matches-false-false-env</arguments>
 			</matcher>
 		</filter>
 		<filter>
-			<id>1386361315278</id>
+			<id>0</id>
 			<name></name>
-			<type>26</type>
+			<type>22</type>
 			<matcher>
 				<id>org.eclipse.ui.ide.multiFilter</id>
-				<arguments>1.0-projectRelativePath-matches-false-false-dist</arguments>
+				<arguments>1.0-name-matches-false-false-README.rst</arguments>
 			</matcher>
 		</filter>
 		<filter>
-			<id>1386361315301</id>
+			<id>0</id>
 			<name></name>
 			<type>26</type>
 			<matcher>
@@ -61,21 +61,39 @@
 			</matcher>
 		</filter>
 		<filter>
-			<id>1386361315312</id>
+			<id>0</id>
+			<name></name>
+			<type>22</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-*.sublime-project</arguments>
+			</matcher>
+		</filter>
+		<filter>
+			<id>0</id>
+			<name></name>
+			<type>22</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-README*.html</arguments>
+			</matcher>
+		</filter>
+		<filter>
+			<id>0</id>
 			<name></name>
 			<type>26</type>
 			<matcher>
 				<id>org.eclipse.ui.ide.multiFilter</id>
-				<arguments>1.0-projectRelativePath-matches-false-false-build</arguments>
+				<arguments>1.0-name-matches-false-false-build</arguments>
 			</matcher>
 		</filter>
 		<filter>
-			<id>1386361315324</id>
+			<id>0</id>
 			<name></name>
 			<type>26</type>
 			<matcher>
 				<id>org.eclipse.ui.ide.multiFilter</id>
-				<arguments>1.0-projectRelativePath-matches-false-false-dist</arguments>
+				<arguments>1.0-name-matches-false-false-dist</arguments>
 			</matcher>
 		</filter>
 	</filteredResources>

diff --git a/.pydevproject b/.pydevproject
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?eclipse-pydev version="1.0"?>
-
-<pydev_project>
+<?eclipse-pydev version="1.0"?><pydev_project>
 <pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 3.0</pydev_property>
 <pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Doorstop</pydev_property>
+
+
 <pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
-<path>/Doorstop</path>
+<path>/${PROJECT_DIR_NAME}</path>
 </pydev_pathproperty>
 </pydev_project>
diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
-PROJECT := Doorstop
-PACKAGE := doorstop
+PROJECT := $(patsubst ./%.sublime-project,%, $(shell find . -type f -name '*.sublime-p*'))
+PACKAGE := $(patsubst ./%/__init__.py,%, $(shell find . -maxdepth 2 -name '__init__.py'))
 SOURCES := Makefile setup.py $(shell find $(PACKAGE) -name '*.py')
 
 ENV := env
@@ -122,10 +122,10 @@ pep8: env .depends-ci
 
 .PHONY: pep257
 pep257: env .depends-ci
-	$(PEP257) $(PACKAGE) --ignore=E501
+	$(PEP257) $(PACKAGE) --ignore=E501,D102
 
 .PHONY: pylint
-pylint: env .depends-ci
+pylint: env .depends-dev
 	$(PYLINT) $(PACKAGE) --reports no \
 	                     --msg-template="{msg_id}:{line:3d},{column}:{msg}" \
 	                     --max-line-length=79 \