Commit Graph

262 Commits

Author SHA1 Message Date
Tim D. Smith fb38e96180 Remove unused import 2017-10-02 21:10:09 -07:00
Amber Brown (HawkOwl) caf1a2316c beat the setup into shape 2016-09-18 02:45:19 +08:00
Adi Roiban 6303a4d88f revert the revert 2016-08-21 11:53:37 +01:00
Adi Roiban f96bc30f14 Revert "Merge 8622-setup-coverage: Move all setup.py related code to t.python._setup."
Reopens: #8622

'twist' script was left out when resolving conflicts on an update with trunk.
2016-08-21 11:51:07 +01:00
Adi Roiban c4ac6ba177 Update setup.py. 2016-08-19 11:28:23 +01:00
Adi Roiban 2d12213607 Move files to src. 2016-08-19 11:17:42 +01:00
Adi Roiban 74b64e6efd Improve coverage by writing a test for the custom build_py on py3. 2016-08-07 14:34:54 +01:00
Adi Roiban 5d84f0ba5b Make t.python.dist private. 2016-08-07 12:05:13 +01:00
Adi Roiban 2a302970c9 Initial import from 8606-rodrigc-setup-2. 2016-08-06 23:34:07 +01:00
Craig Rodrigues 49761d2aff Remove setup3.py
Python 3 specific funtions have been integrated in setup.py,
to ease maintainability.
2016-07-18 13:01:54 -07:00
Craig Rodrigues ed084b8630 Integrate setup3.py functionality into setup.py
Both files are using more of the same functions,
so this makes maintainability easier.
2016-07-18 13:01:54 -07:00
Craig Rodrigues 6e3c5b7c04 Use console_scripts entry_point for installing command-line scripts.
Remove getScripts()
2016-07-15 20:44:33 -07:00
hawkowl 0953113d44 Merge sdist-use-7985-4: Use setup.py sdist to build tarballs
Author: hawkowl
Reviewer: adiroiban
Fixes: #7985

git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@46942 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
2016-03-08 03:21:16 +00:00
hawkowl 8c99696baf Merge setuptools-7177: Require setuptools for installation.
Author: Alex, hawkowl
Reviewers: ralphm, adiroiban
Fixes: #7177

git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@45435 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
2015-08-10 11:33:48 +00:00
hawkowl e04e491a15 Merge remove-subproject-packagaing-7964-2: Remove subproject packaging
Author: hawkowl
Reviewer: adiroiban
Fixes: #7964



git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@45216 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
2015-07-07 07:32:08 +00:00
glyph 4804effc3f Merge extras-3696-6: Support setuptools extras for optional dependencies.
Author: herrwolfe

Reviewer: glyph, thijs

Fixes: #3696

Optional dependencies can be installed using the extra_requires facility
provided by setuptools.

git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@43808 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
2015-02-02 08:32:11 +00:00
itamarst d3078375ca Merge setup3-missing-6929-2. Python 3 module list now has tests to catch typos.
Author: itamar
Review: hynek
Fixes: #6929


git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@41839 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
2014-03-07 01:35:56 +00:00
itamarst 4ece689c66 Merge python3-setup-6539-2. Make setup.py install on Python 3.
Author: itamar
Reviewer: exarkun, hynek
Fixes: #6539

setup.py install and pip install now work on Python 3.3.


git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@41379 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
2014-01-21 01:36:44 +00:00
therve 74eb871818 Merge setup-no-check-6209
Author: therve
Reviewers: dreid, thijs
Fixes: #6209

Don't check for zope requirements when setup.py is run with setuptools. It
fixes the installation with pip and easy_install when zope.interface is not
already at the correct version.


git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@36604 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
2012-12-20 14:18:13 +00:00
exarkun 4e4b410e1c Merge setup-py3-6040-4
Author: exarkun
Reviewer: itamarst
Fixes: #6040

Add `setup3.py` script which can package and install a subset of Twisted on Python 3.


git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@36198 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
2012-10-16 15:56:41 +00:00
vperic 78378fd128 Merge drop-25-support-5553-2: Remove support for Python 2.5
Author: vperic
Reviewer: thijs
Fixes: #5553

Python 2.5 is no longer supported, modify the appropriate setup files
and documentation.

