ODI-3720 Update version to 2.0.1

opsview · Sep 10, 2019 · db28724 · db28724
1 parent b6f6fed
commit db28724
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 15 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -3,7 +3,6 @@ exclude .coverage
 exclude .coveragerc
 exclude .travis.yml
 include VERSION
-include RELEASE
 include LICENSE
 include README.md
 include setup.cfg

diff --git a/Makefile b/Makefile
@@ -26,9 +26,6 @@ PROJECT=plugnpy
 # Project version
 VERSION=$(shell cat VERSION)
 
-# Project release number (packaging build number)
-RELEASE=$(shell cat RELEASE)
-
 # Name of RPM or DEB package
 PKGNAME=${VENDOR}-${PROJECT}
 
@@ -71,9 +68,7 @@ all: help
 # Set the version from VERSION file
 version:
 	sed -i "s/version:.*$$/version: $(VERSION)/" conda/meta.yaml
-	sed -i "s/number:.*$$/number: $(RELEASE)/" conda/meta.yaml
 	sed -i "s/__version__.*$$/__version__ = '$(VERSION)'/" plugnpy/__init__.py
-	sed -i "s/__release__.*$$/__release__ = '$(RELEASE)'/" plugnpy/__init__.py
 
 # Build minimal Conda environment
 conda:

diff --git a/README.md b/README.md
@@ -73,7 +73,7 @@ or
 make wheel
 ```
 
-This will create a `plugnpy-VERSION.RELEASE.tar.gz` file in the `dist` directory which can be installed in the same way as the prepackaged one above.
+This will create a `plugnpy-VERSION.tar.gz` file in the `dist` directory which can be installed in the same way as the prepackaged one above.
 
 
 ## Writing Checks

diff --git a/RELEASE b/RELEASE
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.0.0
+2.0.1
diff --git a/conda/meta.yaml b/conda/meta.yaml
@@ -1,6 +1,6 @@
 package:
   name: plugnpy
-  version: 2.0.0
+  version: 2.0.1
 
 source:
   path: ..

diff --git a/plugnpy/__init__.py b/plugnpy/__init__.py
@@ -1,7 +1,6 @@
 """plugnpy - A Simple Python Library for creating Opsview Opspack plugins"""
 
-__version__ = '2.0.0'
-__release__ = '1'
+__version__ = '2.0.1'
 __program_name__ = 'plugnpy'
 
 from .check import Check

diff --git a/setup.py b/setup.py
@@ -6,7 +6,6 @@
 from subprocess import call
 from setuptools import Command, find_packages, setup
 from plugnpy import __version__ as VERSION
-from plugnpy import __release__ as RELEASE
 
 
 def read(fname):
@@ -39,7 +38,7 @@ def run(self):
 
 setup(
     name='plugnpy',
-    version=VERSION + '.' + RELEASE,
+    version=VERSION,
     description='A Simple Python Library for creating Opsview Opspack plugins',
     long_description=read('README.md'),
     url='https://github.com/opsview/plugnpy',
@@ -57,7 +56,7 @@ def run(self):
     keywords='plugnpy',
     packages=['plugnpy'],
     data_files=[
-        ('info', ['VERSION', 'RELEASE', 'LICENSE', 'README.md'])
+        ('info', ['VERSION', 'LICENSE', 'README.md'])
     ],
     install_requires=[],
     extras_require={