Sync up Development Status for package

daviddrysdale · daviddrysdale · commit c15b41ab12d4 · 2013-11-13T19:11:19.000Z
diff --git a/python/setup.py b/python/setup.py
@@ -28,11 +28,6 @@
 python_25 = (major > 2 or (major == 2 and minor >= 5))
 if not python_25:
     raise RuntimeError("Python 2.5 or newer is required")
-python_3x = (major >= 3)
-if python_3x:
-    dev_status = 'Development Status :: 3 - Alpha'
-else:
-    dev_status = 'Development Status :: 4 - Beta'
 
 # Discover version of phonenumbers package
 from phonenumbers import __version__
@@ -48,7 +43,7 @@
                                'phonenumbers.carrierdata', 'phonenumbers.tzdata'],
                      test_suite="tests",
                      platforms='Posix; MacOS X; Windows',
-                     classifiers=[dev_status,
+                     classifiers=['Development Status :: 4 - Beta',
                                   'Intended Audience :: Developers',
                                   'License :: OSI Approved :: Apache Software License',
                                   'Operating System :: OS Independent',
diff --git a/setup.py b/setup.py
@@ -28,21 +28,14 @@
 python_25 = (major > 2 or (major == 2 and minor >= 5))
 if not python_25:
     raise RuntimeError("Python 2.5 or newer is required")
-python_3x = (major >= 3)
-if python_3x:
-    package_name = 'phonenumbers3k'
-    dev_status = 'Development Status :: 3 - Alpha'
-else:
-    package_name = 'phonenumbers'
-    dev_status = 'Development Status :: 4 - Beta'
 
 # Add ./python/ subdirectory to path
 sys.path.append('python')
 
 # Discover version of phonenumbers package
 from phonenumbers import __version__
 
-distutils.core.setup(name=package_name,
+distutils.core.setup(name='phonenumbers',
                      version=__version__,
                      description="Python version of Google's common library for parsing, formatting, storing and validating international phone numbers.",
                      author='David Drysdale',
@@ -54,7 +47,7 @@
                      package_dir={'': 'python'},
                      test_suite="tests",
                      platforms='Posix; MacOS X; Windows',
-                     classifiers=[dev_status,
+                     classifiers=['Development Status :: 4 - Beta',
                                   'Intended Audience :: Developers',
                                   'License :: OSI Approved :: Apache Software License',
                                   'Operating System :: OS Independent',
