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: G-Node/odmltools
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.0.0
Choose a base ref
...
head repository: G-Node/odmltools
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
  • 15 commits
  • 7 files changed
  • 3 contributors

Commits on Feb 17, 2020

  1. [init] Rename version_info import

    Since 'version_info' is available via the odmltools
    package import, rename it to python_version to clarify
    the context of this function.
    mpsonntag committed Feb 17, 2020
    Copy the full SHA
    4f616dc View commit details
  2. [init] Add version from info file

    Make the package version number from the info file available.
    mpsonntag committed Feb 17, 2020
    Copy the full SHA
    5d355dd View commit details
  3. Add CHANGELOG.md

    mpsonntag committed Feb 17, 2020
    Copy the full SHA
    4ef250d View commit details
  4. Copy the full SHA
    2d06c6d View commit details
  5. Copy the full SHA
    41717b3 View commit details
  6. Merge pull request #7 from mpsonntag/minorUpdates

    Minor updates
    
    LGTM
    achilleas-k authored Feb 17, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    ca6221c View commit details

Commits on Jun 21, 2021

  1. [appveyor] Use pytest

    mpsonntag committed Jun 21, 2021
    Copy the full SHA
    98c0d4d View commit details
  2. [appveyor] Add python 3.9

    mpsonntag committed Jun 21, 2021
    Copy the full SHA
    f854497 View commit details
  3. [gh-actions] Add workflow

    mpsonntag committed Jun 21, 2021
    Copy the full SHA
    63efdc1 View commit details
  4. Copy the full SHA
    1a9780c View commit details
  5. [README] Replace CI badges

    Replace travis with gh-actions badge
    mpsonntag committed Jun 21, 2021
    Copy the full SHA
    021e0bc View commit details
  6. Copy the full SHA
    4260e2e View commit details
  7. [README] Add coveralls link

    mpsonntag committed Jun 21, 2021
    Copy the full SHA
    e2946ff View commit details
  8. [appveyor] Remove py 3.9

    mpsonntag committed Jun 21, 2021
    Copy the full SHA
    8977de7 View commit details
  9. Merge pull request #9 from mpsonntag/deTravis

    [CI] Thank you and goodbye travis
    jgrewe authored Jun 21, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    87e67fc View commit details
Showing with 74 additions and 79 deletions.
  1. +30 −0 .github/workflows/run-tests.yml
  2. +0 −71 .travis.yml
  3. +23 −0 CHANGELOG.md
  4. +1 −1 MANIFEST.in
  5. +12 −3 README.md
  6. +2 −2 appveyor.yml
  7. +6 −2 odmltools/__init__.py
30 changes: 30 additions & 0 deletions .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: run-tests
on:
push:
branches:
- master
- dev
pull_request:
branches:
- master
jobs:
tests:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
python-version: [3.6, 3.7, 3.8, 3.9]
steps:
- uses: actions/checkout@v2
- name: Setup Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
- name: Display Python version
run: python -c "import sys; print(sys.version)"
- name: Install dependencies
run: |
python setup.py install
pip install pytest
- name: Run tests
run: pytest
71 changes: 0 additions & 71 deletions .travis.yml

This file was deleted.

23 changes: 23 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# Changelog

Used to document all changes from previous releases and collect changes
until the next release.

# Latest changes

## Minor updates
- The package version number is now available from the info file as `VERSION` and `__version__`.
- The packages `__init__` file checks if the users Python version is supported by this release and prints a warning otherwise. The python version import is renamed from `version_info` to `python_version` to give context to the user when they are importing functions from the main package.

# Version 1.0.0

## Initial Package setup
- Classifiers, copyright, etc are found in `odmltools/info.json` and available via `odmltools/info.py`.
- CI support with Travis and Appveyor have been set up.
- The packages `__init__` file checks if the users Python version is supported by this release and prints a warning otherwise.

## Import datacite script
- the odmltools.importers package contains a conversion tool from a DataCite XML file (kernel version 4) to odML.
- this importer handles the latest datacite namespace (http://datacite.org/schema/kernel-4) by default. Further namespaces can be added via the command line to also ensure conversion of previous DataCite version files.
- on install a command line convenience script `odmlimportdatacite` is set up for this conversion.
- Basic conversion tests with a full DataCite XML file has been added.
2 changes: 1 addition & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
include LICENSE README.md
include LICENSE README.md CHANGELOG.md
include odmltools/info.json
recursive-include test/resources *
15 changes: 12 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
![Travis build](https://travis-ci.org/G-Node/odmltools.svg?branch=master)
[![gh actions tests](https://github.com/G-Node/odmltools/workflows/run-tests/badge.svg?branch=master)](https://github.com/G-Node/odmltools/actions)
[![Build status](https://ci.appveyor.com/api/projects/status/oo5lxr6h4pfc9ly7/branch/master?svg=true)](https://ci.appveyor.com/project/G-Node/odmltools/branch/master)
![Test coverage](https://coveralls.io/repos/github/G-Node/odmltools/badge.svg?branch=master)
[![Test coverage](https://coveralls.io/repos/github/G-Node/odmltools/badge.svg?branch=master)](https://coveralls.io/github/G-Node/odmltools)
[![PyPI version](https://img.shields.io/pypi/v/odmltools.svg)](https://pypi.org/project/odmltools/)

# odmltools

@@ -20,7 +21,15 @@ detailed usage descriptions by adding the `help` flag to the command.

odmlimportdatacite -h

# Building from source
# Installation

## pip installation

The easiest way to install the latest release is via the [odmltools PyPI package](https://pypi.org/project/odmltools/https://pypi.org/project/odmltools/):

pip install odmltools

## Building from source

To download the odmltools library please either use git and clone
the repository from GitHub:
4 changes: 2 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -31,8 +31,8 @@ init:
build: false

install:
- python -m pip install odml xmltodict
- python -m pip install odml xmltodict pytest

test_script:
- python --version
- python setup.py test
- python -m pytest
8 changes: 6 additions & 2 deletions odmltools/__init__.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
import warnings

from sys import version_info
from sys import version_info as _python_version

if version_info.major < 3 or version_info.major == 3 and version_info.minor < 6:
from .info import VERSION

if _python_version.major < 3 or _python_version.major == 3 and _python_version.minor < 6:
msg = "The '%s' package is not tested with your Python version. " % __name__
msg += "Please consider upgrading to the latest Python distribution."
warnings.warn(msg)

__version__ = VERSION