diff --git a/.github/workflows/tox-pytest.yml b/.github/workflows/tox-pytest.yml index cc1a5f45..8263e536 100644 --- a/.github/workflows/tox-pytest.yml +++ b/.github/workflows/tox-pytest.yml @@ -4,39 +4,27 @@ on: [push, pull_request] jobs: ci-test: - runs-on: ubuntu-latest + name: ci-test (${{ matrix.python-version }}, ${{ matrix.os }}) + runs-on: ${{ matrix.os }} strategy: matrix: - python-version: ["3.10"] + os: ["ubuntu-latest"] + python-version: ["3.10", "3.11"] fail-fast: false steps: - uses: actions/checkout@v3 with: fetch-depth: 2 - - - name: Set up conda environment for testing - uses: conda-incubator/setup-miniconda@v2.2.0 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v4 with: - miniforge-variant: Mambaforge - miniforge-version: latest - use-mamba: true - mamba-version: "*" - channels: conda-forge,defaults - channel-priority: true python-version: ${{ matrix.python-version }} - activate-environment: dispatch - environment-file: environment.yml - - shell: bash -l {0} - run: | - conda info - conda list - conda config --show-sources - conda config --show - printenv | sort - - - name: Run PyTest with Tox + - name: Install dependencies run: | - conda run -n dispatch tox + python -m pip install --upgrade pip + pip install tox + - name: Test with tox + run: tox -e ci - name: Coveralls uses: coverallsapp/github-action@master diff --git a/docs/release_notes.rst b/docs/release_notes.rst index ecd622a2..7c096787 100644 --- a/docs/release_notes.rst +++ b/docs/release_notes.rst @@ -101,6 +101,7 @@ What's New? :func:`.zero_profiles_outside_operating_dates` for clarity, use of the former name will be removed in the future. * Code cleanup along with adoption of ruff and removal of bandit, flake8, isort, etc. +* Testing new :mod:`numba` version (or RC) to work with Python 3.11. Bug Fixes diff --git a/environment.yml b/environment.yml index 0728f7db..03241eb1 100644 --- a/environment.yml +++ b/environment.yml @@ -4,15 +4,7 @@ channels: dependencies: # Packages required for setting up the environment - pip>=21.0,<23 - - python>=3.10,<3.11 - - bottleneck >= 1.3,<1.3.6 - - numba >= 0.55.1,<0.57 - - numexpr >= 2.8, <2.8.5 - - numpy >= 1.18.5,<2 - - pandas >= 1.4,<1.6 - - pandera >= 0.12, <0.14 - - pyarrow >= 7,<11 - - plotly>5.10,<=5.11 + - python>=3.10,<3.12 # Use pip to install the package defined by this repo for development: - pip: diff --git a/pyproject.toml b/pyproject.toml index 64f2cf94..fd3e3b7b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -16,10 +16,11 @@ classifiers = [ "Programming Language :: Python :: 3 :: Only", "Programming Language :: Python :: 3.10", ] -requires-python = ">=3.10,<3.11" +requires-python = ">=3.10,<3.12" dependencies = [ "bottleneck >= 1.3,< 1.3.8", - "numba >= 0.55.1,<0.57", + "numba == 0.57.0rc1; python_version>='3.11'", + "numba >= 0.55.1,<0.57; python_version<'3.11'", "numexpr >= 2.8, < 2.8.5", "numpy >= 1.18.5,<2", "pandas >= 1.4,< 1.6", @@ -31,8 +32,8 @@ dependencies = [ [project.optional-dependencies] dev = [ "black[jupyter] >= 22,< 24", - "docformatter>=1.5,<1.6", - "ruff>0.0.215,<0.0.261", + "docformatter>=1.5,<1.7", + "ruff>0.0.215,<0.0.262", "tox>=3.20,<4.5", "twine>=3.3,<4.1", # Used to make releases to PyPI ] @@ -54,7 +55,7 @@ tests = [ "pytest-console-scripts>=1.1,<1.4", "pytest-cov>=2.10,<4.1", "rstcheck[sphinx,toml]>=5.0,<6.2", - "ruff>0.0.215,<0.0.261", + "ruff>0.0.215,<0.0.262", "tox>=3.20,<4.5", ] viz = [