Skip to content

Commit 345a853

Browse files
committed
Make roundup play nice with setup tools (for using with virtualenv)
1 parent bb936f6 commit 345a853

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

CHANGES.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ Features:
1111

1212
Fixed:
1313

14+
- Make roundup play nice with setup tools (for using with virtualenv)
15+
(Pradip Caulagi)
1416
- [minor] Template responsive: make demo.py work out of the box with it,
1517
by setting the static_files config.ini setting to "static".
1618
Footer: link fixed and hardcoded last modfied date removed. (Bernhard Reiter)

setup.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#! /usr/bin/env python
2+
# -*- coding: utf-8 -*-
23
#
34
# Copyright (c) 2001 Bizar Software Pty Ltd (http://www.bizarsoftware.com.au/)
45
# This module is free software, and you may redistribute it and/or modify
@@ -24,7 +25,11 @@
2425
from roundup.dist.command.build import build, list_message_files
2526
from roundup.dist.command.bdist_rpm import bdist_rpm
2627
from roundup.dist.command.install_lib import install_lib
27-
from distutils.core import setup
28+
29+
try:
30+
from setuptools import setup
31+
except ImportError:
32+
from distutils.core import setup
2833

2934
import sys, os
3035
from glob import glob

0 commit comments

Comments
 (0)