upload source distribution to support more platforms. remove once_cell dependency. update suffix list

Author: Gal Ben David

.github/workflows/deploy.yml

@@ -35,6 +35,6 @@ jobs:
         uses: messense/maturin-action@v1
         with:
           command: publish
-          args: --username=__token__ --no-sdist --interpreter=python${{ !startsWith(matrix.os, 'windows') && matrix.python-version || '' }}
+          args: --username=__token__ ${{ matrix.os == 'ubuntu-latest' && matrix.python-version == '3.7' && '--no-sdist' || '' }} --interpreter=python${{ !startsWith(matrix.os, 'windows') && matrix.python-version || '' }}
         env:
           MATURIN_PASSWORD: ${{ secrets.pypi_password }}

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "pydomainextractor"
-version = "0.11.0"
+version = "0.11.1"
 authors = ["Gal Ben David <[email protected]>"]
 edition = "2021"
 description = "A blazingly fast domain extraction library written in Rust"
@@ -39,10 +39,9 @@ crate-type = ["cdylib"]
 ahash = "0.7"
 idna = "0.2"
 memchr = "2"
-once_cell = "1"
 
 [dependencies.pyo3]
-version = "0.16.4"
+version = "0.16.5"
 features = ["extension-module"]
 
 [profile.release]

pyproject.toml

@@ -1,18 +1,19 @@
 [build-system]
-requires = ["maturin>=0.11,<0.12"]
+requires = ["maturin>=0.12,<0.13"]
 build-backend = "maturin"
 
 [tool.maturin]
 sdist-include = [
-    "src/*",
     "Cargo.toml",
     "pydomainextractor/*.py",
-    "pydomainextractor/*.pyi"
+    "pydomainextractor/*.pyi",
+    "pyproject.toml",
+    "src/*",
 ]
 
 [tool.poetry]
 name = "pydomainextractor"
-version = "0.11.0"
+version = "0.11.1"
 authors = ["Gal Ben David <[email protected]>"]
 description = "A blazingly fast domain extraction library written in Rust"
 readme = "README.md"

src/lib.rs

@@ -3,7 +3,7 @@ use pyo3::exceptions::PyValueError;
 use pyo3::prelude::*;
 use pyo3::types::PyString;
 use std::ptr;
-use once_cell::sync::OnceCell;
+use pyo3::once_cell::GILOnceCell;
 
 #[derive(Default)]
 struct Suffix {
@@ -17,7 +17,7 @@ static mut SUFFIX_STRING: *mut pyo3::ffi::PyObject = ptr::null_mut();
 static mut DOMAIN_STRING: *mut pyo3::ffi::PyObject = ptr::null_mut();
 static mut SUBDOMAIN_STRING: *mut pyo3::ffi::PyObject = ptr::null_mut();
 static PUBLIC_SUFFIX_LIST_DATA: &str = include_str!("public_suffix_list.dat");
-static mut TEMP_DOMAIN_STRING: OnceCell<String> = OnceCell::new();
+static mut TEMP_DOMAIN_STRING: GILOnceCell<String> = GILOnceCell::new();
 
 
 #[pyclass]
@@ -363,7 +363,7 @@ fn parse_suffix_list(
 
 #[pymodule]
 fn pydomainextractor(
-    _py: Python,
+    py: Python,
     m: &PyModule,
 ) -> PyResult<()> {
     unsafe {
@@ -380,7 +380,7 @@ fn pydomainextractor(
             "subdomain".as_ptr() as *const i8,
             "subdomain".len() as isize,
         );
-        TEMP_DOMAIN_STRING.get_or_init(|| String::with_capacity(1024));
+        TEMP_DOMAIN_STRING.set(py, String::with_capacity(1024)).unwrap();
     }
 
     m.add_class::<DomainExtractor>()?;

src/public_suffix_list.dat

@@ -7130,7 +7130,7 @@ org.zw
 
 // newGTLDs
 
-// List of new gTLDs imported from https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on 2022-04-30T15:14:46Z
+// List of new gTLDs imported from https://www.icann.org/resources/registries/gtlds/v2/gtlds.json on 2022-05-18T15:16:02Z
 // This list is auto-generated, don't edit it manually.
 // aaa : 2015-02-26 American Automobile Association, Inc.
 aaa
@@ -8851,7 +8851,7 @@ lincoln
 // linde : 2014-12-04 Linde Aktiengesellschaft
 linde
 
-// link : 2013-11-14 UNR Corp.
+// link : 2013-11-14 Nova Registry Ltd
 link
 
 // lipsy : 2015-06-25 Lipsy Ltd
@@ -12281,6 +12281,10 @@ blogspot.vn
 // Submitted by Niels Martignene <[email protected]>
 goupile.fr
 
+// Government of the Netherlands: https://www.government.nl
+// Submitted by <[email protected]>
+gov.nl
+
 // Group 53, LLC : https://www.group53.com
 // Submitted by Tyler Todd <[email protected]>
 awsmppl.com
@@ -12357,7 +12361,6 @@ ltd.ng
 ngo.ng
 edu.scot
 sch.so
-org.yt
 
 // HostyHosting (hostyhosting.com)
 hostyhosting.io
@@ -13389,6 +13392,12 @@ rocky.page
 спб.рус
 я.рус
 
+// Salesforce.com, Inc. https://salesforce.com/
+// Submitted by Michael Biven <[email protected]>
+builder.code.com
+dev-builder.code.com
+stg-builder.code.com
+
 // Sandstorm Development Group, Inc. : https://sandcats.io/
 // Submitted by Asheesh Laroia <[email protected]>
 sandcats.io
@@ -13812,6 +13821,15 @@ hk.org
 ltd.hk
 inc.hk
 
+// UNIVERSAL DOMAIN REGISTRY : https://www.udr.org.yt/
+// see also: whois -h whois.udr.org.yt help
+// Submitted by Atanunu Igbunuroghene <[email protected]>
+name.pm
+sch.tf
+biz.wf
+sch.wf
+org.yt
+
 // United Gameserver GmbH : https://united-gameserver.de
 // Submitted by Stefan Schwarz <[email protected]>
 virtualuser.de