git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@35033 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
2012-08-03 09:39:21 +00:00
thijs c4562f2d16 Merge setup-py3k-4244-2: Make the print statement in setup.py compatible for Python 2.6/3.0
Author: loewis, thijs
Reviewer: thijs, exarkun, antoine
Fixes: #4244

This also adds additional test coverage for twisted.python.dist.


git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@34959 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
2012-07-25 19:04:04 +00:00
itamarst eebd1c6d90 Merge py3-execfile-5129: Switch to custom execfile() implementation, since it missing from Python 3.
Author: allenap
Reviewer: exarkun, itamar
Fixes: #5129


git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@34775 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
2012-07-14 21:49:36 +00:00
therve 6589b0ab93 Merge release-12.0.0-5457
Author: therve
Reviewer: jml
Fixes: #5457

Release Twisted 12.0.0.


git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@33539 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
2012-02-11 13:47:35 +00:00
jesstess 3c158bce57 Merge setup-args-5146
Author: zseil
Reviewer: jesstess
Fixes: #5146

Fix the indentation level of the setup_args dictionary in Twisted's
top level setup.py so it isn't erroneously created several times.



git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@32223 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
2011-07-05 00:21:42 +00:00
thijs 4d374eb0f5 Apply exclude-admin-5042.patch: setup.py now only includes registered
Twisted sub-projects, and ignores other directories, like bin/admin,
that contain various tools that should not be included in a release.

Author: thijs
Reviewer: jesstess
Fixes: #5042


git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@32049 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
2011-06-05 22:12:55 +00:00
jesstess 0caa017e35 Release Twisted 11.0.0.
Author: jesstess

Reviewers: glyph, exarkun

Fixes: #4980


git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@31541 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
2011-04-03 18:50:17 +00:00
exarkun 3acc7f3a8d Rewrite the copyright headers to exclude date information.
Author: exarkun
Reviewer: glyph
Fixes: #4857

To avoid the need to perpetually update copyright dates in each file in Twisted,
remove the dates from most files and just leave them in the LICENSE file.

As a side effect, some files also have had a trailing newline added where it was
missing before.


git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@30752 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
2011-02-14 04:45:15 +00:00
glyph ccc5c7ad8d Revert r26654 - accidentally mis-merged (added files were not committed)
Reopens #1696


git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@26655 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
2009-04-10 00:30:21 +00:00
jafo 6e2fd0de82 Merge twisted-make-some-rpms-1696: Resolving issues with RPM builds.
This branch fixes several issues with RPM building, including using "python
setup bdist_rpm", and building an RPM from the tar file.

Author: Sean Reifschneider
Reviewer: Tim Allen
Fixes: #1696


git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@26654 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
2009-04-09 23:38:32 +00:00
thijs eea6c2a8c5 Merge shebang-virtualenv-3750: make Twisted friendly for virtualenv installations by using the /usr/bin/env python shebang line
Author: thijs
Reviewer: therve
Fixes: #3750


git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@26653 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
2009-04-08 21:56:55 +00:00
exarkun da5435c181 Revert r26608 - some features not implemented
Reopens #1696


git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@26609 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
2009-04-02 01:13:31 +00:00
jafo cd2b579cc9 Fix for Ticket #1696, bdist_rpm failures particular on Python <= 2.3.
git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@26608 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
2009-04-01 23:55:21 +00:00
thijs d25889f03c Merge jython-ext-3410: exclude extensions in the build process when using Jython
Author: thijs
Reviewer: exarkun
Fixes: #3410


git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@24692 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
2008-09-06 20:55:38 +00:00
thijs 5986e4a2a2 Merge standardize-shebang-2208: Standardize on the Python shebang line #!/usr/bin/python
Author: thijs
Reviewer: exarkun
Fixes: #2208


git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@24516 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
2008-08-04 17:54:13 +00:00
radix bbd5e66eff Merge easy_install-1286-5
Author: radix
Reviewer: therve, exarkun
Fixes #1286

The top-level setup.py file has been rewritten as a normal distutils script.
It also added optional support for setuptools, so that it's possible to
easy_install Twisted and even have it automatically download zope.interface
if necessary. twisted.python.dist has changed so that it now accepts a list
of Extension objects which know how to check if they should be built, rather
than a function that dynamically creates a list of buildable Extensions.
This made sharing between subproject and main Twisted setup.py files easier.



