Merge pull request #63 from lindsay-stevens/update-deps

Update dependencies
getodk · Mar 27, 2024 · fa3ddff · fa3ddff
2 parents 50c420d + 942e80c
commit fa3ddff
Show file tree

Hide file tree

Showing 42 changed files with 391 additions and 546 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -19,6 +19,6 @@ https://github.com/getodk/pyodk/blob/master/CONTRIBUTING.md
 
 #### Before submitting this PR, please make sure you have:
 - [ ] included test cases for core behavior and edge cases in `tests`
-- [ ] run `nosetests` and verified all tests pass
-- [ ] run `python bin/pre_commit.py` to format / lint code
+- [ ] run `python -m unittest` and verified all tests pass
+- [ ] run `ruff format pyxform tests` and `ruff check pyxform tests` to lint code
 - [ ] verified that any code or assets from external sources are properly credited in comments
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -9,46 +9,37 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        python: ['3.8']
+        python: ['3.12']
         os: [ubuntu-latest]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python }}
 
       # Install dependencies.
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         name: Python cache with dependencies.
         id: python-cache
         with:
           path: ${{ env.pythonLocation }}
-          key: ${{ env.pythonLocation }}-${{ matrix.os }}-${{ matrix.python }}-${{ hashFiles('setup.py') }}-${{ hashFiles('dev_requirements.pip') }}
+          key: ${{ env.pythonLocation }}-${{ matrix.os }}-${{ matrix.python }}-${{ hashFiles('pyproject.toml') }}
       - name: Install dependencies.
         run: |
           python -m pip install --upgrade pip
-          pip install -e .
-          pip install -r dev_requirements.pip
-          pip install -r docs/docs_requirements.pip
+          pip install -e[docs] .
           pip list
 
-      # Build.
-      - name: Build sdist and wheel.
-        run: |
-          pip install wheel
-          python bin/clean_for_build.py
-          python setup.py sdist bdist_wheel
-
-      # Publish.
-      - name: Publish release to PyPI with twine
+      # Build and publish.
+      - name: Publish release to PyPI
         if: success()
         run: |
-          pip install twine
-          twine upload dist/pyodk-*-py3-none-any.whl dist/pyodk-*.tar.gz
+          pip install flit==3.9.0
+          flit --debug publish --no-use-vcs
         env:
-          TWINE_USERNAME: __token__
-          TWINE_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}
+          FLIT_USERNAME: __token__
+          FLIT_PASSWORD: ${{ secrets.PYPI_API_TOKEN }}
 
       # Publish docs.
       - name: Publish docs to gh-pages

diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml
@@ -7,85 +7,70 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        python: ['3.8']
+        python: ['3.12']
         os: [ubuntu-latest]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python }}
 
       # Install dependencies.
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         name: Python cache with dependencies.
         id: python-cache
         with:
           path: ${{ env.pythonLocation }}
-          key: ${{ env.pythonLocation }}-${{ matrix.os }}-${{ matrix.python }}-${{ hashFiles('setup.py') }}-${{ hashFiles('dev_requirements.pip') }}
+          key: ${{ env.pythonLocation }}-${{ matrix.os }}-${{ matrix.python }}-${{ hashFiles('pyproject.toml') }}
       - name: Install dependencies.
         run: |
           python -m pip install --upgrade pip
-          pip install -e .
-          pip install -r dev_requirements.pip
+          pip install -e .[dev]
           pip list
 
-      # Linters.
-      - run: black pyodk tests bin --check --diff
-      - run: isort pyodk tests bin --check-only --diff
-      - run: flake8 pyodk tests bin
-      - run: pycodestyle pyodk tests bin
+      # Linter.
+      - run: ruff check pyodk tests docs --no-fix
+      - run: ruff format pyodk tests docs --diff
 
   test:
     runs-on: ${{ matrix.os }}
     strategy:
       # Run all matrix jobs even if one of them fails.
       fail-fast: false
       matrix:
-        python: ['3.8']
+        python: ['3.12']
         os: [ubuntu-latest, macos-latest, windows-latest]
-        include:
-          - os: windows-latest
-            windows_nose_args: --traverse-namespace ./tests
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python }}
 
       # Install dependencies.
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         name: Python cache with dependencies.
         id: python-cache
         with:
           path: ${{ env.pythonLocation }}
-          key: ${{ env.pythonLocation }}-${{ matrix.os }}-${{ matrix.python }}-${{ hashFiles('setup.py') }}-${{ hashFiles('dev_requirements.pip') }}
+          key: ${{ env.pythonLocation }}-${{ matrix.os }}-${{ matrix.python }}-${{ hashFiles('pyproject.toml') }}
       - name: Install dependencies.
         run: |
           python -m pip install --upgrade pip
-          pip install -r dev_requirements.pip
-          pip install -r docs/docs_requirements.pip
+          pip install -e .[dev,docs]
           pip list
 
       # Tests.
       - name: Run tests
-        env:
-          PYODK_CONFIG_FILE: ${{ github.workspace }}/tests/resources/.pyodk_config.toml
-        run: nosetests -v -v ${{ matrix.windows_nose_args }}
+        run: python -m unittest --verbose
 
       # Build and Upload.
       - name: Build sdist and wheel.
+        if: success()
         run: |
-          pip install wheel
-          python bin/clean_for_build.py
-          python setup.py sdist bdist_wheel
-
-      # Check.
-      - name: Check dist with twine
-        run: |
-          pip install twine
-          twine check dist/*
+          pip install flit==3.9.0
+          flit --debug build --no-use-vcs
       - name: Upload sdist and wheel.
         if: success()
         uses: actions/upload-artifact@v3

diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@ This library aims to make common data analysis and workflow automation tasks as
 
 ## Install
 
-The currently supported Python version for `pyodk` is 3.8.
+The currently supported Python version for `pyodk` is 3.12.
 
 ### From pip
 
@@ -155,26 +155,20 @@ See issues for additions to `pyodk` that are under consideration. Please file ne
 Install the source files as described above, then:
 
 ```bash
-pip install -r dev_requirements.pip
+pip install -e .[dev]
 ```
 
 You can run tests with:
 
 ```bash
-nosetests
-```
-
-On Windows, use:
-
-```bash
-nosetests -v -v --traverse-namespace ./tests
+python -m unittest
 ```
 
 ## Release
 
 1. Run all linting and tests.
 1. Draft a new GitHub release with the list of merged PRs.
 1. Check out a release branch from latest upstream master.
-1. Update `pyodk/__version__.py` with the new release version number.
+1. Update `pyproject.toml` and `pyodk/__version__.py` with the new release version number.
 1. Commit, push the branch, and initiate a pull request. Wait for tests to pass, then merge the PR.
 1. Tag the release and it will automatically be published (see `release.yml` actions file).
diff --git a/bin/__init__.py b/bin/__init__.py
diff --git a/bin/clean_for_build.py b/bin/clean_for_build.py
diff --git a/bin/pre_commit.py b/bin/pre_commit.py
diff --git a/dev_requirements.in b/dev_requirements.in
diff --git a/dev_requirements.pip b/dev_requirements.pip
diff --git a/docs/docs_requirements.in b/docs/docs_requirements.in