Browse Source

Fix series order

Ian Neal 4 months ago
parent
commit
29e36bbc6f

+ 7 - 7
mozilla-release/patches/1662851-82a1.patch

@@ -2,7 +2,7 @@
 # User Mihai Alexandru Michis <malexandru@mozilla.com>
 # Date 1599084040 -10800
 # Node ID bd1d767af16196cff7e7ba1866f335a137670995
-# Parent  1bde9f39d7e178e052b367c82158592d1964ae20
+# Parent  e4b873e8e661b401c5f46ed00b57f56776de5856
 Bug 1662851 - Un-vendor `pipenv` and `virtualenv-clone` in tree
 
 CLOSED TREE
@@ -352163,9 +352163,9 @@ deleted file mode 100644
 diff --git a/third_party/python/requirements.in b/third_party/python/requirements.in
 --- a/third_party/python/requirements.in
 +++ b/third_party/python/requirements.in
-@@ -26,17 +26,16 @@ ecdsa==0.15
- fluent.migrate==0.10
- fluent.syntax==0.18.1
+@@ -25,17 +25,16 @@ distro==1.4.0
+ ecdsa==0.15
+ fluent.migrate==0.9
  jsmin==2.1.0
  json-e==2.7.0
  packaging==21.0
@@ -352199,9 +352199,9 @@ diff --git a/third_party/python/requirements.txt b/third_party/python/requiremen
      --hash=sha256:2335065e6395b9e67ca716de5f7526736bfa6ceead690adf616d925bdc622b13 \
      --hash=sha256:5b94b49521f6456670fdb30cd82a4eca9412788a93fa6dd6df72c94d5a8ff2d7 \
      # via pip-tools
- compare-locales==8.1.0 \
-     --hash=sha256:286270797ce64f7a2f25e734bb437870661409884a4f0971c0bb94fdad6c1f35 \
-     --hash=sha256:3d374ff959d5de2cfd5b94caf6b0fa61445f1d8ede5af384002cb3542aacad3a \
+ compare-locales==8.0.0 \
+     --hash=sha256:077b007bd2c025284f73994970e7fada7fbdcbb4199ff010e378b305dee6d469 \
+     --hash=sha256:ee02bdad012cdc9f6c6df24d7518ba2c5084f6bac0d176b4826156accc8d48d6 \
      # via -r requirements-mach-vendor-python.in, fluent.migrate
 @@ -98,20 +98,16 @@ pathlib2==2.3.2 \
  pathspec==0.8 \

+ 4 - 4
mozilla-release/patches/1666232-83a1.patch

@@ -2,7 +2,7 @@
 # User Stas Malolepszy <stas@mozilla.com>
 # Date 1600691202 0
 # Node ID 08e86ba18177437431a33a712956aa4c3dc91120
-# Parent  c8c36b01e25bf5491b4fa20319b3473bfdd886a3
+# Parent  05c6b21850413709a31a4830b0eed24a217ce172
 Bug 1666232 - Vendor fluent.syntax 0.18.1, fluent.migrate 0.10, compare-locales 8.1.0. r=flod
 
 Differential Revision: https://phabricator.services.mozilla.com/D90851
@@ -1105,8 +1105,8 @@ diff --git a/third_party/python/requirements.in b/third_party/python/requirement
  pathlib2==2.3.2
  pathspec==0.8
  pip-tools==4.5.1
- pipenv==2020.06.02
  ply==3.10
+ psutil==5.7.0
 diff --git a/third_party/python/requirements.txt b/third_party/python/requirements.txt
 --- a/third_party/python/requirements.txt
 +++ b/third_party/python/requirements.txt
@@ -1114,7 +1114,7 @@ diff --git a/third_party/python/requirements.txt b/third_party/python/requiremen
  certifi==2018.4.16 \
      --hash=sha256:13e698f54293db9f89122b0581843a782ad0934a4fe0172d2a980ba77fc61bb7 \
      --hash=sha256:9fa520c1bacfb634fa7af20a76bcbd3d5fb390481724c597da32c719a7dca4b0 \
-     # via pipenv
+     # via sentry-sdk
  click==7.0 \
      --hash=sha256:2335065e6395b9e67ca716de5f7526736bfa6ceead690adf616d925bdc622b13 \
      --hash=sha256:5b94b49521f6456670fdb30cd82a4eca9412788a93fa6dd6df72c94d5a8ff2d7 \
@@ -1166,7 +1166,7 @@ diff --git a/third_party/python/requirements.txt b/third_party/python/requiremen
      # via -r requirements-mach-vendor-python.in
  more-itertools==4.3.0 \
      --hash=sha256:c187a73da93e7a8acc0001572aebc7e3c69daf7bf6881a2cea10650bd4420092 \
-@@ -201,10 +201,9 @@ voluptuous==0.11.5 \
+@@ -193,10 +193,9 @@ voluptuous==0.11.5 \
      # via -r requirements-mach-vendor-python.in
  yamllint==1.23 \
      --hash=sha256:0fa69bf8a86182b7fe14918bdd3a30354c869966bbc7cbfff176af71bda9c806 \

+ 1 - 1
mozilla-release/patches/series

@@ -6999,8 +6999,8 @@ TOP-NOBUG-seamonkey-credits.patch
 1659411-1-81a1.patch
 1659411-2-81a1.patch
 1659542-82a1.patch
-1666232-83a1.patch
 1662851-82a1.patch
+1666232-83a1.patch
 1666347-85a1.patch
 1680051-85a1.patch
 1712819-1-90a1.patch