git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@23010 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
2008-03-22 18:25:16 +00:00
radix 78ed36ca60 Revert r23006: Buildbot failures related to setuptools
It seems to be related to old versions of setuptools not accepting our
setup.py file:

error in Twisted setup command: 'install_requires' must be a string or list of
strings containing valid project/version requirement specifiers

Reopens #1286



git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@23007 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
2008-03-22 17:21:13 +00:00
radix 8a2b0a7628 Merge easy_install-1286-5
Author: radix
Reviewer: therve
Fixes #1286

The top-level setup.py file has been rewritten as a normal distutils script.
It also added optional support for setuptools, so that it's possible to
easy_install Twisted and even have it automatically download zope.interface
if necessary. twisted.python.dist has changed so that it now accepts a list
of Extension objects which know how to check if they should be built, rather
than a function that dynamically creates a list of buildable Extensions.
This made sharing between subproject and main Twisted setup.py files easier.



git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@23006 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
2008-03-22 16:59:58 +00:00
radix ab28f6663a Merge setup-py-depends-on-core-1835
Authors: radix, glyph
Reviewer: exarkun
Fixes #1835

This makes it so "setup.py build" and other commands which don't actually install 
Twisted to an importable location will work with the main setup.py script.



git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@19055 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
2006-12-24 02:03:45 +00:00
radix 03b0d171ae merge the shrapnel from the Twisted 2.4.0 release.
Author: radix
Reviewers: spiv, exarkun
fixes #1747

This fixes setup.py when used in the context of a sumo release, 
and changes the README a bit.


git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@16950 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
2006-05-27 20:55:55 +00:00
radix 314e19acc1 a whole swathe of release-automation improvements.
Resolves: #1668
Author: radix
Reviewer: exarkun


- Version objects now have a 'base' method, which only returns 
  major.minor.micro, never any SVN revision numbers.
- pb and vfs are now subprojects
- All versions in python code have been centralized to 
  <project>/_version.py. This file must contain a Version instance
  named 'version'.
- admin/change-versions updates _version.py files.
- subproject setup.py files no longer need to specify a version;
  it is extracted from their _version.py files.
- All of the functions in admin/change-versions have been moved
  to twisted.python.release, and most of them have had unit tests
  written for them.
- Project URLs in setup.py files have been updated to the new trac 
  locations.
- README files (including subproject and sumo) now include actual 
  version numbers, even in trunk.
- Most of the changes from warner's release branch are included in
  this one.
- setup.py and sumo-setup.py have been unified. Hooray!
- improved release-procedure.txt



git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@16792 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
2006-05-13 19:26:09 +00:00
exarkun eba158b62e Remove flow and pair from subproject lists; add them and pb to the core blacklist
Author: exarkun
Reviewers: itamarst, radix
Fixes #1664 and #1666


git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@16661 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
2006-04-24 01:18:33 +00:00
exarkun a3df5c42cd pending deprecate flow; back out change to setup.py that prevents it from being installed
after the next release, we'll promote this to a deprecation warning

git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@15876 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
2006-02-09 15:43:07 +00:00
exarkun 620c50cbee I like squares and putenv is bad
git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@15874 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
2006-02-09 04:27:46 +00:00
exarkun 0ab14d096d add a list of non-all subprojects; reformat to my preference; whitespace cleanup
git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@15873 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
2006-02-09 04:25:51 +00:00
exarkun f9fdc9a286 Re-add support for "setup.py all foo"
git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@15851 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
2006-02-08 06:09:31 +00:00
exarkun b3ddc821b2 Invert special-casing of top-level non-distutils setup.py subcommand handling
Author: exarkun
Reviewer: radix

Makes things like "python setup.py build_ext" work at the top-level.


git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@15850 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
2006-02-08 05:29:03 +00:00
warner bfe2f27a37 merge newpb to trunk (from branches/newpb-again)
git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@15445 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
2005-12-30 22:35:18 +00:00
glyph 1e78805225 svn merge -r15384:15380, because newpb seems to have caused some buildbot issues.
git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@15409 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
2005-12-24 05:08:52 +00:00
warner d6f6460fd6 finally merge newpb to the trunk
git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@15381 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
2005-12-23 00:18:05 +00:00