Skip to content

Commit

Permalink
Merge branch 'main' into vhost_error
Browse files Browse the repository at this point in the history
  • Loading branch information
ndevenish committed Sep 5, 2023
2 parents d0818ed + 5d1dfcf commit 1f7102d
Show file tree
Hide file tree
Showing 44 changed files with 282 additions and 520 deletions.
167 changes: 0 additions & 167 deletions .azure-pipelines.yml

This file was deleted.

38 changes: 0 additions & 38 deletions .azure-pipelines/ci.yml

This file was deleted.

42 changes: 0 additions & 42 deletions .azure-pipelines/flake8-validation.py

This file was deleted.

32 changes: 0 additions & 32 deletions .azure-pipelines/syntax-validation.py

This file was deleted.

8 changes: 4 additions & 4 deletions .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[bumpversion]
current_version = 0.30.0
current_version = 0.30.1
commit = True
tag = True

[bumpversion:file:setup.cfg]
search = version = {current_version}
replace = version = {new_version}
[bumpversion:file:pyproject.toml]
search = version = "{current_version}"
replace = version = "{new_version}"

[bumpversion:file:src/zocalo/__init__.py]
search = __version__ = "{current_version}"
Expand Down
78 changes: 78 additions & 0 deletions .github/workflows/build_and_test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
name: Build and Test

on:
push:

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: 3.11
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install pytest build
- name: Build distribution
run: |
python -m build
pip install dist/*.whl
- uses: actions/upload-artifact@v3
with:
path: ./dist/*

test:
needs: build
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ["3.8", "3.9", "3.10", "3.11"]

steps:
- uses: actions/checkout@v3
- uses: actions/download-artifact@v3
with:
name: artifact
path: dist

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install pytest dist/*.whl -r requirements_dev.txt pytest-md pytest-emoji
- name: Run pytest
uses: pavelzw/pytest-action@b09a85cd1831cbaae76125fcae4a1e4b137ef026 # v2.1.3
with:
click-to-expand: false
emoji: true
job-summary: true
verbose: false
custom-arguments: "-v -ra --cov=zocalo --cov-report=xml --cov-branch"
custom-pytest: "PYTHONDEVMODE=1 pytest"
report-title: "Test Report"
- name: Upload Coverage to Codecov
uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d # v3.1.4

pypi-publish:
name: Upload release to PyPI
needs: test
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
runs-on: ubuntu-latest
environment:
name: release
url: https://pypi.org/watchdir
permissions:
id-token: write
steps:
- uses: actions/download-artifact@v3
with:
name: artifact
path: dist
- name: Publish package distributions to PyPI
uses: pypa/gh-action-pypi-publish@b7f401de30cb6434a1e19f805ff006643653240e
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: "CodeQL"

on:
push:
branches: [ "main", "master" ]
branches: ["main"]
pull_request:
branches: [ "main" ]
schedule:
Expand Down
Loading

0 comments on commit 1f7102d

Please sign in to comment.