Merge branch 'develop' into hotfix-closuredup

Author: stevenbird

.github/workflows/cffconvert.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out a copy of the repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Check whether the citation metadata from CITATION.cff is valid
         uses: citation-file-format/[email protected]

.github/workflows/ci.yaml

@@ -24,7 +24,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
-          python-version: '3.x' # run with latest python version
+          python-version: '3.12.3' # 3.12.4 has an issue with pyupgrade, try to upgrade later
       - run: |
           pip install pre-commit
           pre-commit run --all-files
@@ -41,7 +41,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Cache nltk data
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         id: restore-cache
         with:
           path: ~/nltk_data
@@ -63,7 +63,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Cache third party tools
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         id: restore-cache
         with:
           path: ~/third
@@ -94,7 +94,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
 
       - name: Restore cached dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         id: restore-cache
         with:
           path: ${{ env.pythonLocation }}
@@ -107,13 +107,13 @@ jobs:
         #if: steps.restore-cache.outputs.cache-hit != 'true' # disabled due to a persistent issue with restoring cache on macos runner
 
       - name: Use cached nltk data
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/nltk_data
           key: nltk_data_${{ secrets.CACHE_VERSION }}
 
       - name: Use cached third party tools
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/third
           key: third_${{ hashFiles('tools/github_actions/third-party.sh') }}_${{ secrets.CACHE_VERSION }}

.pre-commit-config.yaml

@@ -1,19 +1,19 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v4.6.0
     hooks:
       - id: fix-byte-order-marker
       - id: trailing-whitespace
       - id: end-of-file-fixer
       - id: requirements-txt-fixer
       - id: check-yaml
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.15.0
+    rev: v3.16.0
     hooks:
     - id: pyupgrade
       args: ["--py38-plus"]
   - repo: https://github.com/ambv/black
-    rev: 23.12.0
+    rev: 24.4.2
     hooks:
     - id: black
   - repo: local

AUTHORS.md

@@ -302,6 +302,7 @@
 - Akihiro Yamazaki <https://github.com/zakkie>
 - Ron Urbach <https://github.com/sharpblade4>
 - Vivek Kalyan <https://github.com/vivekkalyan>
+- Tom Strange https://github.com/strangetom
 
 ## Others whose work we've taken and included in NLTK, but who didn't directly contribute it:
 

ChangeLog

@@ -1,3 +1,12 @@
+Version 3.9-beta1 2024-08-16
+* Avoid need for pickled models, resolves security vulnerability CVE-2024-39705
+* No longer sort WordNet synsets and relations (sort in calling function when required)
+* Add Python 3.12 support
+* Many other minor fixes
+
+Thanks to the following contributors to 3.8.2:
+Tom Aarsen, Cat Lee Ball, Veralara Bernhard, Carlos Brandt, Konstantin Chernyshev, Michael Higgins,
+Eric Kafe, Vivek Kalyan, David Lukes, Rob Malouf, purificant, Alex Rudnick, Liling Tan, Akihiro Yamazaki.
 
 Version 3.8.1 2023-01-02
 

Makefile

@@ -1,6 +1,6 @@
 # Natural Language Toolkit: source Makefile
 #
-# Copyright (C) 2001-2023 NLTK Project
+# Copyright (C) 2001-2024 NLTK Project
 # Author: Steven Bird <[email protected]>
 #	 Edward Loper <[email protected]>
 # URL: <https://www.nltk.org/>
@@ -36,15 +36,8 @@ demotest:
 # DISTRIBUTIONS
 ########################################################################
 
-dist: zipdist
-
-# twine only permits one source distribution
-#gztardist: clean_code
-#	$(PYTHON) setup.py -q sdist --format=gztar
-zipdist: clean_code
-	$(PYTHON) setup.py -q sdist --format=zip bdist_wheel
-windist: clean_code
-	$(PYTHON) setup.py -q bdist --format=wininst --plat-name=win32
+dist: clean_code
+	$(PYTHON) -m build
 
 ########################################################################
 # CLEAN

README.md

@@ -33,7 +33,7 @@ If you publish work that uses NLTK, please cite the NLTK book, as follows:
 
 ## Copyright
 
-Copyright (C) 2001-2023 NLTK Project
+Copyright (C) 2001-2024 NLTK Project
 
 For license information, see [LICENSE.txt](LICENSE.txt).
 

RELEASE-HOWTO.txt

@@ -1,6 +1,12 @@
 Building an NLTK distribution
 ----------------------------------
 
+0. Packages required to build, test, and distribute NLTK
+   - py312-pytest py312-requests py312-sphinx
+   - py312-numpy py312-matplotlib py312-tkinter
+   - sqlite3-tcl
+   - pip install sphinxcontrib-apidoc twython build twine pytest-mock
+
 1. Testing
    - Check no errors are reported in our continuous integration service:
      https://github.com/nltk/nltk/actions
@@ -23,7 +29,7 @@ Building an NLTK distribution
 
 3. Build Documentation
    - Check the copyright year is correct and update if necessary
-     e.g. ./tools/global_replace.py 2001-2022 2001-2023
+     e.g. ./tools/global_replace.py 2001-2022 2001-2024
      check web/conf.py copyright line
    - Check that installation instructions are up-to-date
      (including the range of Python versions that are supported)
@@ -44,7 +50,7 @@ Building an NLTK distribution
      cd ../nltk
      git tag -a 3.X.Y -m "version 3.X.Y"
      git push --tags
-     verify that it shows up here: https://github.com/nltk/nltk/releases
+     verify that it shows up here: https://github.com/nltk/nltk/tags
      This is important for the website, as the footer will link to the
      tag with the version from web/conf.py.
 
@@ -75,5 +81,5 @@ The build requires docutils, pdflatex, python imaging library, epydoc,
   cdrtools, ImageMagick
 
   1. Check out a clean copy of the subversion repository (or make clean)
-     and install locally with sudo python setup.py install; make clean
+     and install locally with pip install; make clean
   2. make doc (slow; see doc/ for the results) and commit

nltk/VERSION

@@ -1 +1 @@
-3.8.1
+3.9b1

nltk/__init__.py

@@ -1,6 +1,6 @@
 # Natural Language Toolkit (NLTK)
 #
-# Copyright (C) 2001-2023 NLTK Project
+# Copyright (C) 2001-2024 NLTK Project
 # Authors: Steven Bird <[email protected]>
 #          Edward Loper <[email protected]>
 # URL: <https://www.nltk.org/>
@@ -42,7 +42,7 @@
 
 # Copyright notice
 __copyright__ = """\
-Copyright (C) 2001-2023 NLTK Project.
+Copyright (C) 2001-2024 NLTK Project.
 
 Distributed and Licensed under the Apache License, Version 2.0,
 which is included by reference.