Cibuildwheel (#20)

* Yum - This gets images using yum to install net-snmp - but the build command fails. * Update pyproject.toml - attempt to get the linux wheels to work - ATM only the macos wheels work. * Docs - updating docs with what is needed for a fresh ubuntu install. * Docs And Cleanup - cleaning up docs. - cleaning up code. * Update requirements.txt - updating a bunch of packages * No Perl - attempting to build net-snmp with no perl. * Update pyproject.toml without perl not with perl. * tool.cibuildwheel.linux - okay this works now tool.cibuildwheel.linux muslinux breaks now. * Wheels - all wheels build. Need to see if tests run on all as well ?? that might be trickier.
carlkidcrypto · Jan 30, 2024 · bce1fcb · bce1fcb
1 parent 512fea5
commit bce1fcb
Show file tree

Hide file tree

Showing 10 changed files with 53 additions and 70 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,2 +1,2 @@
 # Auto detect text files and perform LF normalization
-* text=auto
+* text=auto eol=lf
diff --git a/.github/workflows/build_and_publish_to_pypi.yml b/.github/workflows/build_and_publish_to_pypi.yml
@@ -20,7 +20,8 @@ jobs:
       - uses: actions/setup-python@v5
 
       - name: Install cibuildwheel
-        run: python -m pip install cibuildwheel==2.16.2
+        run: python -m pip install --upgrade pip
+             if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
 
       - name: Build wheels
         run: python -m cibuildwheel --output-dir wheelhouse

diff --git a/.github/workflows/build_and_publish_to_test_pypi.yml b/.github/workflows/build_and_publish_to_test_pypi.yml
@@ -20,7 +20,8 @@ jobs:
       - uses: actions/setup-python@v5
 
       - name: Install cibuildwheel
-        run: python -m pip install cibuildwheel==2.16.2
+        run: python -m pip install --upgrade pip
+             if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
 
       - name: Build wheels
         run: python -m cibuildwheel --output-dir wheelhouse

diff --git a/.gitignore b/.gitignore
@@ -30,4 +30,5 @@ docs/_build/
 dev/
 .vscode
 */*.log
-*.log
+*.log
+wheelhouse/**
diff --git a/README.rst b/README.rst
@@ -130,7 +130,7 @@ possible:
 -  **Wes Hardaker and the net-snmp-coders**: for their hard work and
    dedication
 - **fgimian and nnathan**: the original contributors to this codebase
-- **Kent Coble**: who as the most recent maintainer. `Easy SNMP <https://github.com/easysnmp/easysnmp>`_
+- **Kent Coble**: who was the most recent maintainer. `Easy SNMP <https://github.com/easysnmp/easysnmp>`_
 
 Running Tests
 -------------
@@ -142,11 +142,21 @@ them with the following on Linux:
 
     git clone https://github.com/ezsnmp/ezsnmp.git;
     cd ezsnmp;
-    mv /etc/snmp/snmpd.conf /etc/snmp/snmpd.conf.orig;
-    cp tests/snmpd.conf /etc/snmp/snmpd.conf;
-    systemctl start snmpd;
-    rm -drf build/ ezsnmp.egg-info;
-    python3 setup.py build && python3 -m pip install -e . && gdb -ex run -ex bt -ex quit --args python3 -m pytest .;
+    sudo apt update && sudo apt upgrade -y;
+    sudo apt install -y snmpd libsnmp-dev libperl-dev snmp-mibs-downloader valgrind;
+    sudo apt install -y python3-pip python3-dev  python3-setuptools gdb -y;
+    sudo systemctl stop snmpd;
+    sudo mv /etc/snmp/snmpd.conf /etc/snmp/snmpd.conf.orig;
+    sudo cp tests/snmpd.conf /etc/snmp/snmpd.conf;
+    sudo download-mibs;
+    mkdir -p -m 0755 ~/.snmp;
+    echo 'mibs +ALL' > ~/.snmp/snmp.conf;
+    sudo systemctl start snmpd;
+    rm -drf build/ dist/ ezsnmp.egg-info;
+    python3 -m pip install -r requirements.txt;
+    python3 setup.py build && python3 -m pip install -e . && python3 -m pytest .;
+    # Bottom one for debug. Replace the top one with it if needed.
+    # python3 setup.py build && python3 -m pip install -e . && gdb -ex run -ex bt -ex quit --args python3 -m pytest .;
 
 
 On MacOS
@@ -159,7 +169,7 @@ On MacOS
     cp tests/snmpd.conf /etc/snmp/snmpd.conf;
     launchctl unload /System/Library/LaunchDaemons/org.net-snmp.snmpd.plist;
     launchctl load -w /System/Library/LaunchDaemons/org.net-snmp.snmpd.plist;
-    rm -drf build/ ezsnmp.egg-info;
+    rm -drf build/ dist/ ezsnmp.egg-info;
     python3 setup.py build && python3 -m pip install -e . && python3 -m pytest .;
 
 License

diff --git a/ezsnmp/interface.cpp b/ezsnmp/interface.cpp
@@ -2,27 +2,6 @@
  */
 
 #include <Python.h>
-
-/*
- * Old versions of Python use CObject API instead of Capsules.
- * Both are similar, so we just use a bit of preprocessor magic
- * to provide backwards compatibility.
- */
-#if (                                  \
-    (PY_VERSION_HEX < 0x02070000) ||   \
-    ((PY_VERSION_HEX >= 0x03000000) && \
-     (PY_VERSION_HEX < 0x03010000)))
-
-#define USE_DEPRECATED_COBJECT_API
-
-#define PyCapsule_New(pointer, name, destructor) \
-    (PyCObject_FromVoidPtr(pointer, destructor))
-
-#define PyCapsule_GetPointer(capsule, name) \
-    (PyCObject_AsVoidPtr(capsule))
-
-#endif /* PY_VERSION_HEX */
-
 #include <net-snmp/net-snmp-config.h>
 #include <net-snmp/net-snmp-includes.h>
 #include <net-snmp/snmpv3_api.h>
