- added support for Python 3.9

- updated public suffix list
- ci workflows updates
- tsl robin map updates

Author: Gal Ben David

.github/workflows/build.yml

@@ -6,18 +6,18 @@ jobs:
     if: github.event_name == 'push' && !startsWith(github.event.ref, 'refs/tags')
     runs-on: ubuntu-20.04
     strategy:
-      max-parallel: 4
       matrix:
-        python-version: [3.6, 3.7, 3.8, pypy3]
+        python-version: [3.6, 3.7, 3.8, 3.9, pypy3]
     steps:
-    - uses: actions/checkout@v1
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v1
-      with:
-        python-version: ${{ matrix.python-version }}
-    - name: Install Ubuntu packages
-      run: >-
-        sudo apt install libidn2-dev;
-    - name: Test module
-      run: >-
-        python setup.py test
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Install Ubuntu packages
+        run: >-
+          sudo apt install libidn2-dev;
+      - name: Test
+        run: >-
+          python setup.py test

.github/workflows/deploy.yml

@@ -7,16 +7,17 @@ jobs:
   deploy:
     runs-on: ubuntu-20.04
     steps:
-    - uses: actions/checkout@v1
-    - name: Set up Python 3.8
-      uses: actions/setup-python@v1
-      with:
-        python-version: 3.8
-    - name: Build a source tarball
-      run: >-
-        python -m pip install --user --upgrade setuptools;
-        python setup.py sdist;
-    - name: Publish distribution 📦 to PyPI
-      uses: pypa/gh-action-pypi-publish@master
-      with:
-        password: ${{ secrets.pypi_password }}
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Set up Python 3.8
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.8
+      - name: Build a source tarball
+        run: >-
+          python -m pip install --user --upgrade setuptools;
+          python setup.py sdist;
+      - name: Publish distribution 📦 to PyPI
+        uses: pypa/gh-action-pypi-publish@master
+        with:
+          password: ${{ secrets.pypi_password }}

README.md

