upgrade to Nov 30, 2023 libsodium 1.0.19-stable release

drop py36
pyca · Dec 5, 2023 · a8bed4d · a8bed4d
1 parent 90e23b8
commit a8bed4d
Show file tree

Hide file tree

Showing 226 changed files with 13,502 additions and 45,004 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -5,12 +5,13 @@ on:
     branches:
       - main
       - '*.x'
+      - libsodium-upgrade
     tags:
       - '*'
 
 jobs:
   linux:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
         PYTHON:
@@ -19,7 +20,6 @@ jobs:
           - {VERSION: "3.12", TOXENV: "mypy", COVERAGE: "false"}
           - {VERSION: "pypy-3.9", TOXENV: "pypy3"}
           - {VERSION: "pypy-3.10", TOXENV: "pypy3"}
-          - {VERSION: "3.6", TOXENV: "py36"}
           - {VERSION: "3.7", TOXENV: "py37"}
           - {VERSION: "3.8", TOXENV: "py38"}
           - {VERSION: "3.9", TOXENV: "py39"}
@@ -44,7 +44,7 @@ jobs:
           tar zxvf LATEST.tar.gz
           cd libsodium-*
           ./configure ${SODIUM_INSTALL_MINIMAL:+--enable-minimal}
-          make
+          make -j$(nproc)
           make check
           sudo make install
           sudo ldconfig
@@ -68,7 +68,7 @@ jobs:
     strategy:
       matrix:
         PYTHON:
-          - {VERSION: "3.6", TOXENV: "py36"}
+          - {VERSION: "3.7", TOXENV: "py37"}
           - {VERSION: "3.12", TOXENV: "py312"}
           - {VERSION: "3.12", TOXENV: "py312", NOTE: " (minimal build)", SODIUM_INSTALL_MINIMAL: "1"}
     name: "Python ${{ matrix.PYTHON.VERSION }}${{ matrix.PYTHON.NOTE }} on macOS"
@@ -97,7 +97,6 @@ jobs:
           - {ARCH: 'x86', SODIUM_ARCH: 'Win32'}
           - {ARCH: 'x64', SODIUM_ARCH: 'x64'}
         PYTHON:
-          - {VERSION: "3.6", TOXENV: "py36", SODIUM_MSVC_VERSION: "v142"}
           - {VERSION: "3.7", TOXENV: "py37", SODIUM_MSVC_VERSION: "v142"}
           - {VERSION: "3.8", TOXENV: "py38", SODIUM_MSVC_VERSION: "v142"}
           - {VERSION: "3.9", TOXENV: "py39", SODIUM_MSVC_VERSION: "v142"}
@@ -114,7 +113,7 @@ jobs:
           architecture: ${{ matrix.WINDOWS.ARCH }}
       - name: 'Extract libsodium libraries'
         run: |
-          Expand-Archive src/libsodium-1.0.18-stable-msvc.zip -DestinationPath c:\
+          Expand-Archive src/libsodium-1.0.19-stable-msvc.zip -DestinationPath c:\
         shell: powershell
       - name: Install tox and coverage
         run: pip install tox coverage

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -4,6 +4,9 @@ Changelog
 1.6.0 (UNRELEASED)
 ------------------
 
+* **BACKWARDS INCOMPATIBLE:** Removed support for Python 3.6.
+* Update ``libsodium`` to 1.0.19-stable (November 30, 2023 release).
+
 1.5.0 (2022-01-07)
 ------------------
 

diff --git a/README.rst b/README.rst
@@ -15,7 +15,7 @@ PyNaCl: Python binding to the libsodium library
 
 PyNaCl is a Python binding to `libsodium`_, which is a fork of the
 `Networking and Cryptography library`_. These libraries have a stated goal of
-improving usability, security and speed. It supports Python 3.6+ as well as
+improving usability, security and speed. It supports Python 3.7+ as well as
 PyPy 3.
 
 .. _libsodium: https://github.com/jedisct1/libsodium

diff --git a/pyproject.toml b/pyproject.toml
@@ -9,7 +9,7 @@ build-backend = "setuptools.build_meta"
 
 [tool.black]
 line-length = 79
-target-version = ["py36"]
+target-version = ["py37"]
 
 [tool.mypy]
 show_error_codes = true

diff --git a/setup.py b/setup.py
@@ -127,13 +127,7 @@ def run(self):
         # Ensure all of our executable files have their permission set
         for filename in [
             "src/libsodium/autogen.sh",
-            "src/libsodium/compile",
             "src/libsodium/configure",
-            "src/libsodium/depcomp",
-            "src/libsodium/install-sh",
-            "src/libsodium/missing",
-            "src/libsodium/msvc-scripts/process.bat",
-            "src/libsodium/test/default/wintest.bat",
         ]:
             os.chmod(here(filename), 0o755)
 
@@ -208,7 +202,7 @@ def run(self):
     license=nacl.__license__,
     author=nacl.__author__,
     author_email=nacl.__email__,
