From aa898ab4e4e61c27ad976b7a1157249a2c339f6f Mon Sep 17 00:00:00 2001 From: Hugo Date: Sun, 26 Nov 2017 19:46:24 +0200 Subject: [PATCH 1/2] Drop support for EOL Python 2.6 and 3.3 --- .appveyor.yml | 8 ++------ README.rst | 2 +- setup.py | 4 ++-- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index a379cdd31..dd1824ead 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -4,15 +4,11 @@ environment: # For Python versions available on Appveyor, see # http://www.appveyor.com/docs/installed-software#python - # The list here is complete (excluding Python 2.6, which - # isn't covered by this document) at the time of writing. - PYTHON: "C:\\Python27" - #- PYTHON: "C:\\Python33" #- PYTHON: "C:\\Python34" #- PYTHON: "C:\\Python35" #- PYTHON: "C:\\Python27-x64" - #- PYTHON: "C:\\Python33-x64" #- DISTUTILS_USE_SDK: "1" #- PYTHON: "C:\\Python34-x64" #- DISTUTILS_USE_SDK: "1" @@ -30,7 +26,7 @@ build: off test_script: # Put your test command here. - # If you don't need to build C extensions on 64-bit Python 3.3 or 3.4, + # If you don't need to build C extensions on 64-bit Python 3.4, # you can remove "build.cmd" from the front of the command, as it's # only needed to support those cases. # Note that you must use the environment variable %PYTHON% to refer to @@ -41,7 +37,7 @@ test_script: after_test: # This step builds your wheels. # Again, you only need build.cmd if you're building C extensions for - # 64-bit Python 3.3/3.4. And you need to use %PYTHON% to get the correct + # 64-bit Python 3.4. And you need to use %PYTHON% to get the correct # interpreter - "%PYTHON%\\python.exe setup.py bdist_wheel" diff --git a/README.rst b/README.rst index db565ab06..a47084254 100644 --- a/README.rst +++ b/README.rst @@ -112,7 +112,7 @@ the `documentation `_. ==================== === **Operating system** macOS / OS X, Linux, Windows (Cygwin, MinGW, Visual Studio) -**Python version** CPython 2.6, 2.7, 3.3+. Only 64 bit. +**Python version** CPython 2.7, 3.4+. Only 64 bit. **Package managers** `pip`_ (source packages only), `conda`_ (via ``conda-forge``) ==================== === diff --git a/setup.py b/setup.py index 11acae95c..a588f2c2a 100755 --- a/setup.py +++ b/setup.py @@ -211,9 +211,9 @@ def setup_package(): 'Operating System :: MacOS :: MacOS X', 'Operating System :: Microsoft :: Windows', 'Programming Language :: Cython', - 'Programming Language :: Python :: 2.6', + 'Programming Language :: Python :: 2', 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3.3', + 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.4', 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', From 88d829f60cc301cb181943d582c94cb7c63e4f8e Mon Sep 17 00:00:00 2001 From: Hugo Date: Wed, 29 Nov 2017 10:25:20 +0200 Subject: [PATCH 2/2] CLA --- .github/contributors/hugovk.md | 106 +++++++++++++++++++++++++++++++++ 1 file changed, 106 insertions(+) create mode 100644 .github/contributors/hugovk.md diff --git a/.github/contributors/hugovk.md b/.github/contributors/hugovk.md new file mode 100644 index 000000000..1b96f688c --- /dev/null +++ b/.github/contributors/hugovk.md @@ -0,0 +1,106 @@ +# spaCy contributor agreement + +This spaCy Contributor Agreement (**"SCA"**) is based on the +[Oracle Contributor Agreement](http://www.oracle.com/technetwork/oca-405177.pdf). +The SCA applies to any contribution that you make to any product or project +managed by us (the **"project"**), and sets out the intellectual property rights +you grant to us in the contributed materials. The term **"us"** shall mean +[ExplosionAI UG (haftungsbeschränkt)](https://explosion.ai/legal). The term +**"you"** shall mean the person or entity identified below. + +If you agree to be bound by these terms, fill in the information requested +below and include the filled-in version with your first pull request, under the +folder [`.github/contributors/`](/.github/contributors/). The name of the file +should be your GitHub username, with the extension `.md`. For example, the user +example_user would create the file `.github/contributors/example_user.md`. + +Read this agreement carefully before signing. These terms and conditions +constitute a binding legal agreement. + +## Contributor Agreement + +1. The term "contribution" or "contributed materials" means any source code, +object code, patch, tool, sample, graphic, specification, manual, +documentation, or any other material posted or submitted by you to the project. + +2. With respect to any worldwide copyrights, or copyright applications and +registrations, in your contribution: + + * you hereby assign to us joint ownership, and to the extent that such + assignment is or becomes invalid, ineffective or unenforceable, you hereby + grant to us a perpetual, irrevocable, non-exclusive, worldwide, no-charge, + royalty-free, unrestricted license to exercise all rights under those + copyrights. This includes, at our option, the right to sublicense these same + rights to third parties through multiple levels of sublicensees or other + licensing arrangements; + + * you agree that each of us can do all things in relation to your + contribution as if each of us were the sole owners, and if one of us makes + a derivative work of your contribution, the one who makes the derivative + work (or has it made will be the sole owner of that derivative work; + + * you agree that you will not assert any moral rights in your contribution + against us, our licensees or transferees; + + * you agree that we may register a copyright in your contribution and + exercise all ownership rights associated with it; and + + * you agree that neither of us has any duty to consult with, obtain the + consent of, pay or render an accounting to the other for any use or + distribution of your contribution. + +3. With respect to any patents you own, or that you can license without payment +to any third party, you hereby grant to us a perpetual, irrevocable, +non-exclusive, worldwide, no-charge, royalty-free license to: + + * make, have made, use, sell, offer to sell, import, and otherwise transfer + your contribution in whole or in part, alone or in combination with or + included in any product, work or materials arising out of the project to + which your contribution was submitted, and + + * at our option, to sublicense these same rights to third parties through + multiple levels of sublicensees or other licensing arrangements. + +4. Except as set out above, you keep all right, title, and interest in your +contribution. The rights that you grant to us under these terms are effective +on the date you first submitted a contribution to us, even if your submission +took place before the date you sign these terms. + +5. You covenant, represent, warrant and agree that: + + * Each contribution that you submit is and shall be an original work of + authorship and you can legally grant the rights set out in this SCA; + + * to the best of your knowledge, each contribution will not violate any + third party's copyrights, trademarks, patents, or other intellectual + property rights; and + + * each contribution shall be in compliance with U.S. export control laws and + other applicable export and import laws. You agree to notify us if you + become aware of any circumstance which would make any of the foregoing + representations inaccurate in any respect. We may publicly disclose your + participation in the project, including the fact that you have signed the SCA. + +6. This SCA is governed by the laws of the State of California and applicable +U.S. Federal law. Any choice of law rules will not apply. + +7. Please place an “x” on one of the applicable statement below. Please do NOT +mark both statements: + + * [x] I am signing on behalf of myself as an individual and no other person + or entity, including my employer, has or will have rights with respect to my + contributions. + + * [ ] I am signing on behalf of my employer or a legal entity and I have the + actual authority to contractually bind that entity. + +## Contributor Details + +| Field | Entry | +|------------------------------- | -------------------- | +| Name | Hugo van Kemenade | +| Company name (if applicable) | | +| Title or role (if applicable) | | +| Date | 26 November 2017 | +| GitHub username | hugovk | +| Website (optional) | |