diff --git a/.circleci/config.yml b/.circleci/config.yml index 1e43397..40481e6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2.1 resources: base_docker_image: &base_docker_image - image: 621799806001.dkr.ecr.us-east-1.amazonaws.com/pyenv-tox:1.0.0 + image: 621799806001.dkr.ecr.us-east-1.amazonaws.com/pyenv-tox:2.0.3 aws_auth: aws_access_key_id: $DEV_AWS_ACCESS_KEY_ID aws_secret_access_key: $DEV_AWS_SECRET_ACCESS_KEY @@ -64,10 +64,12 @@ commands: - tox_cache-{{ checksum "tox.ini" }} - run: name: pyenv setup - command: pyenv local 2.7.16 3.5.7 3.6.8 3.7.12 3.8.12 3.9.10 3.10.2 + command: pyenv local 3.8.19 3.9.19 3.10.14 3.11.8 3.12.2 - run: name: tox command: tox --pre + environment: + VIRTUALENV_DISCOVERY: pyenv - save_cache: key: tox_cache-{{ checksum "tox.ini" }} paths: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ce1a805..01a4af5 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -32,7 +32,7 @@ $ pip install -e . Run tests: ```sh -$ python setup.py test +$ tox --pre ``` ### Create a Feature Branch diff --git a/datadotworld/__init__.py b/datadotworld/__init__.py index 6aa239a..3fcd3e6 100644 --- a/datadotworld/__init__.py +++ b/datadotworld/__init__.py @@ -35,7 +35,7 @@ ) from datadotworld.datadotworld import DataDotWorld, UriParam # noqa: F401 -__version__ = '1.8.5' +__version__ = '2.0.0a' # Convenience top-level functions diff --git a/setup.py b/setup.py index 82d3ac5..8aa2842 100644 --- a/setup.py +++ b/setup.py @@ -46,7 +46,7 @@ def find_version(*paths): author='data.world', author_email='help@data.world', license='Apache 2.0', - python_requires='>=3.7', + python_requires='>=3.9', packages=find_packages(), keywords='data.world dataset', classifiers=[ @@ -55,10 +55,10 @@ def find_version(*paths): 'Intended Audience :: Science/Research', 'License :: OSI Approved :: Apache Software License', 'Operating System :: OS Independent', - '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', + 'Programming Language :: Python :: 3.12', 'Topic :: Database :: Database Engines/Servers', 'Topic :: Scientific/Engineering :: Information Analysis', 'Topic :: Software Development :: Libraries :: Python Modules', @@ -71,26 +71,14 @@ def find_version(*paths): 'tableschema>=1.5.2,<2.0a', 'python-dateutil>=2.6.0,<3.0a', 'requests>=2.22.0,<3.0a', + 'setuptools>=69.2.0,<70.0a', 'six>=1.5.0,<2.0a', 'tabulator>=1.22.0', 'urllib3>=1.15,<2.0a', ], - setup_requires=[ - 'pytest-runner>=2.11,<3.0a', - ], - tests_require=[ - 'coverage>=4.4.2,<=4.5.3', - 'doublex>=1.8.4,<2.0a', - 'flake8>=2.6.0,<=3.7.7', - 'numpy<=1.21.5', - 'pandas<=1.3.5', - 'pyhamcrest>=1.9.0,<2.0a', - 'pytest>=6.2.5,<7', - 'responses>=0.17.0,<1a', - ], extras_require={ 'pandas': [ - 'numpy<=1.21.5', + 'numpy>=1.26.4,<=2.0a', 'pandas<=1.3.5', ], }, diff --git a/tox.ini b/tox.ini index 05f797a..31bac44 100644 --- a/tox.ini +++ b/tox.ini @@ -1,11 +1,18 @@ [tox] -envlist=py37,py38,py39 +envlist=py39,py310,py311,py312 [testenv] deps= - coverage<=4.5.3 - flake8<=3.7.7 + coverage>=7.4.4,<8.0a + flake8>=2.6.0,<=3.7.7 + doublex>=1.9.6.1,<2.0a + numpy>=1.26.4,<=2.0a + pandas>=2.2.1,<3.0a + pyhamcrest>=2.1.0,<3.0a + pytest>=8.1.1,<9.0a + responses>=0.25.0,<1.0a + commands= flake8 . \ --exclude=datadotworld/client/_swagger/,./.tox/*,./.eggs/*,./build/*,./docs/*,testing/* - coverage run setup.py test {posargs} + coverage run -m pytest coverage report --omit=./.tox/* --fail-under=90