Skip to content

Commit a2c6d2a

Browse files
authored
Merge pull request #301 from jrief/Sortable.js
Sortable.js
2 parents e6ea3d4 + 92a134f commit a2c6d2a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+3326
-6611
lines changed

.editorconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ indent_size = 4
1414
max_line_length = 119
1515
indent_style = space
1616

17+
[*.rst]
18+
max_line_length = 100
19+
1720
[*.json]
1821
indent_style = space
1922
indent_size = 2

.github/workflows/django.yml

Lines changed: 0 additions & 33 deletions
This file was deleted.

.github/workflows/publish.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,27 @@ jobs:
1616
strategy:
1717
matrix:
1818
python-version: ["3.9"]
19+
node-version: ["16.x"]
1920

2021
steps:
2122
- uses: actions/checkout@v2
23+
- name: Use Node.js ${{ matrix.node-version }}
24+
uses: actions/setup-node@v2
25+
with:
26+
node-version: ${{ matrix.node-version }}
2227
- name: Set up Python ${{ matrix.python-version }}
2328
uses: actions/setup-python@v2
2429
with:
2530
python-version: ${{ matrix.python-version }}
26-
- name: Install dependencies
31+
- name: Install Dependencies
2732
run: |
33+
npm ci --also=dev
2834
python -m pip install --upgrade pip
2935
python -m pip install build --user
36+
- name: Build Client
37+
run: |
38+
npm run build
39+
npm run uglify
3040
- name: Build 🐍 Python 📦 Package
3141
run: python -m build --sdist --wheel --outdir dist/
3242
- name: Publish 🐍 Python 📦 Package to PyPI

.github/workflows/tests.yml

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
name: Django CI
2+
3+
on:
4+
push:
5+
branches: [ master, Sortable.js ]
6+
pull_request:
7+
branches: [ master ]
8+
9+
jobs:
10+
build:
11+
12+
runs-on: ubuntu-latest
13+
strategy:
14+
max-parallel: 4
15+
matrix:
16+
python-version: ["3.8", "3.9", "3.10"]
17+
Django-version: ["<4.1"]
18+
node-version: ["16.x"]
19+
20+
steps:
21+
- uses: actions/checkout@v2
22+
- name: Use Node.js ${{ matrix.node-version }}
23+
uses: actions/setup-node@v2
24+
with:
25+
node-version: ${{ matrix.node-version }}
26+
- name: Set up Python ${{ matrix.python-version }}
27+
uses: actions/setup-python@v2
28+
with:
29+
python-version: ${{ matrix.python-version }}
30+
- name: Install Dependencies
31+
run: |
32+
npm ci --also=dev
33+
npx playwright install --with-deps
34+
python -m pip install --upgrade pip
35+
python -m pip install "Django${{ matrix.Django-version }}"
36+
python -m pip install -r testapp/requirements.txt
37+
python -m playwright install
38+
python -m playwright install-deps
39+
- name: Build Client
40+
run: |
41+
npm run build
42+
- name: Test with pytest
43+
run: |
44+
python -m pytest testapp

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,7 @@ local_settings.py
1515
build
1616
docs/_build
1717
dist
18+
node_modules/
1819
htmlcov
20+
adminsortable2/static/adminsortable2/js/adminsortable2.*
21+
testapp/test.db

.tx/config

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)