Skip to content

Commit

Permalink
Merge 953e1a9 into 9f065ba
Browse files Browse the repository at this point in the history
  • Loading branch information
juarezr committed Nov 23, 2022
2 parents 9f065ba + 953e1a9 commit a14f158
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test-changes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
fail-fast: false
matrix:
os: [ "ubuntu-latest", "windows-latest", "macos-latest" ]
python: ['2.7', '3.6', '3.7', '3.8', '3.9', '3.10']
python: ['2.7', '3.6', '3.7', '3.8', '3.9', '3.10', '3.11']

runs-on: "${{ matrix.os }}"

Expand Down
2 changes: 1 addition & 1 deletion docs/contributing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ suite with::
$ pip install -r requirements-tests.txt
$ pytest -v petl

Currently :mod:`petl` supports Python 2.7, 3.6 up to 3.10
Currently :mod:`petl` supports Python 2.7, 3.6 up to 3.11
so the tests should pass under all these Python versions.

Dependencies
Expand Down
4 changes: 3 additions & 1 deletion requirements-formats.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,12 @@ intervaltree>=3.0.2
lxml>=4.6.5
openpyxl>=2.6.2
pandas
tables
Whoosh>=2.7.4
xlrd>=2.0.1
xlwt>=1.3.0
fastavro>=0.24.2 ; python_version >= '3.4'
fastavro==0.24.2 ; python_version < '3.0'
gspread>=3.4.0 ; python_version >= '3.4'

# version 3.7.0 doesn't work yet with python3.11
tables ; python_version != '3.11'
19 changes: 13 additions & 6 deletions requirements-optional.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
# packages bellow need complex local setup
# throubleshooting:
# 1. define the following variable before running pip:
# $ export DISABLE_BLOSC_AVX2=1
# 2. pip install --prefer-binary bcolz
# Packages bellow need complex local setup #
# Also check: .github/workflows/test-changes.yml

# Throubleshooting:
# 1. $ export DISABLE_BLOSC_AVX2=1
# 2. $ brew install c-blosc

blosc ; python_version >= '3.7'
bcolz ; python_version >= '3.7'

# Throubleshooting:
# 1. pip install --prefer-binary -r requirements-optional.txt
# 2. pip install --prefer-binary bcolz

bcolz ; python_version >= '3.7' and python_version < '3.10'
2 changes: 2 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
'Programming Language :: Python :: 3.11',
'Topic :: Software Development :: Libraries :: Python Modules'
]
)
10 changes: 5 additions & 5 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -4,32 +4,32 @@
# and then run "tox" from this directory.

[tox]
envlist = py27, py36, py37, py38, py39, py310, {py36,py37,py38,py39,py310}-docs
envlist = py27, py36, py37, py38, py39, py310, py311, {py36,py37,py38,py39,py310,py311}-docs

[testenv]
# get stable output for unordered types
setenv =
PYTHONHASHSEED = 42
py27: PY_MAJOR_VERSION = py2
py36,py37,py38,py39,py310: PY_MAJOR_VERSION = py3
py36,py37,py38,py39,py310,py311: PY_MAJOR_VERSION = py3
commands =
pytest --cov=petl petl
coverage report -m
deps =
-rrequirements-tests.txt
-rrequirements-formats.txt

[testenv:{py36,py37,py38,py39}-docs]
[testenv:{py36,py37,py38,py39,py310,py311}-docs]
# build documentation under similar environment to readthedocs
changedir = docs
deps =
-rrequirements-docs.txt
commands =
sphinx-build -W -b html -d {envtmpdir}/doctrees . {envtmpdir}/html

[testenv:{py36,py37,py38,py39,py310}-doctest]
[testenv:{py36,py37,py38,py39,py310,py311}-doctest]
commands =
py36,py37,py38,py39,py310: pytest --doctest-modules --cov=petl petl
py36,py37,py38,py39,py310,py311: pytest --doctest-modules --cov=petl petl
[testenv:{py36,py37,py38,py39}-dochtml]
changedir = docs
deps =
Expand Down

0 comments on commit a14f158

Please sign in to comment.