diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 7148dfc..28b0b66 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -14,12 +14,12 @@ jobs: permissions: id-token: write # IMPORTANT: this permission is mandatory for trusted publishing steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: - python-version: 3.8 + python-version: "3.10" - name: Build distribution run: python -m pip install build && python -m build diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a802a8c..ce22e57 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,17 +11,17 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [3.7, 3.8, 3.9] + python-version: ["3.9", "3.10", "3.11"] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - name: Install dependencies run: | pip install 'git+https://git@github.com/laws-africa/cobalt.git@master#egg=cobalt' pip install -e '.[test]' - - name: Test with nosetests - run: nosetests + - name: Run tests + run: python -m unittest diff --git a/README.md b/README.md index e750784..6953312 100644 --- a/README.md +++ b/README.md @@ -605,6 +605,7 @@ and removes the `displaced` element. 1. We use a version of `canopy` from github, so clone it into the same directory as this directory: `git clone https://github.com/jcoglan/canopy.git` 2. Build canopy: `cd canopy; npm install; make; cd ..` 3. Build grammar changes with `make`, which runs our Makefile to compile the grammar +4. Run tests with: `python -m unittest` ## Releasing a new version diff --git a/bluebell/__init__.py b/bluebell/__init__.py index 55e4709..528787c 100644 --- a/bluebell/__init__.py +++ b/bluebell/__init__.py @@ -1 +1 @@ -__version__ = "2.3.0" +__version__ = "3.0.0" diff --git a/pyproject.toml b/pyproject.toml index cc5acb6..04644f0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -10,7 +10,7 @@ authors = [ ] license = {text = "LGPLv3+"} readme = "README.md" -requires-python = ">=3.7" +requires-python = ">=3.9" classifiers = [ "Development Status :: 5 - Production/Stable", "Intended Audience :: Developers", @@ -22,7 +22,7 @@ classifiers = [ "Programming Language :: Python :: 3", ] dependencies = [ - "cobalt>=8.0.0", + "cobalt>=9.0.0", "lxml>=3.4.1", ] dynamic = ["version"] @@ -32,7 +32,7 @@ dynamic = ["version"] "Bug Tracker" = "https://github.com/laws-africa/bluebell/issues" [project.optional-dependencies] -test = ["nose", "flake8"] +test = ["flake8"] [project.scripts] bluebell = "bluebell.cli:main"