Commits · ac16aa2d54815d3e805c60a38afa5f4c9f3d282f · Jérome Perrin / setuptools

16 May, 2013 1 commit
- Remove redundant exception for os.devnull · ac16aa2d
  Jason R. Coombs authored May 16, 2013
```
--HG--
branch : Setuptools-Distribute merge
```
  ac16aa2d
12 May, 2013 4 commits
- Updated merge notes again to reference relevant changesets and final process · a0d19667
  Jason R. Coombs authored May 12, 2013
```
--HG--
branch : Setuptools-Distribute merge
```
  a0d19667
- Merge remaining differences from setuptools · 09fe072a
  Jason R. Coombs authored May 12, 2013
```
--HG--
branch : Setuptools-Distribute merge
```
  09fe072a
- Merged remaining changes from 1aae1efe5733 (setuptools 0.6c12dev) · 062b9b95
  Jason R. Coombs authored May 12, 2013
```
--HG--
branch : Setuptools-Distribute merge
```
  062b9b95
- Update merge notes again to reflect revised technique · c46bdf7f
  Jason R. Coombs authored May 12, 2013
```
--HG--
branch : Setuptools-Distribute merge
```
  c46bdf7f
05 May, 2013 1 commit

Updated merge notes to reflect less invasive change (and regression). Thanks... · 476342be

Jason R. Coombs authored May 04, 2013

Updated merge notes to reflect less invasive change (and regression). Thanks PJE for pointing out the flaw in my reasoning.

--HG--
branch : Setuptools-Distribute merge
extra : source : 07d5668a8c0c09caf690c8f4f449eb46b4e45ab3

476342be

04 May, 2013 3 commits
- Updated merge notes · 2ef81e9e
  Jason R. Coombs authored May 04, 2013
```
--HG--
branch : Setuptools-Distribute merge
extra : source : 9d926f62c15cff2f25a9c8b8e9a2984246a5ba5c
```
  2ef81e9e
