Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: OnroerendErfgoed/atramhasis
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0.4.3
Choose a base ref
...
head repository: OnroerendErfgoed/atramhasis
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref

Commits on Apr 24, 2015

  1. refactored routes refs #186

    TalissaJoly committed Apr 24, 2015
    Copy the full SHA
    ac6a33c View commit details

Commits on May 4, 2015

  1. refactor routes refs #186

    TalissaJoly committed May 4, 2015
    Copy the full SHA
    23fe736 View commit details

Commits on Jun 2, 2015

  1. Update Changelog

    Koen Van Daele committed Jun 2, 2015
    Copy the full SHA
    f454f45 View commit details
  2. Update version info

    Koen Van Daele committed Jun 2, 2015
    Copy the full SHA
    511bb0f View commit details
  3. Merge branch '186_refactor_routes'

    * 186_refactor_routes:
      Update version info
      Update Changelog
      refactor routes refs #186
    Koen Van Daele committed Jun 2, 2015
    Copy the full SHA
    01a199f View commit details

Commits on Jun 3, 2015

  1. Copy the full SHA
    c61d9e9 View commit details
  2. Copy the full SHA
    026d93a View commit details
  3. Slight renaming to follow the SKOS specs better.

    Koen Van Daele committed Jun 3, 2015
    Copy the full SHA
    394a064 View commit details
  4. Update changelog.

    Koen Van Daele committed Jun 3, 2015
    Copy the full SHA
    c4c317e View commit details
  5. Remove unneeded extra root node. Refs #215

    Koen Van Daele committed Jun 3, 2015
    Copy the full SHA
    fd70a6e View commit details
  6. Merge branch '215_add_more_example_datasets'

    * 215_add_more_example_datasets:
      Remove unneeded extra root node. Refs #215
      Add more example datasets #215
    Koen Van Daele committed Jun 3, 2015
    Copy the full SHA
    5274ba8 View commit details
  7. Update changelog

    Koen Van Daele committed Jun 3, 2015
    Copy the full SHA
    aa00edb View commit details

Commits on Jun 4, 2015

  1. Slight documentation update.

    Koen Van Daele committed Jun 4, 2015
    Copy the full SHA
    4f83ce3 View commit details
  2. add contributing file #212

    cahytinne committed Jun 4, 2015
    Copy the full SHA
    cbf366e View commit details
  3. Merge branch '212_add_contributing_file'

    * 212_add_contributing_file:
      add contributing file #212
    Koen Van Daele committed Jun 4, 2015
    Copy the full SHA
    e110d81 View commit details
  4. Update CHANGELOG

    Koen Van Daele committed Jun 4, 2015
    Copy the full SHA
    2b5c1aa View commit details
  5. Register new sample data with demo application. Refs #215.

    Koen Van Daele committed Jun 4, 2015
    Copy the full SHA
    a94e2ae View commit details
  6. Prepare for release

    Koen Van Daele committed Jun 4, 2015
    Copy the full SHA
    ca8b185 View commit details

Commits on Jun 8, 2015

  1. fix demo scaffold

    BartSaelen committed Jun 8, 2015
    Copy the full SHA
    7f77aae View commit details

Commits on Jul 3, 2015

  1. Copy the full SHA
    228b2a2 View commit details

Commits on Jul 9, 2015

  1. removed requirement for pyramid_debugtoolbar refs #224

    TalissaJoly committed Jul 9, 2015
    Copy the full SHA
    f273150 View commit details

Commits on Jul 22, 2015

  1. Copy the full SHA
    d18c44c View commit details

Commits on Jul 24, 2015

  1. upgraded sqlalchemy to 1.0.6 refs #220

    TalissaJoly committed Jul 24, 2015
    Copy the full SHA
    4325f5a View commit details

Commits on Jul 28, 2015

  1. Copy the full SHA
    741f031 View commit details
  2. increase coverage #214

    cahytinne committed Jul 28, 2015
    Copy the full SHA
    ebd9f19 View commit details
  3. increase coverage #214

    cahytinne committed Jul 28, 2015
    Copy the full SHA
    513ea92 View commit details
  4. Copy the full SHA
    da50cc7 View commit details
  5. Merge branch '214_collect_usage_stats' of github.com:OnroerendErfgoed…

    …/atramhasis into 214_collect_usage_stats
    cahytinne committed Jul 28, 2015
    Copy the full SHA
    32e4a2c View commit details
  6. fix tests #214

    cahytinne committed Jul 28, 2015
    Copy the full SHA
    6fc2bb3 View commit details
  7. add some doc #214

    cahytinne committed Jul 28, 2015
    Copy the full SHA
    e1848c1 View commit details

Commits on Jul 29, 2015

  1. Merge pull request #226 from OnroerendErfgoed/220_update_sqlalchemy

    upgraded sqlalchemy to 1.0.6 refs #220
    BartSaelen committed Jul 29, 2015
    Copy the full SHA
    2e75284 View commit details
  2. Eliminate Dutch

    cahytinne committed Jul 29, 2015
    Copy the full SHA
    17e31d9 View commit details
  3. Copy the full SHA
    046856c View commit details
  4. Copy the full SHA
    c68c29f View commit details
  5. remove invalid audit

    cahytinne committed Jul 29, 2015
    Copy the full SHA
    755bd29 View commit details

