From 52be32a1a05ccdd85ea0f239a94f6e3db02f78d7 Mon Sep 17 00:00:00 2001 From: Johannes Hoppe Date: Wed, 28 Aug 2019 12:10:28 +0200 Subject: [PATCH 1/3] Enable GitHub CI --- .github/workflows/pythonpackage.yml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 .github/workflows/pythonpackage.yml diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml new file mode 100644 index 0000000..15a3041 --- /dev/null +++ b/.github/workflows/pythonpackage.yml @@ -0,0 +1,28 @@ +name: Python package + +on: [push] + +jobs: + build: + + runs-on: ubuntu-latest + strategy: + max-parallel: 4 + matrix: + python-version: [3.5, 3.6, 3.7] + django-version: [1.11, 2.2, master] + + steps: + - uses: actions/checkout@v1 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v1 + with: + python-version: ${{ matrix.python-version }} + - name: Install dependencies + run: | + python -m pip install --upgrade pip + pip install --upgrade tox codecov + - name: Test with pytest + run: | + tox -e py${{ matrix.python-version}}-dj${{ matrix.django-version }} + codecov From 535cf62d35f5ebfa484d7b5f75a337351a68d4f1 Mon Sep 17 00:00:00 2001 From: Johannes Hoppe Date: Wed, 28 Aug 2019 12:19:50 +0200 Subject: [PATCH 2/3] Fix tox config to support proper version identifiers --- setup.cfg | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/setup.cfg b/setup.cfg index 162dda1..1b753ce 100644 --- a/setup.cfg +++ b/setup.cfg @@ -56,12 +56,12 @@ DJANGO_SETTINGS_MODULE=tests.settings addopts = --cov=stdimage --cov-report xml --tb=short -rxs --nomigrations [tox:tox] -envlist = py{36,37}-dj{111,22,master} +envlist = py{3.6,3.7}-dj{1.11,2.2,master} [testenv] deps = - dj111: https://github.com/django/django/archive/stable/1.11.x.tar.gz#egg=django - dj22: https://github.com/django/django/archive/stable/2.2.x.tar.gz#egg=django + dj1.11: https://github.com/django/django/archive/stable/1.11.x.tar.gz#egg=django + dj2.2: https://github.com/django/django/archive/stable/2.2.x.tar.gz#egg=django djmaster: https://github.com/django/django/archive/master.tar.gz#egg=django commands = python setup.py test From a109595bf5ecf371f31b6fc6ddc5ea472fa9887e Mon Sep 17 00:00:00 2001 From: Johannes Hoppe Date: Wed, 28 Aug 2019 12:26:08 +0200 Subject: [PATCH 3/3] wip --- .github/workflows/release.yml | 30 ++++++++++++++++ .../{pythonpackage.yml => tests.yml} | 16 +++++---- .travis.yml | 36 ------------------- setup.cfg | 6 ++-- 4 files changed, 42 insertions(+), 46 deletions(-) create mode 100644 .github/workflows/release.yml rename .github/workflows/{pythonpackage.yml => tests.yml} (57%) delete mode 100644 .travis.yml diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000..267dc98 --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,30 @@ +name: PyPi Release + +on: + release: + push: + branches: + - master + +jobs: + build: + + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v1 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v1 + with: + python-version: ${{ matrix.python-version }} + - name: Install gettext + run: sudo apt-get install gettext -y + - name: Install dependencies + run: | + python -m pip install --upgrade pip setuptools wheel twine + - name: Build dist packages + run: python setup.py sdist bdist_wheel + - name: Upload packages + run: twine upload dist/* + env: + TWINE_USERNAME: ${{ secrets.TWINE_USERNAME }} + TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }} diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/tests.yml similarity index 57% rename from .github/workflows/pythonpackage.yml rename to .github/workflows/tests.yml index 15a3041..17f8f14 100644 --- a/.github/workflows/pythonpackage.yml +++ b/.github/workflows/tests.yml @@ -1,4 +1,4 @@ -name: Python package +name: Tests on: [push] @@ -10,7 +10,7 @@ jobs: max-parallel: 4 matrix: python-version: [3.5, 3.6, 3.7] - django-version: [1.11, 2.2, master] + django-version: [1.11.*, 2.2.*] steps: - uses: actions/checkout@v1 @@ -20,9 +20,11 @@ jobs: python-version: ${{ matrix.python-version }} - name: Install dependencies run: | - python -m pip install --upgrade pip - pip install --upgrade tox codecov + python -m pip install --upgrade pip setuptools + pip install django==${{ matrix.django-version }} - name: Test with pytest - run: | - tox -e py${{ matrix.python-version}}-dj${{ matrix.django-version }} - codecov + run: python setup.py test + - name: Codecov + uses: codecov/codecov-action@v1.0.2 + with: + token: ${{secrets.CODECOV_TOKEN}} diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index d44615a..0000000 --- a/.travis.yml +++ /dev/null @@ -1,36 +0,0 @@ -language: python -dist: xenial -cache: pip -python: -- '3.6' -- '3.7' -env: - matrix: - - DJANGO=111 - - DJANGO=22 - - DJANGO=master -matrix: - fast_finish: true - allow_failures: - - env: DJANGO=master -install: -- pip install --upgrade pip tox codecov -before_script: -- | - if [[ -z $TOXENV ]]; then - export TOXENV=py$(echo $TRAVIS_PYTHON_VERSION | sed -e 's/\.//g')-dj$DJANGO - fi -- echo $TOXENV -script: -- tox -e $TOXENV -after_success: -- codecov -deploy: - provider: pypi - user: codingjoe - password: - secure: dnmVaqnmG6mSrmI9q6nL2l0aGkX56+WAsqdT/J1O2hBpFBOE4NiqH+2ryIqZj1wrvHZ72/jjyT5Xi1MWYxwDtDfkBIp+juHUGPbFfGy3J7EVgGkmf38E5SC2Q9IHc3A1iHxTZAX3o816TP3bt5vwGll3UzSMiaaPRQ/AiK4+og4= - on: - tags: true - distributions: compile_translations sdist bdist_wheel - repo: codingjoe/django-stdimage diff --git a/setup.cfg b/setup.cfg index 1b753ce..162dda1 100644 --- a/setup.cfg +++ b/setup.cfg @@ -56,12 +56,12 @@ DJANGO_SETTINGS_MODULE=tests.settings addopts = --cov=stdimage --cov-report xml --tb=short -rxs --nomigrations [tox:tox] -envlist = py{3.6,3.7}-dj{1.11,2.2,master} +envlist = py{36,37}-dj{111,22,master} [testenv] deps = - dj1.11: https://github.com/django/django/archive/stable/1.11.x.tar.gz#egg=django - dj2.2: https://github.com/django/django/archive/stable/2.2.x.tar.gz#egg=django + dj111: https://github.com/django/django/archive/stable/1.11.x.tar.gz#egg=django + dj22: https://github.com/django/django/archive/stable/2.2.x.tar.gz#egg=django djmaster: https://github.com/django/django/archive/master.tar.gz#egg=django commands = python setup.py test