Skip to content

Library #3

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

Merged
3 commits merged into from
Jun 9, 2020
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
22 changes: 22 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: CI
on: [push, pull_request]

jobs:
build:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: [3.5, 3.6, 3.7, 3.8]
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v1
with:
python-version: ${{ matrix.python-version }}
- uses: actions/cache@v1
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements_dev.txt') }}
restore-keys: |
${{ runner.os }}-pip-
- run: pip install -e .[dev]
- run: python -m unittest discover
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Changelog
All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## [Unreleased]



## [0.2.0] - 2017-11-??

Release (made before this file was in use).
2 changes: 1 addition & 1 deletion json_merge_patch/tests.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import unittest
import lib as merge
import json_merge_patch.lib as merge
from collections import OrderedDict

fixtures = [
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
setup(name='json-merge-patch',
version='0.2',
description='JSON Merge Patch library (https://tools.ietf.org/html/rfc7386)',
author='David Raznick',
author_email='mr.raznick@gmail.com',
author='Open Data Services',
author_email='code@opendataservices.coop',
scripts=['json-merge-patch'],
license='BSD',
packages=['json_merge_patch'],
Expand Down