@@ -1619,20 +1598,6 @@ void *get_session_handle_from_capsule(PyObject *session_capsule)
     return PyCapsule_GetPointer(session_capsule, NULL);
 }
 
-#ifdef USE_DEPRECATED_COBJECT_API
-/* The CObject API calls destructor with stored pointer */
-void delete_session_capsule(void *session_ptr)
-{
-    struct session_capsule_ctx *ctx = session_ptr;
-    if (ctx)
-    {
-        // clear_user_list(); // Too dangerous, may disrupt other valid sessions
-        __remove_user_from_cache((struct session_list *)ctx->handle);
-        snmp_sess_close(ctx->handle);
-        free(ctx);
-    }
-}
-#else
 /* Automatically called when Python reclaims session_capsule object. */
 void delete_session_capsule(PyObject *session_capsule)
 {
@@ -1646,7 +1611,6 @@ void delete_session_capsule(PyObject *session_capsule)
         free(ctx);
     }
 }
-#endif /* USE_DEPRECATED_COBJECT_API */
 
 PyObject *netsnmp_create_session(PyObject *self, PyObject *args)
 {

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,8 +1,29 @@
 [tool.cibuildwheel]
-skip = "cp36-* cp37-*"
+manylinux-x86_64-image = "manylinux2014"
+skip = "cp27-* cp36-* cp37-* pp37-*"
+
+[[tool.cibuildwheel.overrides]]
+select = "*manylinux_2_24*"
+before-all = """apt-get --assume-yes install wget unzip;
+                wget https://sourceforge.net/projects/net-snmp/files/net-snmp/5.9.4/net-snmp-5.9.4.zip/download ;
+                unzip download;
+                cd net-snmp-5.9.4;
+                ./configure --with-defaults --disable-mibs --disable-manual --without-perl-modules --disable-embedded-perl;
+                make ;
+                make install ;"""
+
+[[tool.cibuildwheel.overrides]]
+select = "*musllinux*"
+before-all = "apk add net-snmp-dev;"
 
 [tool.cibuildwheel.linux]
-before-all = "yum install net-snmp-devel || apk add snmpd libsnmp-dev libperl-dev || apt-get install snmpd libsnmp-dev libperl-dev"
+before-all = """yum -y install wget;
+                wget https://sourceforge.net/projects/net-snmp/files/net-snmp/5.9.4/net-snmp-5.9.4.zip/download ;
+                unzip download;
+                cd net-snmp-5.9.4;
+                ./configure --with-defaults --disable-mibs --disable-manual --without-perl-modules --disable-embedded-perl;
+                make ;
+                make install ;"""
 
 [tool.cibuildwheel.macos]
 before-all = """brew update;
@@ -11,4 +32,5 @@ before-all = """brew update;
     echo 'export PATH="/usr/local/opt/net-snmp/bin:$PATH"' >> ~/.zshrc;
     export PATH="/usr/local/opt/net-snmp/bin:$PATH";
     echo 'export PATH="/usr/local/opt/net-snmp/sbin:$PATH"' >> ~/.zshrc;
-    export PATH="/usr/local/opt/net-snmp/sbin:$PATH";"""
+    export PATH="/usr/local/opt/net-snmp/sbin:$PATH";"""
+
diff --git a/requirements.txt b/requirements.txt
diff --git a/setup.py b/setup.py
@@ -13,15 +13,6 @@
 from pathlib import Path
 
 
-def is_docker():
-    cgroup = Path("/proc/self/cgroup")
-    return (
-        Path("/.dockerenv").is_file()
-        or cgroup.is_file()
-        and "docker" in cgroup.read_text()
-    )
-
-
 # Determine if a base directory has been provided with the --basedir option
 basedir = None
 in_tree = False
@@ -55,15 +46,7 @@ def is_docker():
 
 # Otherwise, we use the system-installed SNMP libraries
 else:
-    netsnmp_libs = None
-    if is_docker():
-        netsnmp_libs = check_output(
-            "docker run --privileged cmd.cat/net-snmp-config net-snmp-config --libs",
-            shell=True,
-        ).decode()
-
-    else:
-        netsnmp_libs = check_output("net-snmp-config --libs", shell=True).decode()
+    netsnmp_libs = check_output("net-snmp-config --libs", shell=True).decode()
 
     pass_next = False
     # macOS-specific

diff --git a/sphinx_docs_build/source/index.rst b/sphinx_docs_build/source/index.rst
@@ -23,8 +23,9 @@ On RHEL / CentOS systems:
 On Debian / Ubuntu systems:
 
 .. code-block:: bash
-
-    sudo apt-get install libsnmp-dev snmp-mibs-downloader
+    
+    sudo apt update && sudo apt upgrade -y;
+    sudo apt install -y libsnmp-dev libperl-dev snmp-mibs-downloader;
 
 On macOS systems:
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,4 +30,5 @@ docs/_build/ @@
     dev/
     .vscode
     */*.log
-    *.log
+    *.log
+    wheelhouse/**