Skip to content

Commit

Permalink
Merge pull request #57 from Stephen-Gates/update-licences
Browse files Browse the repository at this point in the history
Update licences
  • Loading branch information
mlinksva authored Nov 5, 2017
2 parents 890f551 + 4cb5564 commit 6008d0c
Show file tree
Hide file tree
Showing 7 changed files with 263 additions and 115 deletions.
44 changes: 44 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
# 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/). The [project releases](https://github.com/okfn/licenses/releases) will adhere to [semantic versioning](http://semver.org/spec/v2.0.0.html)

This approach was adopted after release 0.7.

To see what's planned, see our [milestones](https://github.com/okfn/licenses/milestones) or unreleased changes.

[Unreleased]: https://github.com/okfn/licenses/compare/0.7...HEAD
## [Unreleased]

[0.7]: https://github.com/okfn/licenses/compare/0.6.1...0.7
## [0.7] - 2012-03-18

[0.6.1]: https://github.com/okfn/licenses/compare/0.6...0.6.1
## [0.6.1] - 2011-02-23
### Changed
- Minor tweak to CC BY-SA license name

[0.6]: https://github.com/okfn/licenses/compare/0.5...0.6
## [0.6] - 2011-02-11
### Changed
- Heavy refactoring and simplification
- Improve and add documentation

## 0.5 - 2010-05-12
No GitHub compare between 0.4 and 0.5 available as 0.4 was not tagged as a release in GitHub.
### Added
- Addition of Licenses SoS v2.0 capabilities

## 0.4 - 2010-03-08
Release not implemented in GitHub.
### Added
- Addition of Licenses SoS v1.0 capabilities (Specification of Service)

### Changed
- This module is redesigned to be a web service

## 0.3 - 2010-03-06 and older
Release 0.3 not implemented in GitHub.

### Added
- Module is designed to be imported to provide its list of licenses
5 changes: 5 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
## Code of Conduct

We are a worldwide network of people passionate about openness, and we use advocacy, technology and training to unlock information so everyone can benefit from open knowledge.

