diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index f6b2f1f..0000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,48 +0,0 @@ -version: 2.1 - -workflows: - test: - jobs: - - test_3-7 - - test_3-8 - - test_3-9 - - test_3-10 - - test_3-11 - -template: &template - working_directory: ~/repo - steps: - - checkout - - run: - name: install dependencies - command: | - pip install -r base_requirements.txt - pip install -r dev_requirements.txt - pip install -e . - - run: - name: run static analysis - command: | - flake8 - isort -c . - -jobs: - test_3-7: - docker: - - image: cimg/python:3.7 - <<: *template - test_3-8: - docker: - - image: cimg/python:3.8 - <<: *template - test_3-9: - docker: - - image: cimg/python:3.9 - <<: *template - test_3-10: - docker: - - image: cimg/python:3.10 - <<: *template - test_3-11: - docker: - - image: cimg/python:3.11 - <<: *template diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml new file mode 100644 index 0000000..2d4ebfb --- /dev/null +++ b/.github/workflows/python.yml @@ -0,0 +1,23 @@ +name: CI +on: + push: + branches: [ "master" ] + pull_request: + branches: [ "master" ] +jobs: + test: + name: Run tests + runs-on: ubuntu-latest + strategy: + matrix: + python: ["3.9", "3.10", "3.11", "3.12"] + steps: + - uses: actions/checkout@v4 + - name: Setup Python + uses: actions/setup-python@v5 + with: + python-version: ${{ matrix.python }} + - name: Install tox and any other packages + run: pip install tox + - name: Run tox + run: tox run -e py diff --git a/MANIFEST.in b/MANIFEST.in index d2ab066..9814b23 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -5,4 +5,4 @@ include dev_requirements.txt include CHANGELOG.md include LICENSE include README.md -prune .circleci +exclude tox.ini diff --git a/setup.cfg b/setup.cfg index 8714433..61dd3e2 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,13 +1,11 @@ [flake8] max-line-length = 120 -max-complexity = 10 [isort] force_single_line = true line_length = 120 lines_between_types = 1 skip_glob = *.template -known_third_party = yaml [zest.releaser] create-wheel = yes diff --git a/setup.py b/setup.py index 3143d69..fb93acf 100644 --- a/setup.py +++ b/setup.py @@ -49,10 +49,9 @@ def get_long_description(): 'License :: OSI Approved :: BSD License', 'Programming Language :: Python', 'Programming Language :: Python :: 3', - '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', ], ) diff --git a/tox.ini b/tox.ini new file mode 100644 index 0000000..17032ea --- /dev/null +++ b/tox.ini @@ -0,0 +1,15 @@ +[tox] +requires = + tox>=4 +env_list = py{39,310,311,312} + +[testenv] +description = run linters +skip_install = true +deps = + flake8 + flake8-commas + isort +commands = + flake8 + isort --check --diff .