Merge 9d9cace into 913058a

.taskcluster.yml

@@ -81,8 +81,6 @@ tasks:
           $map:
             - short_name: py27
               image_tag: '2.7'
-            - short_name: py36
-              image_tag: '3.6'
             - short_name: py37
               image_tag: '3.7'
             - short_name: docs-localbuild

.travis.yml

@@ -9,9 +9,6 @@ matrix:
     - python: 2.7
       env: TOXENV=py27
 
-    - python: 3.6
-      env: TOXENV=py36
-
     - python: 3.7
       env: TOXENV=py37
 

mozilla_version/balrog.py

@@ -63,7 +63,7 @@ def checker(this, other):
     return checker
 
 
-@attr.s(frozen=True, cmp=False, hash=True)
+@attr.s(frozen=True, eq=False, hash=True)
 class BalrogReleaseName(object):
     """Class that validates and handles Balrog release names.
 

mozilla_version/fenix.py

@@ -32,7 +32,7 @@ def ensure_version_type_is_not_already_defined(previous_type, candidate_type):
     return version_type
 
 
-@attr.s(frozen=True, cmp=False, hash=True)
+@attr.s(frozen=True, eq=False, hash=True)
 class FenixVersion(BaseVersion):
     """Class that validates and handles Fenix version numbers."""
 

mozilla_version/gecko.py

@@ -91,7 +91,7 @@ def ensure_version_type_is_not_already_defined(previous_type, candidate_type):
     return version_type
 
 
-@attr.s(frozen=True, cmp=False, hash=True)
+@attr.s(frozen=True, eq=False, hash=True)
 class GeckoVersion(BaseVersion):
     """Class that validates and handles version numbers for Gecko-based products.
 

mozilla_version/maven.py

@@ -6,7 +6,7 @@
 from mozilla_version.version import BaseVersion
 
 
