Commit Graph

73 Commits

Author SHA1 Message Date
Carl Meyer 6ed7d40727 Fixed #18115 - added warning about overlaid install.
Setup.py now warns if it detects that Django is being installed over top
of a previous installation that was never removed. This should only
happen when installing with ``python setup.py install``, as pip
automatically uninstalls before installing a new version and
easy_install installs as an egg directory.

Also generally updated the installation doc.
2012-05-21 17:28:58 -06:00
Claude Paroz 23d3459761 Fixed #17965 -- Definitely dropped support for Python 2.5. Thanks jonash for the initial patch and Aymeric Augustin for the review.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17834 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-31 08:24:29 +00:00
James Bennett 2591fb8d4c Bump trunk to 1.4.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17799 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-23 16:53:23 +00:00
James Bennett e6ae858811 Bump trunk to 1.4 RC 2.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17740 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-15 03:29:49 +00:00
James Bennett 60fa88aab9 Correct the download URL.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17672 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-05 17:30:27 +00:00
James Bennett 878ec9e646 Bump for 1.4 RC 1.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17671 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-05 17:22:23 +00:00
Aymeric Augustin 6b48b88564 Fixed #17832 -- Missing negation in a comment. Thanks mk for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17667 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-03-05 08:47:22 +00:00
Jannis Leidel 8f4d12ead2 Fixed download URL in setup.py.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17534 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-16 11:45:57 +00:00
James Bennett 50c64ed379 Accommodate new version numbering scheme.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17532 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-16 04:01:58 +00:00
James Bennett 46671e9b68 Bump version numbers for 1.4 beta 1.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17531 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-02-16 02:12:20 +00:00
Aymeric Augustin 40f0ecc56a Implemented PEP386-compatible version numbers. Thanks Jannis for the guidance.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17357 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-01-08 15:05:15 +00:00
Aymeric Augustin f46003559c Fixed #17491 -- Honored the version number format expected by distutils. Fixed #11236 too.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17351 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2012-01-07 19:05:29 +00:00
James Bennett d49fd627a6 Also we use HTTPS now.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17257 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-23 04:04:43 +00:00
James Bennett 3e2edad9c7 Missed one.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17256 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-23 04:03:27 +00:00
James Bennett 0e29e48c05 Bump to 1.4 alpha 1.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17255 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-12-23 04:00:26 +00:00
Adrian Holovaty 3d5a8f758a Changed setup.py classifiers to use a better indentation style
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15929 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-28 02:14:19 +00:00
Adrian Holovaty 5d6ee6cb18 Removed Python 2.4 classifier from setup.py
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15928 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-28 02:13:05 +00:00
James Bennett 7c08f4c635 Bump everything for 1.3.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15902 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-23 05:06:31 +00:00
Russell Keith-Magee 4772adf88e Added trove classifiers for specific python versions. Thanks to Brett Cannon for the suggestion.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15760 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-05 10:38:10 +00:00
James Bennett 5e9deba988 Bump trunk to 1.3 release candidate status.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15755 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-03-04 05:27:28 +00:00
James Bennett 5a55922baa Update download_url for beta.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15041 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-23 04:12:04 +00:00
James Bennett 5e2cac5412 Trunk is now 1.3 beta 1.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15040 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-12-23 04:04:20 +00:00
James Bennett ebaebcc438 Change development-status classifier in setup.py since this is an alpha.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14520 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-11 07:18:15 +00:00
James Bennett c5fef1d767 Bump version number and download URL for 1.3 alpha 1.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14519 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-11-11 07:15:30 +00:00
James Bennett 6cffb9b880 Bump to 1.2.1.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13302 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-24 19:10:30 +00:00
James Bennett f8af1afbea Flip PyPI classifier from beta to stable.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13279 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-17 17:42:14 +00:00
James Bennett 6276167b72 Bump version and download info to 1.2.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13276 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-17 17:31:49 +00:00
James Bennett 434bf737d4 Bump to 1.2 RC 1
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13117 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-05-06 04:25:33 +00:00
James Bennett ae9866663c Bump version info to 1.2 beta.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12394 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-06 06:05:44 +00:00
James Bennett 588cd6908f Bump version number and add download_url for 1.2 alpha.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12114 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-06 06:02:31 +00:00
James Bennett cb5e5dc2bc Add a trove classifier that I missed when I originally set these up.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11381 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-08-03 21:16:54 +00:00
James Bennett 10d7e0e4b8 And remove the download_url since that only applies to the exact rev we packaged as 1.1.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11371 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-07-31 01:37:48 +00:00
James Bennett 2735836887 Update packaging info for 1.1 release.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11364 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-07-29 05:51:03 +00:00
James Bennett f4cb4ebd31 Update setup.py for RC 1.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11290 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-07-22 02:11:55 +00:00
Jacob Kaplan-Moss 2fb7f5ea2b Updated download_url for eventual 1.1 beta package.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10133 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-24 00:26:12 +00:00
James Bennett 1b9bbb546a Add trove classifiers to setup.py
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9896 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-24 02:28:16 +00:00
James Bennett 4251c6020c Bump version to 1.1 alpha 1 and add download_url for the eventual 1.1 alpha 1 packagee
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9894 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-24 01:46:29 +00:00
James Bennett 06f89325e1 Ensure generated package name does not contain spaces; this will make Django easy_installable from the Cheese Shop.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9452 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-11-15 05:39:06 +00:00
James Bennett 2d3712f930 Change version calculation in setup.py to go with the new VERSION tuple
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9107 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-10-01 01:22:41 +00:00
Malcolm Tredinnick e73bf2bdd9 Fixed #3203 (again!) -- Install data files in the right place on MS Windows
systems. Thanks, Karen Tracey and cwt@bashell.com.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8313 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-08-12 02:15:00 +00:00
Adrian Holovaty 46c7941de3 Fixed badly worded comment in setup.py osx_install_data(). It's better but still doesn't do a good job of explaining what the heck is going on
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8041 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-22 02:51:59 +00:00
Jacob Kaplan-Moss f28474547b Fixed #7414: fixed setup.py on OSX 10.5. Thanks, ajs.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8019 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-21 16:30:32 +00:00
Jacob Kaplan-Moss 04df702263 Updated LICENSE. Announcement forthcomming...
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7680 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-06-17 14:53:24 +00:00
Malcolm Tredinnick dd2afd7105 Changed setup.py to work no matter where it is called from. We were previously
using __file__, which isn't consistent on Windows. Some awesome debugging (and
patch) here from Karen Tracey. Fixed #6562.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@7139 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-02-21 20:50:07 +00:00
Adrian Holovaty f791a598a8 Negligible formatting changes to some recent commits
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4917 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-04-03 22:33:28 +00:00
Malcolm Tredinnick b9d077c10d Fixed #3338, #3536, #3796 -- Fixed a bunch of setup and build problems in a
portable fashion. That took a *lot* longer to debug than I thought it would, so
let's try not to break it.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@4912 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-04-03 12:28:19 +00:00
Malcolm Tredinnick 97256bc39c Fixed #3536 -- Fixed setup.py so that it prints a usage message if you
accidently invoke it without any arguments.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@4550 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-02-20 23:38:06 +00:00
Adrian Holovaty 911f0cdf18 Fixed #3203 -- Fixed setup.py bdist_wininst. Thanks for the patch, ymasuda
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4264 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-12-30 06:17:21 +00:00
Adrian Holovaty 49f6d06c2f Fixed #3117 -- Changed setup.py to get version from django.VERSION dynamically. Thanks for the patch, ymasuda
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4195 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-12-13 06:07:15 +00:00
Adrian Holovaty a08ed9d165 Fixed #2989 -- easy_install now works with Django's setup.py. Thanks for reporting, __doc__
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4114 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2006-11-27 01:12:55 +00:00