Merge pull request #866 from deniszh/backport/1.1.x/pr-834_pr-853_pr-859

[1.1.x] set package long description | Remove pidfile on ValueError exception | Add testing for Python 3.8

Author: deniszh

.gitignore

@@ -14,3 +14,6 @@ storage
 _trial_temp
 htmlcov
 *.swp
+.eggs/
+*.egg-info/
+lib/twisted/plugins/dropin.cache

.travis.yml

@@ -3,34 +3,31 @@ language: python
 python: 2.7
 # sudo is needed to install libboost-python-dev, which is required by pyhash
 sudo: required
+dist: xenial
 
 matrix:
   include:
     - python: pypy
       env:
         - TOXENV=pypy
-    - python: 3.4
-      env:
-        - TOXENV=py34
     - python: 3.5
       env:
         - TOXENV=py35
     - python: 3.6
       env:
         - TOXENV=py36
     - python: 3.7
-      dist: xenial
       sudo: true
       env:
         - TOXENV=py37
-    - python: 3.7
-      dist: xenial
+    - python: "3.8-dev"
       sudo: true
       env:
-        - TOXENV=py37-pyhash
-    - python: 3.7
-      dist: xenial
-      sudo: true
+        - TOXENV=py38-pyhash
+    - python: "3.8-dev"
+      env:
+        - TOXENV=py38
+    - python: "3.8-dev"
       env:
         - TOXENV=lint
 

MANIFEST.in

@@ -2,5 +2,6 @@ recursive-include conf/ *
 recursive-include distro/ *
 exclude conf/*.conf
 include LICENSE
+include README.md
 include lib/carbon/amqp0-8.xml
 include MANIFEST.in

lib/carbon/conf.py

@@ -352,6 +352,12 @@ def handleAction(self):
                 pf.close()
             except ValueError:
                 print("Failed to parse pid from pidfile %s" % pidfile)
+                pf.close()
+                try:
+                    print("removing corrupted pidfile %s" % pidfile)
+                    os.unlink(pidfile)
+                except IOError:
+                    print("Could not remove pidfile %s" % pidfile)
                 raise SystemExit(1)
             except IOError:
                 print("Could not read pidfile %s" % pidfile)
@@ -377,6 +383,12 @@ def handleAction(self):
                 pf.close()
             except ValueError:
                 print("Failed to parse pid from pidfile %s" % pidfile)
+                pf.close()
+                try:
+                    print("removing corrupted pidfile %s" % pidfile)
+                    os.unlink(pidfile)
+                except IOError:
+                    print("Could not remove pidfile %s" % pidfile)
                 raise SystemExit(1)
             except IOError:
                 print("Failed to read pid from %s" % pidfile)
@@ -398,6 +410,12 @@ def handleAction(self):
                     pf.close()
                 except ValueError:
                     print("Failed to parse pid from pidfile %s" % pidfile)
+                    pf.close()
+                    try:
+                        print("removing corrupted pidfile %s" % pidfile)
+                        os.unlink(pidfile)
+                    except IOError:
+                        print("Could not remove pidfile %s" % pidfile)
                     raise SystemExit(1)
                 except IOError:
                     print("Could not read pidfile %s" % pidfile)

setup.py

@@ -72,6 +72,9 @@
                                       'distro/redhat/init.d/carbon-aggregator']) ]
 install_files += init_scripts
 
+def read(fname):
+    with open(os.path.join(os.path.dirname(__file__), fname)) as f:
+        return f.read()
 
 try:
     setup(
@@ -82,7 +85,8 @@
         author_email='chrismd@gmail.com',
         license='Apache Software License 2.0',
         description='Backend data caching and persistence daemon for Graphite',
-        long_description='Backend data caching and persistence daemon for Graphite',
+        long_description=read('README.md'),
+        long_description_content_type='text/markdown',
         packages=['carbon', 'carbon.aggregator', 'twisted.plugins'],
         package_dir={'' : 'lib'},
         scripts=glob('bin/*'),
@@ -97,10 +101,10 @@
             'Programming Language :: Python :: 2',
             'Programming Language :: Python :: 2.7',
             'Programming Language :: Python :: 3',
-            'Programming Language :: Python :: 3.4',
             'Programming Language :: Python :: 3.5',
             'Programming Language :: Python :: 3.6',
             'Programming Language :: Python :: 3.7',
+            'Programming Language :: Python :: 3.8',
             'Programming Language :: Python :: Implementation :: CPython',
             'Programming Language :: Python :: Implementation :: PyPy',
         ),

tox.ini

@@ -1,6 +1,6 @@
 [tox]
 envlist =
-  py{27,34,35,36,37,py}{,-pyhash},
+  py{27,35,36,37,38,py}{,-pyhash},
   lint,
   benchmark