Commits · a85aa143f971ebfbb31ccaf58cb82a311f9315c6 · Jérome Perrin / setuptools

18 Jun, 2013 1 commit
- Merge Vinay Sajip's unified Python 2/3 support from distribute 3 · a85aa143
  Jason R. Coombs authored Jun 18, 2013
```
--HG--
branch : distribute
```
  a85aa143
29 May, 2013 3 commits
- Bumped to 0.6.46 in preparation for next release. · 641eac65
  Jason R. Coombs authored May 29, 2013
```
--HG--
branch : distribute
```
  641eac65
- Added tag 0.6.45 for changeset ddca71ae5ceb · 75e163b3
  Jason R. Coombs authored May 29, 2013
```
--HG--
branch : distribute
```
  75e163b3
- Catch VersionConflict in distribute_setup when checking for setuptools 0.7 (to... · 09b0b938
  Jason R. Coombs authored May 29, 2013
```
Catch VersionConflict in distribute_setup when checking for setuptools 0.7 (to allow upgrade from setuptools to distribute). Fixes #379

--HG--
branch : distribute
```
  09b0b938
28 May, 2013 4 commits
- Run tests on 3.3 as well · b39c7702
  Jason R. Coombs authored May 28, 2013
```
--HG--
branch : distribute
```
  b39c7702
- Bumped to 0.6.45 in preparation for next release. · 4edd0409
  Jason R. Coombs authored May 28, 2013
```
--HG--
branch : distribute
```
  4edd0409
- Added tag 0.6.44 for changeset 73aa98aee6bb · 8bf427c0
  Jason R. Coombs authored May 28, 2013
```
--HG--
branch : distribute
```
  8bf427c0
- Allow setuptools 0.7 to satisfy use_setuptools. · bf1ea34f
  Jason R. Coombs authored May 28, 2013
```
--HG--
branch : distribute
```
  bf1ea34f
25 May, 2013 4 commits
- Bumped to 0.6.44 in preparation for next release. · c12b3db4
  Jason R. Coombs authored May 24, 2013
```
--HG--
branch : distribute
```
  c12b3db4
- Added tag 0.6.43 for changeset 35086ee28673 · e1febd26
  Jason R. Coombs authored May 24, 2013
```
--HG--
branch : distribute
```
  e1febd26
- Update changelog · 85086e97
  Jason R. Coombs authored May 24, 2013
```
--HG--
branch : distribute
```
  85086e97
- Restore Python 2.4 compatible syntax · 2b488162
  Jason R. Coombs authored May 24, 2013
```
--HG--
branch : distribute
```
  2b488162
24 May, 2013 5 commits
- Update About the fork · 33c71453
  Jason R. Coombs authored May 24, 2013
```
--HG--
branch : distribute
```
  33c71453
- Update code repository link. · 5f422f5a
  Jason R. Coombs authored May 24, 2013
```
--HG--
branch : distribute
```
  5f422f5a
- Bumped to 0.6.43 in preparation for next release. · 31160495
  Jason R. Coombs authored May 24, 2013
```
--HG--
branch : distribute
```
  31160495
- Added tag 0.6.42 for changeset f30167716b65 · 62e96b0e
  Jason R. Coombs authored May 24, 2013
```
--HG--
branch : distribute
```
  62e96b0e
- Update changelog · b1bf410e
  Jason R. Coombs authored May 24, 2013
```
--HG--
branch : distribute
```
  b1bf410e
10 Oct, 2012 1 commit

Vinay Sajip authored Oct 10, 2012

--HG--
branch : distribute
extra : source : 98c929e25fee11a99eb125dd9a13521321d68dd3

94fc39cb

18 Jun, 2013 2 commits
- Updated win_script_wrapper to run on Python 2 and Python 3 · e3f7235a
  Jason R. Coombs authored Jun 18, 2013
```
--HG--
branch : distribute
```
  e3f7235a
- Minor fix previously fixed in a merge · 7cf9cd93
  Jason R. Coombs authored Jun 18, 2013
```
--HG--
branch : distribute
```
  7cf9cd93
10 Oct, 2012 1 commit

Post-merge fixes for Python 3. · ac3ba239

Vinay Sajip authored Oct 10, 2012

--HG--
branch : distribute
extra : source : 6b9041dea7b9197f6ea1fb993d7a05dd4f7c580d

ac3ba239

18 Jun, 2013 1 commit
- Merge with upstream · fb8c7cf0
  Jason R. Coombs authored Jun 18, 2013
```
--HG--
branch : distribute
```
  fb8c7cf0
09 Oct, 2012 2 commits

Update CHANGES. · db678072

Stefan H. Holek authored Oct 09, 2012

--HG--
branch : distribute
extra : rebase_source : a97e83b5ec8e426bfd567cec9fbe1e2b39b0935a

db678072

Fix cause of test failure on Mac OS X. Refs #20. · 95907bcc
Stefan H. Holek authored Oct 09, 2012
```
--HG--
branch : distribute
extra : rebase_source : 92ba8151d6dfa3755b31139a9b5ada570183731d
```
95907bcc

08 Oct, 2012 12 commits
- Fix a few messages in distribute_setup.py. · 0d407a39
  Stefan H. Holek authored Oct 08, 2012
```
--HG--
branch : distribute
extra : rebase_source : ce0d4548e026262b6e4cf55c46dc5f209dbadd44
```
  0d407a39
- Add my name to contributors list. · 7a54a88a
  Stefan H. Holek authored Oct 08, 2012
```
--HG--
branch : distribute
extra : rebase_source : d65f390123cbc59ac453e31b1d3d38c1fce6f105
```
  7a54a88a
- Fix duplicate application of version tags in 'egg_info' command. Fixes #299. · 907d9f46
  Stefan H. Holek authored Oct 08, 2012
```
--HG--
branch : distribute
extra : rebase_source : 9f6fb87944bc3b9828b04bf8ac5ba7b3a40bfc95
```
  907d9f46
- marshall.load() does not necessarily raise ValueError. Fixes #283. · 9553dd99
  Stefan H. Holek authored Oct 08, 2012
```
--HG--
branch : distribute
extra : rebase_source : 203cee618118fb65bf109d2db0275aa90aa5a12d
```
  9553dd99
- os.access() cannot test for "createable" Fixes #320. · 9eca33ff
  Stefan H. Holek authored Oct 08, 2012
```
--HG--
branch : distribute
extra : rebase_source : d572b2701ceac9c8a46083cc6658c6eeed86d497
```
  9eca33ff
- Remove a missing fixer warning which showed during normal operations. Fixes #305. · 645b5b08
  Stefan H. Holek authored Oct 08, 2012
```
--HG--
branch : distribute
extra : rebase_source : 3e5912a80758abf1e198d400c29ab03112eb68d6
```
  645b5b08
- Print metadata in UTF-8 independent of platform. Fixes #311. · 11270be6
  Stefan H. Holek authored Oct 08, 2012
```
--HG--
branch : distribute
extra : rebase_source : 4ff0df4ad7d9ea8cee6342f9c642e4fe634b7f18
```
  11270be6
- Read and write manifest in UTF-8 under Python 3. Fixes #303. · d76ec4bf
  Stefan H. Holek authored Oct 08, 2012
```
--HG--
branch : distribute
extra : rebase_source : 609c654effd2711aa803f6a0e84013294026608f
```
  d76ec4bf
- Make sure the manifest never contains decomposed UTF-8. · 6851d4e3
  Stefan H. Holek authored Oct 08, 2012
```
--HG--
branch : distribute
extra : rebase_source : 0e0fb3beac56f66f12670ec69ebfd3996d12d912
```
  6851d4e3
- Purge modules under test from sys.modules prior to running tests. Fixes #301. · 077a69ae
  Stefan H. Holek authored Oct 08, 2012
```
--HG--
branch : distribute
extra : rebase_source : 87561670c15ec8315f47157cdc0c06328ce8c20f
```
  077a69ae
- Remove egg-info from repo. · 71ae1745
  Stefan H. Holek authored Oct 08, 2012
```
--HG--
branch : distribute
extra : rebase_source : 89a58a7b518862cdbf37a30a4b512853730251cc
```
  71ae1745
- Avoid import loop in Python 3.3. Fixes #304. · 7efb0c18
  Stefan H. Holek authored Oct 08, 2012
```
--HG--
branch : distribute
extra : rebase_source : 8ce699d489f708a68338b2417771854174a734e8
```
  7efb0c18
17 Sep, 2012 4 commits

Fixed so _markerlib is included in Python 3 as well. I don't like the package... · ffefa25a

Lennart Regebro authored Sep 17, 2012

Fixed so _markerlib is included in Python 3 as well. I don't like the package pollution, but we can maybe fix that later.

--HG--
branch : distribute
extra : rebase_source : 5b3de3075ffea309979c51df9d6a6a6fb1188050

ffefa25a

merge · 20c14661

Daniel Holth authored Sep 17, 2012

--HG--
branch : distribute
extra : rebase_source : e10714ab6506fa313a8bfb3f88f0620d3ab1707d

20c14661

markerlib -> _markerlib · fb321a77

Daniel Holth authored Sep 17, 2012

--HG--
branch : distribute
extra : rebase_source : d44490f6b809c93eb9b20409862ea28a3f039aae

fb321a77

skip markerlib tests on Python < 2.6 (no ast compilation) · 25d00ab6
Daniel Holth authored Sep 17, 2012
```
--HG--
branch : distribute
extra : rebase_source : 2044b531becb5ca6882bfb3b59ab53aac2c8ae2e
```
25d00ab6