diff --git a/.github/workflows/test-mysql.yml b/.github/workflows/test-mysql.yml deleted file mode 100644 index f4b2717..0000000 --- a/.github/workflows/test-mysql.yml +++ /dev/null @@ -1,68 +0,0 @@ -name: test-mysql - -on: - push: - branches: - - main - pull_request: - branches: - - main - -jobs: - test-mysql: - runs-on: ubuntu-20.04 - strategy: - max-parallel: 4 - matrix: - python-version: [3.9] - django-version: [2.2.13, 3.0.7, 3.1.2, 3.2.4] - include: - - python-version: "3.10" - django-version: "4.0.4" - - env: - MYSQL_PASSWORD: mysql - MYSQL_USER: mysql - MYSQL_DATABASE: test_db - MYSQL_HOST: 127.0.0.1 - TEST_WITH_MYSQL: true - - services: - mysql: - image: mysql - ports: ['3306:3306'] - env: - MYSQL_PASSWORD: mysql - MYSQL_ROOT_PASSWORD: mysql - MYSQL_USER: mysql - MYSQL_DATABASE: test_db - options: >- - --health-cmd "mysqladmin ping" - --health-interval 10s - --health-timeout 10s - --health-retries 5 - - steps: - - uses: actions/checkout@v1 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 - with: - python-version: ${{ matrix.python-version }} - - name: Install tooling - run: | - python -mpip install poetry - - name: Install mysqlclient - run: | - poetry add mysqlclient - - name: Install dependencies - run: | - poetry install - - name: Setup Django ${{ matrix.django-version }} - run: | - poetry run pip install django==${{ matrix.django-version }} - - name: Lint with flake - run: | - poetry run flake8 django_sqids - - name: Test with pytest - run: | - poetry run pytest --cov=./django_sqids/ --no-migrations diff --git a/.github/workflows/test-pg.yml b/.github/workflows/test-pg.yml deleted file mode 100644 index f308cd0..0000000 --- a/.github/workflows/test-pg.yml +++ /dev/null @@ -1,67 +0,0 @@ -name: test-pg - -on: - push: - branches: - - main - pull_request: - branches: - - main - -jobs: - test-pg: - runs-on: ubuntu-20.04 - strategy: - max-parallel: 4 - matrix: - python-version: [3.9] - django-version: [1.11.29, 2.2.13, 3.0.7, 3.1.2, 3.2.4] - include: - - python-version: "3.10" - django-version: "4.0.4" - - env: - POSTGRES_PASSWORD: postgres - POSTGRES_USER: postgres - POSTGRES_DB: postgres - POSTGRES_HOST: 127.0.0.1 - TEST_WITH_PG: true - - services: - postgres: - image: postgres - ports: ['5432:5432'] - env: - POSTGRES_PASSWORD: postgres - POSTGRES_USER: postgres - POSTGRES_DB: postgres - options: >- - --health-cmd pg_isready - --health-interval 10s - --health-timeout 5s - --health-retries 5 - - steps: - - uses: actions/checkout@v1 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 - with: - python-version: ${{ matrix.python-version }} - - name: Install tooling - run: | - python -mpip install poetry - - name: Install psycopg2 - run: | - poetry add psycopg2-binary - - name: Install dependencies - run: | - poetry install - - name: Setup Django ${{ matrix.django-version }} - run: | - poetry run pip install django==${{ matrix.django-version }} - - name: Lint with flake - run: | - poetry run flake8 django_sqids - - name: Test with pytest - run: | - poetry run pytest --cov=./django_sqids/ --no-migrations diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 79a64c1..c07333a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -14,26 +14,23 @@ jobs: strategy: max-parallel: 4 matrix: - python-version: ["3.6", "3.7", "3.8", "3.9"] - django-version: ["1.11.29", "2.2.13", "3.0.7", "3.1.2", "3.2.4"] - include: - - python-version: "3.10" - django-version: "4.0.4" + python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] + django-version: ["3.2", "4.2", "5.0b1"] steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} - name: Install tooling run: | - python -mpip install poetry; python -mpip install six + python -m pip install poetry==1.7.0 - name: Install dependencies run: | poetry install - name: Setup Django ${{ matrix.django-version }} run: | - poetry run pip install django==${{ matrix.django-version }} + poetry run pip install --pre django==${{ matrix.django-version }} - name: Lint with flake run: | poetry run flake8 django_sqids