- Merge setuptools/command/* · e8dbb411
  Jason R. Coombs authored May 04, 2013
```
--HG--
branch : Setuptools-Distribute merge
```
  e8dbb411
- Copy changes from 1aae1efe5733 for setuptools/command/* (except easy_install.py · ff75a6cb
  Jason R. Coombs authored May 03, 2013
```
--HG--
branch : Setuptools-Distribute merge
extra : source : 0c89fbb19c269ce1cb3bc3e9ece9864127768169
```
  ff75a6cb
03 May, 2013 6 commits
- Merge setuptools.command.easy_install · 3b7000ad
  Jason R. Coombs authored May 03, 2013
```
--HG--
branch : Setuptools-Distribute merge
```
  3b7000ad
- Copy changes to easy_install.py from 1aae1efe5733 · b33cf3e3
  Jason R. Coombs authored May 03, 2013
```
--HG--
branch : Setuptools-Distribute merge
extra : source : 835ac45ae9db9a12fa13648ac556ac43c85f750b
```
  b33cf3e3
- Merge setuptools.archive_util and setuptools.archive_util and setuptools.depends · f179cf16
  Jason R. Coombs authored May 03, 2013
```
--HG--
branch : Setuptools-Distribute merge
```
  f179cf16
- Copy changes to setuptools/archive_util.py setuptools/depends.py... · b03a9e29
  Jason R. Coombs authored May 03, 2013
```
Copy changes to setuptools/archive_util.py setuptools/depends.py setuptools/extension.py and setuptools/__init__.py from 1aae1efe5733

--HG--
branch : Setuptools-Distribute merge
extra : source : a3f8891a67625e751eacbf027d66feff19779da4
```
  b03a9e29
- Merge dist module · bd2ad941
  Jason R. Coombs authored May 03, 2013
```
--HG--
branch : Setuptools-Distribute merge
```
  bd2ad941
- Copy changes to dist.py from 1aae1efe5733 · 737fe613
  Jason R. Coombs authored May 03, 2013
```
--HG--
branch : Setuptools-Distribute merge
extra : source : a79dd619dc8637e5c9b7de32bd8c5389c995dcb9
```
  737fe613
20 Mar, 2013 5 commits
- Merge package_index module · 0eaf9e68
  Jason R. Coombs authored Mar 20, 2013
```
--HG--
branch : Setuptools-Distribute merge
```
  0eaf9e68
- Copy changes to package_index from 1aae1efe5733 · 742bd477
  Jason R. Coombs authored Mar 20, 2013
```
--HG--
branch : Setuptools-Distribute merge
extra : source : db6acae7b8cfb92007fe8e7ae4f392481b080a00
```
  742bd477
- Merged sandbox module · 32c396c0
  Jason R. Coombs authored Mar 20, 2013
```
--HG--
branch : Setuptools-Distribute merge
```
  32c396c0
- Update sandbox.py to latest from setuptools-0.6 · 6b9f1df3
  Jason R. Coombs authored Mar 20, 2013
```
--HG--
branch : Setuptools-Distribute merge
extra : source : 7f4dd650af5779b69ae13fe6a1b4adce386b5489
```
  6b9f1df3
- Merge pkg_resources · d54b82ff
  Jason R. Coombs authored Mar 19, 2013
```
--HG--
branch : Setuptools-Distribute merge
```
  d54b82ff
04 May, 2013 1 commit
- Move where add_defaults is defined to align with setuptools · 59cf0135
  Jason R. Coombs authored May 03, 2013
```
--HG--
branch : Setuptools-Distribute merge
extra : source : 6728b2be550b4ed4015d5cdc88bc49141bc40878
```
  59cf0135
03 May, 2013 3 commits
- easy_install once again honors setup.cfg if found in the current directory · eafde2c8
  Jason R. Coombs authored May 03, 2013
```
--HG--
branch : Setuptools-Distribute merge
extra : source : 422fc7e84eb2a22aa13df44dea6f138d7c840e83
```
  eafde2c8
- Backed out improper fix for distribute issue #174 · f86079e4
  Jason R. Coombs authored May 03, 2013
```
--HG--
branch : Setuptools-Distribute merge
extra : source : 28eb706c219004e2dd83dcd1db37d952e8c66908
```
  f86079e4
- Distributions are once again installed as zipped eggs by default. · 9eebb2df
  Jason R. Coombs authored May 03, 2013
```
--HG--
branch : Setuptools-Distribute merge
extra : source : f3b1c801d877734669007ad4f5d8cee091a6c767
```
  9eebb2df
30 Mar, 2013 1 commit

Adding MERGE notes · 4a327c5c

Jason R. Coombs authored Mar 30, 2013

--HG--
branch : Setuptools-Distribute merge
extra : source : c404c8580bd1450d84cc4f0f32245ebd1130bcfc

4a327c5c

20 Mar, 2013 2 commits

Remove newlines to simplify merge · 5b2e22a7

Jason R. Coombs authored Mar 19, 2013

--HG--
branch : Setuptools-Distribute merge
extra : source : 78b5054a6eefc60e57c76e14d968286fa8aa19c6

5b2e22a7

Copied changes from setuptools-0.6 for pkg_resources.py · 44e41d4b
Jason R. Coombs authored Mar 19, 2013
```
--HG--
branch : Setuptools-Distribute merge
extra : source : ead8ad8c5e5f750d70b7f040f61c0664a2128c1e
```
44e41d4b

11 May, 2013 1 commit
- This revision is where the distribute fork occurred · 1ec0efe5
  Jason R. Coombs authored May 11, 2013
```
--HG--
branch : Setuptools-Distribute merge
```
  1ec0efe5
20 Mar, 2013 1 commit

Revert README to match setuptools-0.6 · 79c654f4

Jason R. Coombs authored Mar 19, 2013

--HG--
branch : Setuptools-Distribute merge
extra : source : 5d3a4df9b11a90b744762470fc7b784ca5412da9

79c654f4

19 Mar, 2013 8 commits

Update test_distribute_setup to reference ez_setup.py · c49ceeb2

Jason R. Coombs authored Mar 19, 2013

--HG--
branch : Setuptools-Distribute merge
rename : tests/test_distribute_setup.py => tests/test_ez_setup.py
extra : rebase_source : d6fe218013147bd6a4e43220356d539d7764da11

c49ceeb2

Updated manual test to test against setuptools · 06b90a07

Jason R. Coombs authored Mar 19, 2013

--HG--
branch : Setuptools-Distribute merge
extra : rebase_source : ff968de5ea0e28052c0b53fecdcf0c348a6faf04

06b90a07

Removing install_test altogether (the only thing it tests is the presence of... · 45728d9b

Jason R. Coombs authored Mar 19, 2013

Removing install_test altogether (the only thing it tests is the presence of the deprecated setuptools._distribute attribute)

--HG--
branch : Setuptools-Distribute merge
extra : rebase_source : 05075288d1f0557ec75ceda127699ef8152a466f

45728d9b

Updated install_test to reference the new bootstrap script · 9418f48c
Jason R. Coombs authored Mar 19, 2013
```
--HG--
branch : Setuptools-Distribute merge
extra : rebase_source : ae9d4dbfa6770634bf65bba6f0b6f236074aa9d5
```
9418f48c
Updated a couple more references from Distribute to Setuptools · 7a12d0b7
Jason R. Coombs authored Mar 19, 2013
```
--HG--
branch : Setuptools-Distribute merge
extra : rebase_source : ad9f8f344d7e705ddc354757fbe741b34b576b1b
```
7a12d0b7

Removed tests relevant to the co-existence of distribute and setuptools;... · 6482552f

Jason R. Coombs authored Mar 19, 2013

Removed tests relevant to the co-existence of distribute and setuptools; retained some tests that are still relevant

--HG--
branch : Setuptools-Distribute merge
extra : rebase_source : c87a0b28f0bcd679ae5a34770b0f4fb908f2aee3

6482552f

Updated references in tests to refer to setuptools in favor of distribute · 0281ae61
Jason R. Coombs authored Mar 19, 2013
```
--HG--
branch : Setuptools-Distribute merge
extra : rebase_source : 1ffe834b5ecad0e5fd0ae44cb63e6541d9006004
```
0281ae61

Restore entry_points.txt in egg-info. This file must be present if one desires... · 5dd87320

Jason R. Coombs authored Mar 19, 2013

Restore entry_points.txt in egg-info. This file must be present if one desires to build or install setuptools on a system which doesn't already have some form of setuptools installed (such as a clean Python installation that has just cloned setuptools). This file could be omitted if we choose to only support installing via a setuptools-built sdist

--HG--
branch : Setuptools-Distribute merge
extra : source : a267228055f4402890b8143c6e9be5ea8074037e

5dd87320

10 Mar, 2013 3 commits
- Removed references to removed methods in ez_setup · 74ac500d
  Jason R. Coombs authored Mar 10, 2013
```
--HG--
branch : Setuptools-Distribute merge
extra : source : 4b38838e17b59d3705735e111219e20d89632481
```
  74ac500d
- Removed more distribute-specific, anti-setuptools code in setup.py · cfd4a052
  Jason R. Coombs authored Mar 10, 2013
```
--HG--
branch : Setuptools-Distribute merge
extra : source : 8efeb91ad396dc12014a3992fc458cdb1fc35206
```
  cfd4a052
- Remove references to distribute in setup.py · c1767ecf
  Jason R. Coombs authored Mar 10, 2013
```
--HG--
branch : Setuptools-Distribute merge
extra : source : bee46cf41b11c416b5597c616bac574b8a83de0e
```
  c1767ecf