-    python_requires=">=3.6",
+    python_requires=">=3.7",
     setup_requires=setup_requirements,
     install_requires=requirements,
     extras_require={"tests": test_requirements, "docs": docs_requirements},
@@ -225,7 +219,6 @@ def run(self):
         "Programming Language :: Python :: Implementation :: CPython",
         "Programming Language :: Python :: Implementation :: PyPy",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",

diff --git a/src/libsodium-1.0.18-stable-msvc.zip → src/libsodium-1.0.19-stable-msvc.zip b/src/libsodium-1.0.18-stable-msvc.zip → src/libsodium-1.0.19-stable-msvc.zip
diff --git a/src/libsodium/.github/workflows/ci.yml b/src/libsodium/.github/workflows/ci.yml
@@ -12,13 +12,14 @@ jobs:
   tcc:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Update packages list
         run: sudo apt-get update
 
       - name: Install dependencies
-        run: sudo apt-get install -y build-essential libtool autoconf automake tcc
+        run: |
+          sudo apt-get install -y build-essential libtool autoconf automake tcc
 
       - name: Autogen
         run: ./autogen.sh -s
@@ -31,10 +32,40 @@ jobs:
           make uninstall
           make distclean
 
+  zig:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Update packages list
+        run: sudo apt-get update
+
+      - name: Install dependencies
+        run: |
+          curl -sL -o - https://ziglang.org/download/0.11.0/zig-linux-x86_64-0.11.0.tar.xz | tar xJ -f - -C /opt/
+          sudo mv /opt/zig-* /opt/zig
+
+      - name: Autogen
+        run: ./autogen.sh -s
+
+      - name: Compilation with zig
+        run: |
+          export PATH=/opt/zig:$PATH
+          zig build
+          zig build -Dtarget=x86_64-linux
+          zig build -Dtarget=aarch64-linux
+          zig build -Dtarget=x86_64-windows
+          zig build -Dtarget=aarch64-windows
+          zig build -Dtarget=x86_64-macos
+          zig build -Dtarget=aarch64-macos
+          zig build -Dtarget=wasm32-wasi
+          zig build -Doptimize=ReleaseFast
+          rm -fr zig-cache zig-out
+
   regular:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Update packages list
         run: sudo apt-get update
@@ -63,7 +94,7 @@ jobs:
   check-globals:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Update packages list
         run: sudo apt-get update
@@ -81,7 +112,7 @@ jobs:
   other-comp:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Update packages list
         run: sudo apt-get update
@@ -107,13 +138,13 @@ jobs:
   other-arch:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Update packages list
         run: sudo apt-get update
 
       - name: Install dependencies
-        run: sudo apt-get install -y build-essential libtool autoconf automake qemu-user-static gcc-powerpc-linux-gnu
+        run: sudo apt-get install -y build-essential libtool autoconf automake gcc-powerpc-linux-gnu
 
       - name: Autogen
         run: ./autogen.sh -s
@@ -123,3 +154,28 @@ jobs:
           env CPPFLAGS="-DDEV_MODE=1" ./configure --disable-dependency-tracking --host=powerpc-linux-gnu
           make -j $(nproc)
           make clean > /dev/null
+
+  android:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Update packages list
+        run: sudo apt-get update
+
+      - name: Install base dependencies
+        run: sudo apt-get install -y libtool autoconf automake unzip
+
+      - name: Autogen
+        run: ./autogen.sh -s
+
+      - name: Install Android NDK
+        run: |
+          mkdir /tmp/android && cd /tmp/android
+          curl -o ndk.zip -L https://dl.google.com/android/repository/android-ndk-r25c-linux.zip
+          unzip ndk.zip && rm -f *.zip && mv android-ndk* ndk
+
+      - name: Android compilation
+        run: |
+          env ANDROID_NDK_HOME=/tmp/android/ndk ./dist-build/android-x86.sh
+          env ANDROID_NDK_HOME=/tmp/android/ndk ./dist-build/android-armv8-a.sh
diff --git a/src/libsodium/.github/workflows/codeql-analysis.yml b/src/libsodium/.github/workflows/codeql-analysis.yml
@@ -4,28 +4,27 @@ on:
   push:
   pull_request:
   schedule:
-    - cron: '0 17 * * 2'
+    - cron: "0 17 * * 2"
 
 jobs:
   CodeQL-Build:
-
     runs-on: ubuntu-latest
 
     steps:
-    - name: Checkout repository
-      uses: actions/checkout@v2
-      with:
-        fetch-depth: 2
+      - name: Checkout repository
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 2
 
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
-      with:
-        languages: cpp
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v2
+        with:
+          languages: cpp
 
-    - run: |
-       ./autogen.sh -s
-       env CPPFLAGS="-DDEV_MODE=1" ./configure --disable-dependency-tracking
-       make -j $(nproc) check
+      - run: |
+          ./autogen.sh -s
+          env CPPFLAGS="-DDEV_MODE=1" ./configure --disable-dependency-tracking
+          make -j $(nproc) check
 
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v2