Merge pull request #21 from pytroll/python3-support

Python3 support
pytroll · Dec 4, 2018 · 84c055a · 84c055a
2 parents 361f155 + 1d0b02c
commit 84c055a
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 48 deletions.
diff --git a/setup.py b/setup.py
@@ -31,51 +31,34 @@
 
 requires = ["bitstring", "six"]
 
-if sys.version_info >= (3, 0):
-    setup(name="trollbufr",
-          version=version.version,
-          description="Reading meteorological data format BUFR in pure Python",
-          author="Alexander Maul",
-          author_email="alexander.maul@dwd.de",
-          classifiers=["Development Status :: 4 - Beta",
-                       "Intended Audience :: Science/Research",
-                       "License :: OSI Approved :: GNU Lesser General Public License v3 " +
-                       "or later (LGPLv3+)",
-                       "Operating System :: OS Independent",
-                       "Programming Language :: Python :: 3",
-                       "Programming Language :: Python :: 3.4",
-                       "Topic :: Scientific/Engineering"
-                       ],
-          test_suite="bufr.tests.suite",
-          entry_points={
-              "console_scripts": ["trollbufr3 = trollbufr.bufr_main:run",
-                                  "trollbufr3_update = trollbufr.update:run"]},
-          packages=["trollbufr", "trollbufr.coder"],
-          install_requires=requires,
-          python_requires=">=3.4",
-          zip_safe=False,
-          )
+if sys.version_info < (3, 0):
+    scripts_with_python_version = ["trollbufr = trollbufr.bufr_main:run",
+                                   "trollbufr_update = trollbufr.update:run"]
 else:
-    setup(name="trollbufr",
-          version=version.version,
-          description="Reading meteorological data format BUFR in pure Python",
-          author="Alexander Maul",
-          author_email="alexander.maul@dwd.de",
-          classifiers=["Development Status :: 4 - Beta",
-                       "Intended Audience :: Science/Research",
-                       "License :: OSI Approved :: GNU Lesser General Public License v3 " +
-                       "or later (LGPLv3+)",
-                       "Operating System :: OS Independent",
-                       "Programming Language :: Python :: 2",
-                       "Programming Language :: Python :: 2.6",
-                       "Topic :: Scientific/Engineering"
-                       ],
-          test_suite="bufr.tests.suite",
-          entry_points={
-              "console_scripts": ["trollbufr = trollbufr.bufr_main:run",
-                                  "trollbufr_update = trollbufr.update:run"]},
-          packages=["trollbufr", "trollbufr.coder"],
-          install_requires=requires,
-          python_requires=">=2.6, <3",
-          zip_safe=False,
-          )
+    scripts_with_python_version = ["trollbufr3 = trollbufr.bufr_main:run",
+                                   "trollbufr3_update = trollbufr.update:run"]
+
+setup(name="trollbufr",
+      version=version.version,
+      description="Reading meteorological data format BUFR in pure Python",
+      author="Alexander Maul",
+      author_email="alexander.maul@dwd.de",
+      classifiers=["Development Status :: 4 - Beta",
+                   "Intended Audience :: Science/Research",
+                   "License :: OSI Approved :: GNU Lesser General Public License v3 " +
+                   "or later (LGPLv3+)",
+                   "Operating System :: OS Independent",
+                   "Programming Language :: Python :: 2",
+                   "Programming Language :: Python :: 2.6",
+                   "Programming Language :: Python :: 3",
+                   "Programming Language :: Python :: 3.4",
+                   "Topic :: Scientific/Engineering"
+                   ],
+      test_suite="bufr.tests.suite",
+      entry_points={
+          "console_scripts": scripts_with_python_version},
+      packages=["trollbufr", "trollbufr.coder"],
+      install_requires=requires,
+      python_requires=">=2.6",
+      zip_safe=False,
+      )
diff --git a/trollbufr/version.py b/trollbufr/version.py
@@ -26,6 +26,6 @@
 
 __major__ = "0"
 __minor__ = "10"
-__patch__ = "1"
+__patch__ = "2"
 
 version = ".".join([__major__, __minor__, __patch__])