-@attr.s(frozen=True, cmp=False, hash=True)
+@attr.s(frozen=True, eq=False, hash=True)
 class MavenVersion(BaseVersion):
     """Class that validates and handles Maven version numbers.
 

mozilla_version/version.py

@@ -15,7 +15,7 @@
 )
 
 
-@attr.s(frozen=True, cmp=False, hash=True)
+@attr.s(frozen=True, eq=False, hash=True)
 class BaseVersion(object):
     """Class that validates and handles general version numbers."""
 

requirements/base_py2.txt

@@ -5,9 +5,9 @@
 #
 #    pip-compile-multi
 #
-attrs==19.1.0 \
-    --hash=sha256:69c0dbf2ed392de1cb5ec704444b08a5ef81680a61cb899dc08127123af36a79 \
-    --hash=sha256:f0b870f674851ecbfbbbd364d6b5cbdff9dcedbc7f3f5e18a6891057f21fe399
+attrs==19.3.0 \
+    --hash=sha256:08a96c641c3a74e44eb59afb61a24f2cb9f4d7188748e76ba4bb5edfa3cb7d1c \
+    --hash=sha256:f7b7ce16570fe9965acd6d30101a28f62fb4a7f9e926b3bbc9b61f8b04247e72
 enum34==1.1.6 ; python_version < "3.4" --hash=sha256:2d81cbbe0e73112bdfe6ef8576f2238f2ba27dd0d55752a776c41d38b7da2850 --hash=sha256:644837f692e5f550741432dd3f223bbb9852018674981b1664e5dc339387588a --hash=sha256:6bd0f6ad48ec2aa117d3d141940d484deccda84d4fcd884f5c3d93c23ecd8c79 --hash=sha256:8ad8c4783bf61ded74527bffb48ed9b54166685e4230386a9ed9b1279e2df5b1
-future==0.17.1 \
-    --hash=sha256:67045236dcfd6816dc439556d009594abf643e5eb48992e36beac09c2ca659b8
+future==0.18.2 \
+    --hash=sha256:b1bead90b70cf6ec3f0710ae53a525360fa360d306a86583adc6bf83a4db537d

requirements/base_py3.in

@@ -1,2 +1,2 @@
-attrs
+attrs>=19.2
 future

requirements/base_py3.txt

@@ -1,12 +1,12 @@
-# SHA1:2006a587b3627235f59745a95c6221342b0203ce
+# SHA1:ca7e8a28d233311bc4a6815dd11817413b18e563
 #
 # This file is autogenerated by pip-compile-multi
 # To update, run:
 #
 #    pip-compile-multi
 #
-attrs==19.1.0 \
-    --hash=sha256:69c0dbf2ed392de1cb5ec704444b08a5ef81680a61cb899dc08127123af36a79 \
-    --hash=sha256:f0b870f674851ecbfbbbd364d6b5cbdff9dcedbc7f3f5e18a6891057f21fe399
-future==0.17.1 \
-    --hash=sha256:67045236dcfd6816dc439556d009594abf643e5eb48992e36beac09c2ca659b8
+attrs==19.3.0 \
+    --hash=sha256:08a96c641c3a74e44eb59afb61a24f2cb9f4d7188748e76ba4bb5edfa3cb7d1c \
+    --hash=sha256:f7b7ce16570fe9965acd6d30101a28f62fb4a7f9e926b3bbc9b61f8b04247e72
+future==0.18.2 \
+    --hash=sha256:b1bead90b70cf6ec3f0710ae53a525360fa360d306a86583adc6bf83a4db537d

requirements/coveralls.txt

@@ -5,50 +5,50 @@
 #
 #    pip-compile-multi
 #
-certifi==2019.6.16 \
-    --hash=sha256:046832c04d4e752f37383b628bc601a7ea7211496b4638f6514d0e5b9acc4939 \
-    --hash=sha256:945e3ba63a0b9f577b1395204e13c3a231f9bc0223888be653286534e5873695 \
+certifi==2019.11.28 \
+    --hash=sha256:017c25db2a153ce562900032d5bc68e9f191e44e9a0f762f373977de9df1fbb3 \
+    --hash=sha256:25b64c7da4cd7479594d035c08c2d809eb4aab3a26e5a990ea98cc450c320f1f \
     # via requests
 chardet==3.0.4 \
     --hash=sha256:84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae \
     --hash=sha256:fc323ffcaeaed0e0a02bf4d117757b98aed530d9ed4531e3e15460124c106691 \
     # via requests
-coverage==4.5.3 \
-    --hash=sha256:3684fabf6b87a369017756b551cef29e505cb155ddb892a7a29277b978da88b9 \
-    --hash=sha256:39e088da9b284f1bd17c750ac672103779f7954ce6125fd4382134ac8d152d74 \
-    --hash=sha256:3c205bc11cc4fcc57b761c2da73b9b72a59f8d5ca89979afb0c1c6f9e53c7390 \
-    --hash=sha256:465ce53a8c0f3a7950dfb836438442f833cf6663d407f37d8c52fe7b6e56d7e8 \
-    --hash=sha256:48020e343fc40f72a442c8a1334284620f81295256a6b6ca6d8aa1350c763bbe \
-    --hash=sha256:5296fc86ab612ec12394565c500b412a43b328b3907c0d14358950d06fd83baf \
-    --hash=sha256:5f61bed2f7d9b6a9ab935150a6b23d7f84b8055524e7be7715b6513f3328138e \
-    --hash=sha256:68a43a9f9f83693ce0414d17e019daee7ab3f7113a70c79a3dd4c2f704e4d741 \
-    --hash=sha256:6b8033d47fe22506856fe450470ccb1d8ba1ffb8463494a15cfc96392a288c09 \
-    --hash=sha256:7ad7536066b28863e5835e8cfeaa794b7fe352d99a8cded9f43d1161be8e9fbd \
-    --hash=sha256:7bacb89ccf4bedb30b277e96e4cc68cd1369ca6841bde7b005191b54d3dd1034 \
-    --hash=sha256:839dc7c36501254e14331bcb98b27002aa415e4af7ea039d9009409b9d2d5420 \
-    --hash=sha256:8f9a95b66969cdea53ec992ecea5406c5bd99c9221f539bca1e8406b200ae98c \
-    --hash=sha256:932c03d2d565f75961ba1d3cec41ddde00e162c5b46d03f7423edcb807734eab \
-    --hash=sha256:988529edadc49039d205e0aa6ce049c5ccda4acb2d6c3c5c550c17e8c02c05ba \
-    --hash=sha256:998d7e73548fe395eeb294495a04d38942edb66d1fa61eb70418871bc621227e \
-    --hash=sha256:9de60893fb447d1e797f6bf08fdf0dbcda0c1e34c1b06c92bd3a363c0ea8c609 \
-    --hash=sha256:9e80d45d0c7fcee54e22771db7f1b0b126fb4a6c0a2e5afa72f66827207ff2f2 \
-    --hash=sha256:a545a3dfe5082dc8e8c3eb7f8a2cf4f2870902ff1860bd99b6198cfd1f9d1f49 \
-    --hash=sha256:a5d8f29e5ec661143621a8f4de51adfb300d7a476224156a39a392254f70687b \
-    --hash=sha256:aca06bfba4759bbdb09bf52ebb15ae20268ee1f6747417837926fae990ebc41d \
-    --hash=sha256:bb23b7a6fd666e551a3094ab896a57809e010059540ad20acbeec03a154224ce \
-    --hash=sha256:bfd1d0ae7e292105f29d7deaa9d8f2916ed8553ab9d5f39ec65bcf5deadff3f9 \
-    --hash=sha256:c62ca0a38958f541a73cf86acdab020c2091631c137bd359c4f5bddde7b75fd4 \
-    --hash=sha256:c709d8bda72cf4cd348ccec2a4881f2c5848fd72903c185f363d361b2737f773 \
-    --hash=sha256:c968a6aa7e0b56ecbd28531ddf439c2ec103610d3e2bf3b75b813304f8cb7723 \
-    --hash=sha256:df785d8cb80539d0b55fd47183264b7002077859028dfe3070cf6359bf8b2d9c \
-    --hash=sha256:f406628ca51e0ae90ae76ea8398677a921b36f0bd71aab2099dfed08abd0322f \
-    --hash=sha256:f46087bbd95ebae244a0eda01a618aff11ec7a069b15a3ef8f6b520db523dcf1 \
-    --hash=sha256:f8019c5279eb32360ca03e9fac40a12667715546eed5c5eb59eb381f2f501260 \
-    --hash=sha256:fc5f4d209733750afd2714e9109816a29500718b32dd9a5db01c0cb3a019b96a \
+coverage==5.0.1 \
+    --hash=sha256:0101888bd1592a20ccadae081ba10e8b204d20235d18d05c6f7d5e904a38fc10 \
+    --hash=sha256:04b961862334687549eb91cd5178a6fbe977ad365bddc7c60f2227f2f9880cf4 \
+    --hash=sha256:1ca43dbd739c0fc30b0a3637a003a0d2c7edc1dd618359d58cc1e211742f8bd1 \
+    --hash=sha256:1cbb88b34187bdb841f2599770b7e6ff8e259dc3bb64fc7893acf44998acf5f8 \
+    --hash=sha256:232f0b52a5b978288f0bbc282a6c03fe48cd19a04202df44309919c142b3bb9c \
+    --hash=sha256:24bcfa86fd9ce86b73a8368383c39d919c497a06eebb888b6f0c12f13e920b1a \
+    --hash=sha256:25b8f60b5c7da71e64c18888f3067d5b6f1334b9681876b2fb41eea26de881ae \
+    --hash=sha256:2714160a63da18aed9340c70ed514973971ee7e665e6b336917ff4cca81a25b1 \
+    --hash=sha256:2ca2cd5264e84b2cafc73f0045437f70c6378c0d7dbcddc9ee3fe192c1e29e5d \
+    --hash=sha256:2cc707fc9aad2592fc686d63ef72dc0031fc98b6fb921d2f5395d9ab84fbc3ef \
+    --hash=sha256:348630edea485f4228233c2f310a598abf8afa5f8c716c02a9698089687b6085 \
+    --hash=sha256:40fbfd6b044c9db13aeec1daf5887d322c710d811f944011757526ef6e323fd9 \
+    --hash=sha256:46c9c6a1d1190c0b75ec7c0f339088309952b82ae8d67a79ff1319eb4e749b96 \
+    --hash=sha256:591506e088901bdc25620c37aec885e82cc896528f28c57e113751e3471fc314 \
+    --hash=sha256:5ac71bba1e07eab403b082c4428f868c1c9e26a21041436b4905c4c3d4e49b08 \
+    --hash=sha256:5f622f19abda4e934938e24f1d67599249abc201844933a6f01aaa8663094489 \
+    --hash=sha256:65bead1ac8c8930cf92a1ccaedcce19a57298547d5d1db5c9d4d068a0675c38b \
+    --hash=sha256:7362a7f829feda10c7265b553455de596b83d1623b3d436b6d3c51c688c57bf6 \
+    --hash=sha256:7f2675750c50151f806070ec11258edf4c328340916c53bac0adbc465abd6b1e \
+    --hash=sha256:960d7f42277391e8b1c0b0ae427a214e1b31a1278de6b73f8807b20c2e913bba \
+    --hash=sha256:a50b0888d8a021a3342d36a6086501e30de7d840ab68fca44913e97d14487dc1 \
+    --hash=sha256:b7dbc5e8c39ea3ad3db22715f1b5401cd698a621218680c6daf42c2f9d36e205 \
+    --hash=sha256:bb3d29df5d07d5399d58a394d0ef50adf303ab4fbf66dfd25b9ef258effcb692 \
+    --hash=sha256:c0fff2733f7c2950f58a4fd09b5db257b00c6fec57bf3f68c5bae004d804b407 \
+    --hash=sha256:c792d3707a86c01c02607ae74364854220fb3e82735f631cd0a345dea6b4cee5 \
+    --hash=sha256:c90bda74e16bcd03861b09b1d37c0a4158feda5d5a036bb2d6e58de6ff65793e \
+    --hash=sha256:cfce79ce41cc1a1dc7fc85bb41eeeb32d34a4cf39a645c717c0550287e30ff06 \
+    --hash=sha256:eeafb646f374988c22c8e6da5ab9fb81367ecfe81c70c292623373d2a021b1a1 \
+    --hash=sha256:f425f50a6dd807cb9043d15a4fcfba3b5874a54d9587ccbb748899f70dc18c47 \
+    --hash=sha256:fcd4459fe35a400b8f416bc57906862693c9f88b66dc925e7f2a933e77f6b18b \
+    --hash=sha256:ff3936dd5feaefb4f91c8c1f50a06c588b5dc69fba4f7d9c79a6617ad80bb7df \
     # via coveralls
-coveralls==1.8.1 \
-    --hash=sha256:d3d49234bffd41e91b241a69f0ebb9f64d7f0515711a76134d53d4647e7eb509 \
-    --hash=sha256:dafabcff87425fa2ab3122dee21229afbb4d6692cfdacc6bb895f7dfa8b2c849
+coveralls==1.10.0 \
+    --hash=sha256:2da39aeaef986757653f0a442ba2bef22a8ec602c8bacbc69d39f468dfae12ec \
+    --hash=sha256:906e07a12b2ac04b8ad782d06173975fe5ff815fe9df3bfedd2c099bc5791aec
 docopt==0.6.2 \
     --hash=sha256:49b3a825280bd66b3aa83585ef59c4a8c82f2c8a522dbe754a8bc8d08c85c491 \
     # via coveralls
@@ -60,7 +60,7 @@ requests==2.22.0 \
     --hash=sha256:11e007a8a2aa0323f5a921e9e6a2d7e4e67d9877e85773fba9ba6419025cbeb4 \
     --hash=sha256:9cf5292fcd0f598c671cfc1e0d7d1a7f13bb8085e9a590f48c010551dc6c4b31 \
     # via coveralls
-urllib3==1.25.3 \
-    --hash=sha256:b246607a25ac80bedac05c6f282e3cdaf3afb65420fd024ac94435cabe6e18d1 \
-    --hash=sha256:dbe59173209418ae49d485b87d1681aefa36252ee85884c31346debd19463232 \
+urllib3==1.25.7 \
+    --hash=sha256:a8a318824cc77d1fd4b2bec2ded92646630d7fe8619497b142c84a9e6f5a7293 \
+    --hash=sha256:f3c5fd51747d450d4dcf6f923c81f78f811aab8205fda64b0aba34a4e48b0745 \
     # via requests