Patchwork D6101: wix: remove enum and future packages

login
register
mail settings
Submitter phabricator
Date March 8, 2019, 6:50 p.m.
Message ID <differential-rev-PHID-DREV-3i52msld2cd5v5izx2cs-req@phab.mercurial-scm.org>
Download mbox | patch
Permalink /patch/39151/
State Superseded
Headers show

Comments

phabricator - March 8, 2019, 6:50 p.m.
indygreg created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  These were cargo culted from the THG installer code. I'm not sure
  what needs them in THG land. But the official MSIs certainly do
  not - at least not as direct dependencies.
  
  .. bc::
  
    The Windows MSI installers no longer include the enum and future
    Python packages.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D6101

AFFECTED FILES
  contrib/packaging/hgpackaging/wix.py
  contrib/packaging/wix/requirements.txt
  contrib/packaging/wix/requirements.txt.in

CHANGE DETAILS




To: indygreg, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/contrib/packaging/wix/requirements.txt.in b/contrib/packaging/wix/requirements.txt.in
--- a/contrib/packaging/wix/requirements.txt.in
+++ b/contrib/packaging/wix/requirements.txt.in
@@ -1,4 +1,2 @@ 
 docutils
-enum

-future

 pygments
diff --git a/contrib/packaging/wix/requirements.txt b/contrib/packaging/wix/requirements.txt
--- a/contrib/packaging/wix/requirements.txt
+++ b/contrib/packaging/wix/requirements.txt
@@ -8,10 +8,6 @@ 
     --hash=sha256:02aec4bd92ab067f6ff27a38a38a41173bf01bed8f89157768c1573f53e474a6 \
     --hash=sha256:51e64ef2ebfb29cae1faa133b3710143496eca21c530f3f71424d77687764274 \
     --hash=sha256:7a4bd47eaf6596e1295ecb11361139febe29b084a87bf005bf899f9a42edc3c6
-enum==0.4.7 \
-    --hash=sha256:8c7cf3587eda51008bcc1eed99ea2c331ccd265c231dbaa95ec5258d3dc03100

-future==0.17.1 \
-    --hash=sha256:67045236dcfd6816dc439556d009594abf643e5eb48992e36beac09c2ca659b8

 pygments==2.3.1 \
     --hash=sha256:5ffada19f6203563680669ee7f53b64dabbeb100eb51b61996085e99c03b284a \
     --hash=sha256:e8218dd399a61674745138520d0d4cf2621d7e032439341bc3f647bff125818d
diff --git a/contrib/packaging/hgpackaging/wix.py b/contrib/packaging/hgpackaging/wix.py
--- a/contrib/packaging/hgpackaging/wix.py
+++ b/contrib/packaging/hgpackaging/wix.py
@@ -37,7 +37,6 @@ 
 
 EXTRA_PACKAGES = {
     'distutils',
-    'enum',

     'pygments',
 }