Commits on Jul 30, 2015

  1. tests: increase cover

    cahytinne committed Jul 30, 2015
    Copy the full SHA
    347a45f View commit details
  2. Copy the full SHA
    4306947 View commit details
  3. uncomment lines

    cahytinne committed Jul 30, 2015
    Copy the full SHA
    4e74327 View commit details
  4. Merge pull request #227 from OnroerendErfgoed/214_collect_usage_stats

    214 collect usage stats
    BartSaelen committed Jul 30, 2015
    Copy the full SHA
    dd1fc14 View commit details
  5. add test

    cahytinne committed Jul 30, 2015
    Copy the full SHA
    fbfb5ef View commit details
  6. fix test

    cahytinne committed Jul 30, 2015
    Copy the full SHA
    9b8505a View commit details
  7. Copy the full SHA
    90b4182 View commit details
  8. Copy the full SHA
    d84073e View commit details
  9. change main position

    cahytinne committed Jul 30, 2015
    Copy the full SHA
    f609099 View commit details

Commits on Jul 31, 2015

  1. Copy the full SHA
    abe28b6 View commit details
  2. add tests

    cahytinne committed Jul 31, 2015
    Copy the full SHA
    8d4edc2 View commit details
  3. all providers are present

    cahytinne committed Jul 31, 2015
    Copy the full SHA
    32d109f View commit details
  4. fix tests for python 3

    cahytinne committed Jul 31, 2015
    Copy the full SHA
    495c159 View commit details
  5. Copy the full SHA
    408bc7c View commit details
  6. add info add end of script

    cahytinne committed Jul 31, 2015
    Copy the full SHA
    5d5a519 View commit details
Showing 368 changed files with 121,621 additions and 24,926 deletions.
42 changes: 42 additions & 0 deletions .github/workflows/atramhasis_backend.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
name: Atramhasis backend tests

on:
push:
paths:
- atramhasis/**
- scripts/**
- tests/**
- '!atramhasis/static/**'
- .github/workflows/atramhasis_backend.yaml
- pyproject.toml
- requirements*.txt

jobs:
test:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [ "3.10", "3.11", "3.12" ]

steps:
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
# You can test your matrix by printing the current Python version
- name: Display Python version
run: python -c "import sys; print(sys.version)"

- name: Install python requirements
env:
HATCH_BUILD_NO_HOOKS: true
working-directory: ./
run: |
pip --version
pip install pip-tools
pip-sync requirements-dev.txt
pip install -e .
- name: Python tests
run: pytest tests --exitfirst --capture=no -vvv --full-trace
26 changes: 26 additions & 0 deletions .github/workflows/draft-pdf.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
on:
push:
branches:
- joss_paper

jobs:
paper:
runs-on: ubuntu-latest
name: Paper Draft
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Build draft PDF
uses: openjournals/openjournals-draft-action@master
with:
journal: joss
# This should be the path to the paper within your repo.
paper-path: ./paper/paper.md
- name: Upload
uses: actions/upload-artifact@v1
with:
name: paper
# This is the output path where Pandoc will write the compiled
# PDF. Note, this should be the same directory as the input
# paper.md
path: ./paper/paper.pdf
25 changes: 13 additions & 12 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -34,9 +34,6 @@ htmlcov/
nosetests.xml
coverage.xml

# Translations
*.mo

# Mr Developer
.mr.developer.cfg
.project
@@ -67,14 +64,18 @@ _build
# sqlite stuff
*.sqlite

# Vagrant stuff:
.vagrant/
Vagrantfile
vagrant_provision/

#compass
.sass-cache

# dojo/js stuff
atramhasis/static/admin/src/util/
atramhasis/static/admin/src/dojo/
atramhasis/static/admin/src/dojox/
atramhasis/static/admin/src/dijit/
atramhasis/static/admin/src/dGrowl/
atramhasis/static/admin/src/dgrid/
atramhasis/static/admin/src/put-selector/
atramhasis/static/admin/src/xstyle/
#atramhasis/static/admin/dist
atramhasis/static/node_modules
atramhasis/static/admin/dist
atramhasis/static/admin/node_modules

# sqlite database created for tests.
test.db
22 changes: 22 additions & 0 deletions .readthedocs.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# .readthedocs.yaml
# Read the Docs configuration file
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details

# Required
version: 2

# Set the version of Python and other tools you might need
build:
os: ubuntu-22.04
tools:
python: "3.11"

# Build documentation in the docs/ directory with Sphinx
sphinx:
configuration: docs/source/conf.py

# We recommend specifying your dependencies to enable reproducible builds:
# https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html
python:
install:
- requirements: requirements-dev.txt
24 changes: 24 additions & 0 deletions .scrutinizer.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
checks:
python:
code_rating: true
duplicate_code: true
javascript:
no_comma_dangle: true
code_rating: true
duplicate_code: true


build:
environment:
python: 3.12
nodes:
analysis:
tests:
override:
- py-scrutinizer-run

filter:
excluded_paths:
- 'tests/*'
- 'fixtures/*'
- 'atramhasis/scripts/*'
26 changes: 0 additions & 26 deletions .travis.yml

This file was deleted.

Loading