Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release candidate for v1.1.0 #555

Merged
merged 7 commits into from
Nov 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions .github/workflows/container-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,14 +77,18 @@ jobs:
with:
python-version: 3.11
- name: Install mreg-cli
run: |
curl -L -o mreg-cli https://github.com/unioslo/mreg-cli/releases/download/1.0.1/mreg-cli-ubuntu-latest-3.12
chmod 0755 mreg-cli
sudo mv mreg-cli /usr/bin/ # put it somewhere in $PATH
- name: Run the tests
run: |
wget -nd https://github.com/unioslo/mreg-cli/archive/refs/heads/master.zip
unzip master.zip
cd mreg-cli-master
pip install -r requirements.txt
pip install -e .
- name: Run the tests
run: mreg-cli-master/ci/run_testsuite_and_record.sh
cp data/mreg-cli.conf ~/.config/mreg-cli.conf
pip install -r requirements-dev.txt
ci/run_testsuite_and_record.sh
- name: Upload the log as an artifact
uses: actions/upload-artifact@v4
with:
Expand Down
21 changes: 12 additions & 9 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ jobs:
- "3.12"
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Cache pip
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.cache/pip
key: v1-pip-${{ runner.os }}-${{ matrix.python-version }}-${{ hashFiles('requirements-*.txt') }}
Expand All @@ -50,7 +50,7 @@ jobs:
v1-pip-${{ runner.os }}
v1-pip-
- name: Install Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
Expand All @@ -66,7 +66,9 @@ jobs:
env:
MREG_DB_PASSWORD: postgres
- name: Check migrations
run: python manage.py makemigrations --check
run: |
export MREG_DB_NAME=mreg MREG_DB_USER=mreg MREG_DB_PASSWORD=postgres
python manage.py makemigrations --check
# - name: Export OpenAPI schema
# run: python manage.py generateschema > openapi.yml
# - name: Upload OpenAPI schema
Expand All @@ -76,10 +78,11 @@ jobs:
# name: openapi.yml
# path: openapi.yml
- name: Upload coverage
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: coverage-${{ matrix.python-version }}
path: .coverage
include-hidden-files: true

coveralls:
if: ${{ github.event_name == 'pull_request' || github.repository == 'unioslo/mreg' }}
Expand All @@ -97,21 +100,21 @@ jobs:
- "3.12"
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Cache pip
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.cache/pip
key: v1-pip-${{ runner.os }}-${{ matrix.python-version }}
restore-keys: |
v1-pip-${{ runner.os }}
v1-pip-
- name: Install Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Download coverage
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: coverage-${{ matrix.python-version }}
- name: Install Coveralls
Expand Down
5 changes: 3 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ psycopg2-binary==2.9.9
pika==1.3.2
sentry-sdk==2.12.0
tzdata==2024.1
unittest_parametrize==1.5.0
# For OpenAPI schema generation.
uritemplate
pyyaml
#uritemplate
#pyyaml
Loading