Read about [our vision and values](https://okfn.org/about/vision-and-values/).
69 changes: 69 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
# Contributing

Firstly, thanks for being here. All types of contributions are valued and gratefully received. Please consider how you may be able to contribute:

- [financial support](#contribute-financial-support)
- [ideas and feature requests](#contribute-ideas-and-feature-requests)
- [issues or bug reports](#contribute-issues)
- [documentation](#contribute-documentation)
- [code](#contribute-code)

## Contribute Financial Support

We are grateful to all [our funders][funders]. Would you like to [make a donation][donate]?

## Contribute Ideas and Feature Requests

Your idea for a feature addition may already exist on our [issues] backlog. If you find it, join the conversation.

If the gist of your idea isn't there:
- [add an issue][issues]
- to discuss your idea privately, [contact us][contact_us]

## Contribute Issues

If you encounter a problem, please [add an issue][issues]. Make sure it hasn't already be reported.

In order for us to best respond to the issue, we need as much information about the issue as you can provide. Please provide:

- as much detail as possible in the issue template.
- a descriptive name for your issue.

We may add or change labels on your issue to help us manage the issue backlog.

## Contribute Documentation

Documentation helps people use and contribute to the work we do. You may like to:

- improve the [Readme.md][readme]
- add or improve other documentation in this repository
- write a Guide, Blog post or even Tweet

## Contribute Code
This work is open source, and we are grateful to all our [contributors]. By participating in this project, you agree to abide by our [Code of Conduct][code_of_conduct].

Before you start coding, please reach out to us to discuss how you can help.

If this is your first time contributing code, you will need to [create a fork of this repository](https://help.github.com/articles/fork-a-repo/).

Follow the [readme instructions][readme] to get your development environment running locally.

Ensure that all automated tests pass before starting work on your contribution.

### Code Review Process

All contributions to the codebase will be reviewed. To increase your chances of your code being accepted please be aware of the following:

- Write [well formed commit messages](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html)
- Write tests for all changes (additions or refactors of existing code).
- We may use GitHub integrations to check your contribution.
- Once your Pull Request (PR) is published and passes the above checks a repository administrator will review your contribution. Where appropriate, comments will be provided and amendments suggested before your PR is merged into Master.


[code_of_conduct]: CODE_OF_CONDUCT.md
[contact_us]: https://okfn.org/contact/
[contributors]: https://github.com/okfn/licenses/graphs/contributors
[donate]: https://okfn.org/donate/
[funders]: https://okfn.org/team/funders/
[issues]: https://github.com/okfn/licenses/issues
[readme]: README.md
25 changes: 25 additions & 0 deletions ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
> Please provide a general summary of the issue in the Issue Title above
> fill out the headings below as applicable to the issue you are reporting,
> deleting as appropriate but offering us as much detail as you can to help us resolve the issue
### Expected Behaviour
> What should happen?
### Desired Behaviour (for enhancement suggestions only)
> if relevant include images or hyperlinks to other resources that clarify the enhancement you're seeking
### Current Behaviour (for problems)
> What currently happens that isn't expected behaviour?
### Steps to Reproduce (for problems)
> Provide a link to a live example, or an unambiguous set of steps to reproduce this bug. Include code to reproduce, if relevant
1.
2.
3.
4.

### Your Environment
> Include as many relevant details about the environment you experienced the bug in - this will help us resolve the bug more expediently
* Environment name and version:
* Operating System and version:
39 changes: 6 additions & 33 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
[![Gitter chat](https://badges.gitter.im/gitterHQ/gitter.png)](https://gitter.im/okfn/chat)

Machine readable list of open (http://opensource.org/,
http://opendefinition.org/) licenses and web service - see
<http://licenses.opendefinition.org/>.
Expand All @@ -13,6 +15,8 @@ All data (and associated content) is placed in the Public Domain using the
License](http://opendatacommons.org/licenses/pddl/1-0/). All code is licensed
under the [MIT License](http://www.opensource.org/licenses/mit-license.php).

## contributions
Your contributions are very welcome. [Learn how you can help](./CONTRIBUTING.md)

## Layout

Expand All @@ -34,39 +38,8 @@ To build files for deployment do:

bin/deploy.py run

For deployment simply upload the current directory files to a relevant online
location.
For deployment simply upload the current directory files to a relevant online location.

We currently use github pages (we previously used s3).

## Changelog

### HEAD

* Complete rewrite to be simpler (just data, no longer python library).
See <https://github.com/okfn/licenses/issues/1>

### v0.6.1 2011-02-22

* Minor tweak to CC by-sa license name

### v0.6 2011-02-11

* Heavy refactoring and simplification
* Improve and add documentation

### v0.5 2010-05-11

* Addition of Licenses SoS v2.0 capabilities


### v0.4 2010-03-08

* This module is redesigned to be a web service
* Addition of Licenses SoS v1.0 capabilities (Specification of Service)


### v0.3 2010-03-06 and older

* Module is designed to be imported to provide its list of licenses

The changes in each [release](https://github.com/okfn/licenses/releases) are recorded in the [Change Log](./CHANGELOG.md).
179 changes: 102 additions & 77 deletions datapackage.json
Original file line number Diff line number Diff line change
@@ -1,83 +1,108 @@
{
"title": "Licenses",
"name": "licenses",
"title": "Licenses",
"description": "a list of open (http://opensource.org/, http://opendefinition.org/) licenses.",
"sources": [
{
"name":"Open Definition Licenses Service",
"web": "http://licenses.opendefinition.org"
}
],
"licenses": [
{
"url": "http://www.opendefinition.org/licenses/odc-pddl",
"title": "Open Data Commons Public Domain Dedication and Licence 1.0",
"id": "ODC-PDDL-1.0"
}
],
"resources": [
{
"name": "licenses.csv",
"path": "licenses.csv",
"mediatype": "text/csv",
"bytes": 15051,
"schema": {
"fields": [
{
"name": "id",
"type": "string"
},
{
"name": "domain_content",
"type": "string",
"description": "Open Content License"
},
{
"name": "domain_data",
"type": "string",
"description": "Open Data License"
},
{
"name": "domain_software",
"type": "string",
"description": "Open Software License"
},
{
"name": "family",
"type": "number"
},
{
"name": "is_generic",
"type": "number"
},
{
"name": "maintainer",
"type": "number"
},
{
"name": "od_conformance",
"type": "string",
"description": "Conforming to the Open Definition"
},
{
"name": "osd_conformance",
"type": "string",
"description": "Conforming to Open Source Definition"
},
{
"name": "status",
"type": "string"
},
{
"name": "title",
"type": "string"
},
{
"name": "url",
"type": "string"
"profile": "tabular-data-package",
"sources": [{
"title": "Open Definition Licenses Service",
"path": "http://licenses.opendefinition.org"
}],
"licenses": [{
"name": "ODC-PDDL-1.0",
"path": "http://www.opendefinition.org/licenses/odc-pddl",
"title": "Open Data Commons Public Domain Dedication and Licence 1.0"
}],
"resources": [{
"name": "licenses.csv",
"path": "licenses.csv",
"profile": "tabular-data-resource",
"format": "csv",
"mediatype": "text/csv",
"schema": {
"fields": [{
"name": "id",
"type": "string",
"constraints": {
"required": true,
"unique": true
}
},
{
"name": "domain_content",
"type": "boolean",
"description": "Open Content License",
"constraints": {
"required": true
}
},
{
"name": "domain_data",
"type": "boolean",
"description": "Open Data License",
"constraints": {
"required": true
}
},
{
"name": "domain_software",
"type": "boolean",
"description": "Open Software License",
"constraints": {
"required": true
}
},
{
"name": "family",
"type": "string"
},
{
"name": "is_generic",
"type": "boolean"
},
{
"name": "maintainer",
"type": "string"
},
{
"name": "od_conformance",
"type": "string",
"description": "Conforming to the Open Definition",
"constraints": {
"enum": ["approved", "not reviewed", "rejected"]
}
},
{
"name": "osd_conformance",
"type": "string",
"description": "Conforming to Open Source Definition",
"constraints": {
"enum": ["approved", "not reviewed", "rejected"]
}
},
{
"name": "status",
"type": "string",
"constraints": {
"enum": ["active", "retired", "superceded"]
}
},
{
"name": "title",
"type": "string",
"constraints": {
"required": true,
"unique": true
}
},
{
"name": "url",
"type": "string",
"format": "uri",
"constraints": {
"unique": true
}
]
}
}
]
}
]
}]
}
Loading

0 comments on commit 6008d0c

Please sign in to comment.