Skip to content

Commit fbfaef2

Browse files
author
James (ODSC)
authored
Merge pull request #3 from OpenDataServices/library
Library
2 parents 50b9ba6 + 54c3ced commit fbfaef2

File tree

4 files changed

+38
-3
lines changed

4 files changed

+38
-3
lines changed

.github/workflows/ci.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: CI
2+
on: [push, pull_request]
3+
4+
jobs:
5+
build:
6+
runs-on: ubuntu-latest
7+
strategy:
8+
matrix:
9+
python-version: [3.5, 3.6, 3.7, 3.8]
10+
steps:
11+
- uses: actions/checkout@v2
12+
- uses: actions/setup-python@v1
13+
with:
14+
python-version: ${{ matrix.python-version }}
15+
- uses: actions/cache@v1
16+
with:
17+
path: ~/.cache/pip
18+
key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements_dev.txt') }}
19+
restore-keys: |
20+
${{ runner.os }}-pip-
21+
- run: pip install -e .[dev]
22+
- run: python -m unittest discover

CHANGELOG.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# Changelog
2+
All notable changes to this project will be documented in this file.
3+
4+
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
5+
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
6+
7+
## [Unreleased]
8+
9+
10+
11+
## [0.2.0] - 2017-11-??
12+
13+
Release (made before this file was in use).

json_merge_patch/tests.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import unittest
2-
import lib as merge
2+
import json_merge_patch.lib as merge
33
from collections import OrderedDict
44

55
fixtures = [

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
setup(name='json-merge-patch',
33
version='0.2',
44
description='JSON Merge Patch library (https://tools.ietf.org/html/rfc7386)',
5-
author='David Raznick',
6-
author_email='mr.raznick@gmail.com',
5+
author='Open Data Services',
6+
author_email='code@opendataservices.coop',
77
scripts=['json-merge-patch'],
88
license='BSD',
99
packages=['json_merge_patch'],

0 commit comments

Comments
 (0)