@@ -8,7 +8,7 @@
 </p>
 
 ![license](https://img.shields.io/badge/MIT-License-blue)
-![Python](https://img.shields.io/badge/Python-3.6%20%7C%203.7%20%7C%203.8%20%7C%20PyPy3-blue)
+![Python](https://img.shields.io/badge/Python-3.6%20%7C%203.7%20%7C%203.8%20%7C%203.9%20%7C%20PyPy3-blue)
 ![Build](https://github.com/Intsights/PyDomainExtractor/workflows/Build/badge.svg)
 [![PyPi](https://img.shields.io/pypi/v/PyDomainExtractor.svg)](https://pypi.org/project/PyDomainExtractor/)
 

setup.py

@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name='PyDomainExtractor',
-    version='0.8.3',
+    version='0.8.4',
     author='Gal Ben David',
     author_email='[email protected]',
     url='https://github.com/Intsights/PyDomainExtractor',
@@ -21,6 +21,7 @@
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
+        'Programming Language :: Python :: 3.9',
     ],
     keywords='domain extraction tld suffix psl c++',
     python_requires='>=3.6',

src/public_suffix_list.h

@@ -912,16 +912,18 @@ org.do
 sld.do
 web.do
 
-// dz : https://en.wikipedia.org/wiki/.dz
+// dz : http://www.nic.dz/images/pdf_nic/charte.pdf
 dz
+art.dz
+asso.dz
 com.dz
+edu.dz
+gov.dz
 org.dz
 net.dz
-gov.dz
-edu.dz
-asso.dz
 pol.dz
-art.dz
+soc.dz
+tm.dz
 
 // ec : http://www.nic.ec/reg/paso1.asp
 // Submitted by registry <[email protected]>
@@ -4702,27 +4704,26 @@ web.ni
 //      ccTLD for the Netherlands
 nl
 
-// no : http://www.norid.no/regelverk/index.en.html
-// The Norwegian registry has declined to notify us of updates. The web pages
-// referenced below are the official source of the data. There is also an
-// announce mailing list:
-// https://postlister.uninett.no/sympa/info/norid-diskusjon
+// no : https://www.norid.no/en/om-domenenavn/regelverk-for-no/
+// Norid geographical second level domains : https://www.norid.no/en/om-domenenavn/regelverk-for-no/vedlegg-b/
+// Norid category second level domains : https://www.norid.no/en/om-domenenavn/regelverk-for-no/vedlegg-c/
+// Norid category second-level domains managed by parties other than Norid : https://www.norid.no/en/om-domenenavn/regelverk-for-no/vedlegg-d/
 no
-// Norid generic domains : http://www.norid.no/regelverk/vedlegg-c.en.html
+// Norid category second level domains : https://www.norid.no/en/om-domenenavn/regelverk-for-no/vedlegg-c/
 fhs.no
 vgs.no
 fylkesbibl.no
 folkebibl.no
 museum.no
 idrett.no
 priv.no
-// Non-Norid generic domains : http://www.norid.no/regelverk/vedlegg-d.en.html
+// Norid category second-level domains managed by parties other than Norid : https://www.norid.no/en/om-domenenavn/regelverk-for-no/vedlegg-d/
 mil.no
 stat.no
 dep.no
 kommune.no
 herad.no
-// no geographical names : http://www.norid.no/regelverk/vedlegg-b.en.html
+// Norid geographical second level domains : https://www.norid.no/en/om-domenenavn/regelverk-for-no/vedlegg-b/
 // counties
 aa.no
 ah.no
@@ -7114,7 +7115,7 @@ org.zw
 
 // newGTLDs
 
-// List of new gTLDs imported from https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on 2020-09-17T17:33:58Z
+// List of new gTLDs imported from https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on 2020-10-08T17:45:32Z
 // This list is auto-generated, don't edit it manually.
 // aaa : 2015-02-26 American Automobile Association, Inc.
 aaa
@@ -8613,9 +8614,6 @@ insurance
 // insure : 2014-03-20 Binky Moon, LLC
 insure
 
-// intel : 2015-08-06 Intel Corporation
-intel
-
 // international : 2013-11-07 Binky Moon, LLC
 international
 
@@ -10245,9 +10243,6 @@ weber
 // website : 2014-04-03 DotWebsite Inc.
 website
 
-// wed : 2013-10-01 Atgron, Inc.
-wed
-
 // wedding : 2014-04-24 Minds + Machines Group Limited
 wedding
 
@@ -10458,7 +10453,7 @@ xin
 // xn--fzys8d69uvgm : 2015-05-14 PCCW Enterprises Limited
 電訊盈科
 
-// xn--g2xx48c : 2015-01-30 Minds + Machines Group Limited
+// xn--g2xx48c : 2015-01-30 Nawang Heli(Xiamen) Network Service Co., LTD.
 购物
 
 // xn--gckr3f0f : 2015-02-26 Amazon Registry Services, Inc.
@@ -11237,6 +11232,10 @@ drud.us
 // Submitted by Richard Harper <[email protected]>
 duckdns.org
 
+// Bip : https://bip.sh
+// Submitted by Joel Kennedy <[email protected]>
+bip.sh
+
 // bitbridge.net : Submitted by Craig Welch, [email protected]
 bitbridge.net
 
@@ -11588,6 +11587,10 @@ mytuleap.com
 onred.one
 staging.onred.one
 
+// One.com: https://www.one.com/
+// Submitted by Jacob Bunk Nielsen <[email protected]>
+service.one
+
 // Enonic : http://enonic.com/
 // Submitted by Erik Kaareng-Sunde <[email protected]>
 enonic.io
@@ -11926,6 +11929,17 @@ web.app
 *.0emm.com
 appspot.com
 *.r.appspot.com
+codespot.com
+googleapis.com
+googlecode.com
+pagespeedmobilizer.com
+publishproxy.com
+withgoogle.com
+withyoutube.com
+cloudfunctions.net
+cloud.goog
+translate.goog
+
 blogspot.ae
 blogspot.al
 blogspot.am
@@ -12000,15 +12014,6 @@ blogspot.td
 blogspot.tw
 blogspot.ug
 blogspot.vn
-cloudfunctions.net
-cloud.goog
-codespot.com
-googleapis.com
-googlecode.com
-pagespeedmobilizer.com
-publishproxy.com
-withgoogle.com
-withyoutube.com
 
 // Aaron Marais' Gitlab pages: https://lab.aaronleem.co.za
 // Submitted by Aaron Marais <[email protected]>
@@ -12146,6 +12151,10 @@ pixolino.com
 // Submited by Vasiliy Sheredeko <[email protected]>
 na4u.ru
 
+// iopsys software solutions AB : https://iopsys.eu/
+// Submitted by Roman Azarenko <[email protected]>
+iopsys.se
+
 // IPiFony Systems, Inc. : https://www.ipifony.com/
 // Submitted by Matthew Hardeman <[email protected]>
 ipifony.net
@@ -12163,29 +12172,92 @@ iobb.net
 
 //Jelastic, Inc. : https://jelastic.com/
 // Submited by Ihor Kolodyuk <[email protected]>
+mel.cloudlets.com.au
+cloud.interhostsolutions.be
+users.scale.virtualcloud.com.br
+mycloud.by
+alp1.ae.flow.ch
 appengine.flow.ch
+es-1.axarnet.cloud
+diadem.cloud
 vip.jelastic.cloud
 jele.cloud
+it1.eur.aruba.jenv-aruba.cloud
+it1.jenv-aruba.cloud
+it1-eur.jenv-arubabiz.cloud
+primetel.cloud
+uk.primetel.cloud
+ca.reclaim.cloud
+uk.reclaim.cloud
+us.reclaim.cloud
+ch.trendhosting.cloud
+de.trendhosting.cloud
 jele.club
+clicketcloud.com
+ams.cloudswitches.com
+au.cloudswitches.com
+sg.cloudswitches.com
 dopaas.com
+elastyco.com
+nv.elastyco.com
 hidora.com
+paas.hosted-by-previder.com
+rag-cloud.hosteur.com
+rag-cloud-ch.hosteur.com
 jcloud.ik-server.com
+jcloud-ver-jpc.ik-server.com
 demo.jelastic.com
+kilatiron.com
 paas.massivegrid.com
+jed.wafaicloud.com
+lon.wafaicloud.com
+ryd.wafaicloud.com
 j.scaleforce.com.cy
 jelastic.dogado.eu
+paas.leviracloud.eu
 fi.cloudplatform.fi
+demo.datacenter.fi
 paas.datacenter.fi
 jele.host
 mircloud.host
 jele.io
+ocs.opusinteractive.io
+cloud.unispace.io
+cloud-de.unispace.io
+cloud-fr1.unispace.io
+jc.neen.it
+cloud.jelastic.open.tim.it
+jcloud.kz
+upaas.kazteleport.kz
+jl.serv.net.mx
 cloudjiffy.net
+fra1-de.cloudjiffy.net
+west1-us.cloudjiffy.net
+ams1.jls.docktera.net
 jls-sto1.elastx.net
+jls-sto2.elastx.net
+jls-sto3.elastx.net
+fr-1.paas.massivegrid.net
+lon-1.paas.massivegrid.net
+lon-2.paas.massivegrid.net
+ny-1.paas.massivegrid.net
+ny-2.paas.massivegrid.net
+sg-1.paas.massivegrid.net
 jelastic.saveincloud.net
+nordeste-idc.saveincloud.net
+j.scaleforce.net
+jelastic.tsukaeru.net
+atl.jelastic.vps-host.net
+njs.jelastic.vps-host.net
+unicloud.pl
+mircloud.ru
 jelastic.regruhosting.ru
+enscaled.sg
 jele.site
 jelastic.team
 j.layershift.co.uk
+phx.enscaled.us
+mircloud.us
 
 // Jino : https://www.jino.ru
 // Submitted by Sergey Ulyashin <[email protected]>
@@ -12279,6 +12351,10 @@ members.linode.com
 // Submitted by Victor Velchev <[email protected]>
 we.bs
 
+// localzone.xyz
+// Submitted by Kenny Niehage <[email protected]>
+localzone.xyz
+
 // Log'in Line : https://www.loginline.com/
 // Submitted by Rémi Mach <[email protected]>
 loginline.app
@@ -13115,6 +13191,7 @@ cust.testing.thingdust.io
 // Submitted by Mark Staarink <[email protected]>
 arvo.network
 azimuth.network
+tlon.network
 
 // TownNews.com : http://www.townnews.com
 // Submitted by Dustin Ward <[email protected]>
@@ -13268,6 +13345,15 @@ v.ua
 // Submitted by Masayuki Note <[email protected]>
 wafflecell.com
 
+// WapBlog.ID : https://www.wapblog.id
+// Submitted by Fajar Sodik <[email protected]>
+idnblogger.com
+indowapblog.com
+bloghp.id
+wblog.id
+wbq.me
+fastblog.net
+
 // WebHare bv: https://www.webhare.com/
 // Submitted by Arnold Hendriks <[email protected]>
 *.webhare.dev
@@ -13379,7 +13465,9 @@ cx.ua
 
 // WP Engine : https://wpengine.com/
 // Submitted by Michael Smith <[email protected]>
+// Submitted by Brandon DuRette <[email protected]>
 wpenginepowered.com
+js.wpenginepowered.com
 
 // Impertrix Solutions : <https://impertrixcdn.com>
 // Submitted by Zhixiang Zhao <[email protected]>