Skip to content

Commit 2bcd29d

Browse files
Zuulopenstack-gerrit
authored andcommitted
Merge "Cleanup py27 support"
2 parents d5a99b5 + 3f97e98 commit 2bcd29d

2 files changed

Lines changed: 2 additions & 12 deletions

File tree

setup.cfg

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ classifier =
1414
License :: OSI Approved :: Apache Software License
1515
Operating System :: POSIX :: Linux
1616
Programming Language :: Python
17+
Programming Language :: Python :: 3 :: Only
18+
Programming Language :: Python :: Implementation :: CPython
1719
Programming Language :: Python :: 3
1820
Programming Language :: Python :: 3.6
1921
Programming Language :: Python :: 3.7
@@ -268,9 +270,6 @@ keystoneauth1.plugin =
268270
cliff.formatter.list =
269271
df-to-csv = cloudkittyclient.format:DataframeToCsvFormatter
270272

271-
[upload_sphinx]
272-
upload-dir = doc/build/html
273-
274273
[compile_catalog]
275274
directory = cloudkittyclient/locale
276275
domain = python-cloudkittyclient

setup.py

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,8 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515

16-
# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
1716
import setuptools
1817

19-
# In python < 2.7.4, a lazy loading of package `pbr` will break
20-
# setuptools if some other modules registered functions in `atexit`.
21-
# solution from: http://bugs.python.org/issue15881#msg170215
22-
try:
23-
import multiprocessing # noqa
24-
except ImportError:
25-
pass
26-
2718
setuptools.setup(
2819
setup_requires=['pbr>=2.0.0'],
2920
pbr=True)

0 commit comments

Comments
 (0)