Merge remote-tracking branch 'origin/master' into release-v2.4.2

mjpost · Jun 21, 2024 · fa7add4 · fa7add4
2 parents 1f70cd2 + 333731a
commit fa7add4
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 23 deletions.
diff --git a/.github/workflows/check-build.yml b/.github/workflows/check-build.yml
@@ -18,42 +18,40 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11"]
+        os: [ubuntu-latest, macos-13, macos-14, windows-latest]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
         exclude:
           - os: windows-latest
-            python-version: '3.6'   # test fails due to UTF8 stuff
-          - os: ubuntu-latest
-            python-version: '3.6'   # not available in Ubuntu 22.04+
-        include:
-          - os: ubuntu-20.04
-            python-version: '3.6'   # test Python 3.6 on older Ubuntu instead
+            python-version: '3.12'
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setup Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v3
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
-      - if: matrix.os == 'macos-latest'
+      - if: ${{ matrix.os == 'macos-13' || matrix.os == 'macos-14' }}
         name: Install Mac OS requirements
         run: brew install bash
       - if: matrix.os == 'windows-latest'
         name: Install Windows requirements
         run: choco install wget unzip
-      - name: Install python dependencies
+      - if: ${{ matrix.os != 'macos-14' && matrix.python-version != '3.12' }}
+        name: Install python dependencies
+        run: pip install ".[dev,ja,ko]"
+      - # mecab-ko doesn't support Apple Silicon or Python 3.12 yet.
+        if: ${{ matrix.os == 'macos-14' || matrix.python-version == '3.12' }}
+        name: Install Python dependencies on Apple Silicon or Python 3.12
         run: |
-          python3 -m pip install --upgrade pip
-          pip3 install .[dev]
-          pip3 install .[ja]
-          pip3 install .[ko]
+          pip install ".[dev,ja]"
+          echo "SKIP_MECAB_KO=true" >> $GITHUB_ENV
       - name: Lint with Mypy
         run: mypy sacrebleu scripts test
       - name: Lint with Ruff
         uses: chartboost/ruff-action@v1
       - name: Python pytest test suite
-        run: python3 -m pytest
+        run: python -m pytest
       - name: CLI bash test suite
         shell: bash
         run: ./test.sh
       - name: Build
-        run: python3 setup.py sdist bdist_wheel
+        run: python setup.py sdist bdist_wheel
diff --git a/DATASETS.md b/DATASETS.md
@@ -2,6 +2,16 @@
 | ------------------------------ | ------------------------------------------------------------------------------------------------------------------- |
 | mtedx/valid                    | mTEDx evaluation data, valid: [URL](http://openslr.org/100)                                                         |
 | mtedx/test                     | mTEDx evaluation data, test: [URL](http://openslr.org/100)                                                          |
+| wmt23                          | Official evaluation and system data for WMT23.	|
+| wmt22                          | Official evaluation and system data for WMT22.	|
+| wmt21/systems                  | WMT21 system output.	|
+| wmt21/dev                      | Development data for WMT21，if multiple references are available, the first one is used.	|
+| wmt21/D                        | Official evaluation data for WMT21 with reference D	|
+| wmt21/C                        | Official evaluation data for WMT21 with reference C	|
+| wmt21/B                        | Official evaluation data for WMT21 with reference B.	|
+| wmt21/AC                       | Official evaluation data for WMT21 with references A and C	|
+| wmt21/AB                       | Official evaluation data for WMT21 with references A and B.	|
+| wmt21                          | Official evaluation data for WMT21.	|
 | wmt20/robust/set1              | WMT20 robustness task, set 1                                                                                        |
 | wmt20/robust/set2              | WMT20 robustness task, set 2                                                                                        |
 | wmt20/robust/set3              | WMT20 robustness task, set 3                                                                                        |

diff --git a/README.md b/README.md
@@ -50,7 +50,7 @@ $ sacrebleu -i output.detok.txt -t wmt17 -l en-de | jq -r .score
 
 # Installation
 
-Install the official Python module from PyPI (**Python>=3.6 only**):
+Install the official Python module from PyPI (**Python>=3.8 only**):
 
     pip install sacrebleu
 

diff --git a/setup.py b/setup.py
@@ -102,8 +102,8 @@ def get_long_description():
     author_email='post@cs.jhu.edu',
     maintainer_email='post@cs.jhu.edu',
     license='Apache License 2.0',
-    # We don't support Python < 3.6 anymore
-    python_requires='>=3.6',
+    # We don't support Python < 3.8 anymore
+    python_requires='>=3.8',
     # See https://pypi.python.org/pypi?%3Aaction=list_classifiers
     classifiers=[
         # How mature is this project? Common values are
@@ -154,8 +154,8 @@ def get_long_description():
     # dependencies). You can install these using the following syntax,
     # for example:
     # $ pip install -e .[dev,test]
-    extras_require={'dev': ['wheel', 'pytest', 'mypy', 'types-tabulate', 'lxml-stubs'],
-                    'ja': ['mecab-python3>=1.0.5,<=1.0.6', 'ipadic>=1.0,<2.0'],
+    extras_require={'dev': ['wheel', 'pytest', 'mypy', 'types-tabulate', 'lxml-stubs', 'setuptools'],
+                    'ja': ['mecab-python3>=1.0.9,<2.0.0', 'ipadic>=1.0,<2.0'],
                     'ko': ['mecab-ko>=1.0.0,<=1.0.1', 'mecab-ko-dic>=1.0,<2.0']},
 
     # To provide executable scripts, use entry points in preference to the