update gitignore, setup + fix a unit test

sdpython · Feb 7, 2014 · 2a26a97 · 2a26a97
1 parent 09add10
commit 2a26a97
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -199,6 +199,7 @@ parts/
 var/
 sdist/
 develop-eggs/
+__pycache__/
 .installed.cfg
 
 # Installer logs
@@ -213,3 +214,13 @@ pip-log.txt
 
 #Mr Developer
 .mr.developer.cfg
+
+# py* packages
+temp_*
+out_*
+*/sphinxdoc/source/index_*
+*/sphinxdoc/source/readme.*
+*/sphinxdoc/source/LICENSE.*
+*/sphinxdoc/source/filechanges.*
+version.txt
+*/sphinxdoc/source/pyrrslocal/*
diff --git a/_unittests/ut_rss/test_rss.py b/_unittests/ut_rss/test_rss.py
@@ -32,7 +32,7 @@
 
 class TestRSS (unittest.TestCase):
 
-    nb_rss_blog = 210
+    nb_rss_blog = 211
 
     def test_rss_from_google (self) :
         fLOG (__file__, self._testMethodName, OutputPrint = __name__ == "__main__")

diff --git a/setup.py b/setup.py
@@ -46,7 +46,7 @@
 
 if os.path.exists("version.txt") :
     with open("version.txt", "r") as f : lines = f.readlines()
-    subversion = int(lines[0].strip("\r\n "))
+    subversion = lines[0].strip("\r\n ")
 else :
     subversion = 1   
 
@@ -118,7 +118,7 @@ def remove_existing_build_setup() :
 
 setup(
     name                    = project_var_name,
-    version                 = 'py%s-v%s.%d' % (versionPython, sversion, subversion),
+    version                 = 'py%s-v%s.%s' % (versionPython, sversion, subversion),
     author                  = 'Xavier Dupré',
     author_email            = 'xavier.dupre AT gmail.com',
     url                     = "http://www.xavierdupre.fr/app/pyrsslocal/helpsphinx/index.html",