From 9f4464e7e4b35e590d9a67155daf338472eccdd8 Mon Sep 17 00:00:00 2001 From: ankostis on tokoti Date: Sun, 8 Mar 2015 17:38:35 +0100 Subject: [PATCH] README: Move Licenses section in a separate LICENSE.txt file. - Update "Similar-projects" section, remove outdated *proxypi* project. --- LICENSE.txt | 50 +++++++++++++++++++++++++++++++++++++++++++ MANIFEST.in | 1 + README.rst | 61 +++++++++++------------------------------------------ 3 files changed, 63 insertions(+), 49 deletions(-) create mode 100644 LICENSE.txt diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..bca3cd0 --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,50 @@ +License +======= + +*pypiserver* contains a copy of bottle_ which is available under the +*MIT* license:: + + Copyright (c) 2012, Marcel Hellkamp. + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in all + copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. + + +The remaining part is distributed under the *zlib/libpng* license:: + + Copyright (c) 2011-2014 Ralf Schmitt + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + + 3. This notice may not be removed or altered from any source + distribution. + diff --git a/MANIFEST.in b/MANIFEST.in index d1051af..9a720b5 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,4 +1,5 @@ include *.rst +include *.txt include *.py include buildout.cfg include pypi-server diff --git a/README.rst b/README.rst index 6b870f9..a583499 100644 --- a/README.rst +++ b/README.rst @@ -448,51 +448,7 @@ if you find any other bugs. License ======= *pypiserver* contains a copy of bottle_ which is available under the -*MIT* license:: - - Copyright (c) 2012, Marcel Hellkamp. - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in all - copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - SOFTWARE. - - -The remaining part is distributed under the *zlib/libpng* license:: - - Copyright (c) 2011-2014 Ralf Schmitt - - This software is provided 'as-is', without any express or implied - warranty. In no event will the authors be held liable for any damages - arising from the use of this software. - - Permission is granted to anyone to use this software for any purpose, - including commercial applications, and to alter it and redistribute it - freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - - 3. This notice may not be removed or altered from any source - distribution. +*MIT* license, and the remaining part is distributed under the *zlib/libpng* license. Similar Projects @@ -501,11 +457,18 @@ There are lots of other projects, which allow you to run your own PyPI server. If *pypiserver* doesn't work for you, the following are among the most popular alternatives: -*devpi-server* (https://pypi.python.org/pypi/devpi-server) - easy-to-use caching proxy server +- `devpi-server `_: + a reliable fast pypi.python.org caching server, part of + the comprehensive `github-style pypi index server and packaging meta tool + `_. + (version: 2.1.4, access date: 8/3/2015) -*proxypypi* (https://pypi.python.org/pypi/proxypypi) - a PyPI caching proxy +- `pip2pi `_ + a simple cmd-line tool that builds a PyPI-compatible local folder from pip requirements + (version: 0.6.7, access date: 8/3/2015) + +- Check this SO question: ` How to roll my own pypi? + `_ .. _bottle: http://bottlepy.org