This is an automated email from the ASF dual-hosted git repository. djwang pushed a commit to branch REL_2_STABLE in repository https://gitbox.apache.org/repos/asf/cloudberry.git
commit cd544ffc51ac245b0bc713cacde7fdd4e0abf4f5 Author: Dianjin Wang <[email protected]> AuthorDate: Thu Jul 24 17:49:26 2025 +0800 Release: Use pip3 download for Python packages Replace bundled Python source packages with pip3 download to comply with Apache Release policy. - Remove 7 bundled tar.gz packages from gpMgmt/bin/pythonSrc/ext/ - Add download-python-deps target using pip3 download - Update build targets to depend on download step - Preserve original compilation logic and --with-pythonsrc-ext functionality - Update LICENSE, python-dependencies.txt, and Windows build script - Add .gitignore rules for downloaded files This maintains the same build behavior while ensuring Apache compliance by removing third-party packages from source tree. See: https://github.com/apache/cloudberry/discussions/961 --- LICENSE | 27 ------------ gpAux/client/install/src/windows/CreatePackage.bat | 4 +- gpMgmt/bin/.gitignore | 2 + gpMgmt/bin/Makefile | 47 +++++++++++++-------- gpMgmt/bin/pythonSrc/ext/.gitkeep | 2 + gpMgmt/bin/pythonSrc/ext/PyGreSQL-5.2.tar.gz | Bin 267557 -> 0 bytes gpMgmt/bin/pythonSrc/ext/PyYAML-5.4.1.tar.gz | Bin 180590 -> 0 bytes gpMgmt/bin/pythonSrc/ext/behave-1.2.6.tar.gz | Bin 4562652 -> 0 bytes gpMgmt/bin/pythonSrc/ext/mock-1.0.1.tar.gz | Bin 818644 -> 0 bytes gpMgmt/bin/pythonSrc/ext/parse-1.8.2.tar.gz | Bin 27980 -> 0 bytes gpMgmt/bin/pythonSrc/ext/psutil-5.7.0.tar.gz | Bin 449628 -> 0 bytes gpMgmt/bin/pythonSrc/ext/setuptools-36.6.0.tar.gz | Bin 669121 -> 0 bytes gpMgmt/test/README | 2 +- licenses/LICENSE-bsd2-behave.txt | 24 ----------- licenses/LICENSE-bsd2-mock.txt | 26 ------------ licenses/LICENSE-bsd3-psutil.txt | 29 ------------- licenses/LICENSE-parse.txt | 19 --------- licenses/LICENSE-pygresql.txt | 30 ------------- licenses/LICENSE-pyyaml.txt | 20 --------- licenses/LICENSE-setuptools.txt | 17 -------- python-dependencies.txt | 2 +- 21 files changed, 37 insertions(+), 214 deletions(-) diff --git a/LICENSE b/LICENSE index 155c2f8e660..8d457fd6652 100644 --- a/LICENSE +++ b/LICENSE @@ -218,11 +218,7 @@ The PostgreSQL software includes: src/bin/pg_controldata/pg_controldata.c copyright (c) Oliver Elphick <[email protected]>, 2001 - gpMgmt/bin/pythonSrc/ext/behave-1.2.6.tar.gz - see licenses/LICENSE-bsd2-behave.txt - gpMgmt/bin/pythonSrc/ext/mock-1.0.1.tar.gz - see licenses/LICENSE-bsd2-mock.txt ---------------------------- BSD-4-Clause (University of California-Specific) @@ -250,9 +246,6 @@ The PostgreSQL software includes: src/backend/libpq/sha2.h see licenses/LICENSE-bsd3-sha2.txt - gpMgmt/bin/pythonSrc/ext/psutil-5.7.0.tar.gz - see licenses/LICENSE-bsd3-psutil.txt - contrib/pax_storage/src/cpp/contrib/googletest see licenses/LICENSE-googletest.txt @@ -262,15 +255,6 @@ The PostgreSQL software includes: ---------------------------- MIT LICENSE - gpMgmt/bin/pythonSrc/ext/PyYAML-5.4.1.tar.gz - see licenses/LICENSE-pyyaml.txt - - gpMgmt/bin/pythonSrc/ext/setuptools-36.6.0.tar.gz - see licenses/LICENSE-setuptools.txt - - gpMgmt/bin/pythonSrc/ext/parse-1.8.2.tar.gz - see licenses/LICENSE-parse.txt - dependencies/yyjson see licenses/LICENSE-yyjson.txt @@ -312,21 +296,18 @@ The PostgreSQL software includes: test-ctype LICENSE src/test/locale/test-ctype.c - see licenses/LICENSE-test-ctype.txt ---------------------------- regex LICENSE src/backend/regex - see licenses/LICENSE-regex.txt ---------------------------- PostgreSQL-style License src/port/gettimeofday.c - see licenses/LICENSE-gettimeofday.txt ================================================================================ @@ -349,22 +330,14 @@ The Greenplum Database software includes: Stream License gpMgmt/bin/stream/* - see licenses/LICENSE-stream.txt ---------------------------- 0-clause license ("Zero Clause BSD") gpcontrib/orafce/* - see licenses/LICENSE-orafce.txt -================================================================================ -PostgreSQL-style license - - gpMgmt/bin/pythonSrc/ext/PyGreSQL-5.2.tar.gz - see licenses/LICENSE-pygresql.txt - ================================================================================ This product includes code from pg_cron under PostgreSQL license: diff --git a/gpAux/client/install/src/windows/CreatePackage.bat b/gpAux/client/install/src/windows/CreatePackage.bat index b6a782bebda..99079b11cf1 100644 --- a/gpAux/client/install/src/windows/CreatePackage.bat +++ b/gpAux/client/install/src/windows/CreatePackage.bat @@ -11,8 +11,8 @@ type nul > %GPDB_INSTALL_PATH%\bin\gppylib\__init__.py copy ..\..\..\..\..\gpMgmt\bin\gppylib\gpversion.py %GPDB_INSTALL_PATH%\bin\gppylib\ perl -pi.bak -e "s,\$Revision\$,%VERSION%," %GPDB_INSTALL_PATH%\bin\gpload.py copy ..\..\..\..\..\gpMgmt\bin\gpload.bat %GPDB_INSTALL_PATH%\bin -for %%f in (..\..\..\..\..\gpMgmt\bin\pythonSrc\ext\PyYAML-*.tar.gz) do tar -xf %%f -for /D %%d in (PyYAML-*) do copy %%d\lib\yaml\* %GPDB_INSTALL_PATH%\lib\python\yaml +REM Install PyYAML using pip instead of extracting from tarball +pip3 install --target=%GPDB_INSTALL_PATH%\lib\python PyYAML==5.4.1 perl -p -e "s,__VERSION_PLACEHOLDER__,%VERSION%," greenplum-clients.wxs > greenplum-clients-%VERSION%.wxs candle.exe -nologo greenplum-clients-%VERSION%.wxs -out greenplum-clients-%VERSION%.wixobj -dSRCDIR=%GPDB_INSTALL_PATH% -dVERSION=%VERSION% light.exe -nologo -sval greenplum-clients-%VERSION%.wixobj -out greenplum-clients-x86_64.msi \ No newline at end of file diff --git a/gpMgmt/bin/.gitignore b/gpMgmt/bin/.gitignore index 3e4c5a452b2..7d8d57c93f8 100644 --- a/gpMgmt/bin/.gitignore +++ b/gpMgmt/bin/.gitignore @@ -27,3 +27,5 @@ # ignore anything in ext but keep folder ext/* !ext/.gitkeep +# Python sources and temporary install dirs +pythonSrc/ext/* diff --git a/gpMgmt/bin/Makefile b/gpMgmt/bin/Makefile index b61c4faf52d..c863cb7bf19 100644 --- a/gpMgmt/bin/Makefile +++ b/gpMgmt/bin/Makefile @@ -79,26 +79,41 @@ endif # # Python Libraries # +# Download Python source packages using pip3 download +# This replaces the previously bundled tar.gz files to comply with Apache Release policy +# +MOCK_VERSION=1.0.1 +PYGRESQL_VERSION=5.2 +PSUTIL_VERSION=5.7.0 +PYYAML_VERSION=5.4.1 + +download-python-deps: + @echo "--- Downloading Python dependencies for gpMgmt modules" + @mkdir -p $(PYLIB_SRC_EXT) + # Download psutil + pip3 download --no-deps --no-binary :all: --no-build-isolation psutil==$(PSUTIL_VERSION) --dest $(PYLIB_SRC_EXT)/ + # Download PyYAML, wheel is for metadata vefiry; + # cython is used for building, see https://github.com/apache/cloudberry/issues/1201 + pip3 install wheel "cython<3.0.0" + pip3 download --no-deps --no-binary :all: --no-build-isolation PyYAML==$(PYYAML_VERSION) --dest $(PYLIB_SRC_EXT)/ + # Download PyGreSQL, the `PATH` is needed to avoid cannot find the pg_config + PATH=$(DESTDIR)$(bindir):$$PATH pip3 download --no-deps --no-binary :all: --no-build-isolation PyGreSQL==$(PYGRESQL_VERSION) --dest $(PYLIB_SRC_EXT)/ # # PyGreSQL # -PYGRESQL_VERSION=5.2 PYGRESQL_DIR=PyGreSQL-$(PYGRESQL_VERSION) -pygresql: +pygresql: download-python-deps @echo "--- PyGreSQL" cd $(PYLIB_SRC_EXT)/ && $(TAR) xzf $(PYGRESQL_DIR).tar.gz cd $(PYLIB_SRC_EXT)/$(PYGRESQL_DIR)/ && PATH=$(DESTDIR)$(bindir):$$PATH LDFLAGS='$(LDFLAGS) $(PYGRESQL_LDFLAGS)' python3 setup.py build cp -r $(PYLIB_SRC_EXT)/$(PYGRESQL_DIR)/build/lib*-3*/* $(PYLIB_DIR)/ - # # PSUTIL # -PSUTIL_VERSION=5.7.0 PSUTIL_DIR=psutil-$(PSUTIL_VERSION) - -psutil: +psutil: download-python-deps @echo "--- psutil" ifeq "$(findstring $(BLD_ARCH),aix7_ppc_64 )" "" cd $(PYLIB_SRC_EXT)/ && $(TAR) xzf $(PSUTIL_DIR).tar.gz @@ -109,24 +124,18 @@ endif # # PYYAML # -PYYAML_VERSION=5.4.1 PYYAML_DIR=PyYAML-$(PYYAML_VERSION) -pyyaml: +pyyaml: download-python-deps @echo "--- pyyaml" cd $(PYLIB_SRC_EXT)/ && $(TAR) xzf $(PYYAML_DIR).tar.gz - cd $(PYLIB_SRC_EXT)/$(PYYAML_DIR)/ && env -u CC python3 setup.py build + cd $(PYLIB_SRC_EXT)/$(PYYAML_DIR)/ && env -u CC CFLAGS="-w" python3 setup.py build cp -r $(PYLIB_SRC_EXT)/$(PYYAML_DIR)/build/lib*-3*/* $(PYLIB_DIR)/ # # MOCK SETUP # -MOCK_VERSION=1.0.1 MOCK_DIR=mock-$(MOCK_VERSION) -SETUP_TOOLS_VERSION=36.6.0 -PARSE_VERSION=1.8.2 -SETUP_TOOLS_DIR=setuptools-$(SETUP_TOOLS_VERSION) -PARSE_DIR=parse-$(PARSE_VERSION) PYTHONSRC_INSTALL=$(PYLIB_SRC_EXT)/install PYTHON_VERSION=$(shell python3 -c "import sys; print ('%s.%s' % (sys.version_info[0:2]))") PYTHONSRC_INSTALL_SITE=$(PYLIB_SRC_EXT)/install/lib/python$(PYTHON_VERSION)/site-packages @@ -140,8 +149,10 @@ $(MOCK_BIN): @if [ "$(UBUNTU_PLATFORM)" = "Ubuntu" ]; then\ pip3 install mock;\ else\ - mkdir -p $(PYTHONSRC_INSTALL_SITE) && \ - cd $(PYLIB_SRC_EXT)/ && $(TAR) xzf $(MOCK_DIR).tar.gz && \ + mkdir -p $(PYLIB_SRC_EXT) && \ + pip3 download --no-deps --no-binary :all: --no-build-isolation mock==$(MOCK_VERSION) --dest $(PYLIB_SRC_EXT)/ && \ + mkdir -p $(PYTHONSRC_INSTALL_SITE) && \ + cd $(PYLIB_SRC_EXT)/ && unzip -q $(MOCK_DIR).zip && \ cd $(PYLIB_SRC_EXT)/$(MOCK_DIR)/ && \ PYTHONPATH=$(PYTHONSRC_INSTALL_PYTHON_PATH) python3 setup.py install --prefix $(PYTHONSRC_INSTALL) ; \ fi; @@ -207,8 +218,8 @@ installcheck: installcheck-bash clean distclean: rm -rf $(RUFF_BIN) $(SRC)/ruff.txt $(SRC)/.ruff_cache - rm -rf $(PYLIB_SRC_EXT)/$(PYGRESQL_DIR)/build - rm -rf $(PYLIB_SRC)/$(PYGRESQL_DIR)/build + rm -rf $(PYLIB_SRC_EXT)/*.tar.gz $(PYLIB_SRC_EXT)/*.zip $(PYLIB_SRC_EXT)/*.whl + rm -rf $(PYLIB_SRC_EXT)/*/ rm -rf *.pyc rm -f analyzedbc gpactivatestandbyc gpaddmirrorsc gpcheckcatc \ gpcheckperfc gpcheckresgroupimplc gpchecksubnetcfgc gpconfigc \ diff --git a/gpMgmt/bin/pythonSrc/ext/.gitkeep b/gpMgmt/bin/pythonSrc/ext/.gitkeep new file mode 100644 index 00000000000..206c64c1e62 --- /dev/null +++ b/gpMgmt/bin/pythonSrc/ext/.gitkeep @@ -0,0 +1,2 @@ +# This directory is used for downloading Python source packages via pip3 download +# The downloaded tar.gz files should not be committed to git \ No newline at end of file diff --git a/gpMgmt/bin/pythonSrc/ext/PyGreSQL-5.2.tar.gz b/gpMgmt/bin/pythonSrc/ext/PyGreSQL-5.2.tar.gz deleted file mode 100644 index 9c39e0acc34..00000000000 Binary files a/gpMgmt/bin/pythonSrc/ext/PyGreSQL-5.2.tar.gz and /dev/null differ diff --git a/gpMgmt/bin/pythonSrc/ext/PyYAML-5.4.1.tar.gz b/gpMgmt/bin/pythonSrc/ext/PyYAML-5.4.1.tar.gz deleted file mode 100644 index 4bf8c21fc3c..00000000000 Binary files a/gpMgmt/bin/pythonSrc/ext/PyYAML-5.4.1.tar.gz and /dev/null differ diff --git a/gpMgmt/bin/pythonSrc/ext/behave-1.2.6.tar.gz b/gpMgmt/bin/pythonSrc/ext/behave-1.2.6.tar.gz deleted file mode 100644 index dc7a21a28f5..00000000000 Binary files a/gpMgmt/bin/pythonSrc/ext/behave-1.2.6.tar.gz and /dev/null differ diff --git a/gpMgmt/bin/pythonSrc/ext/mock-1.0.1.tar.gz b/gpMgmt/bin/pythonSrc/ext/mock-1.0.1.tar.gz deleted file mode 100644 index 4fdea77c71c..00000000000 Binary files a/gpMgmt/bin/pythonSrc/ext/mock-1.0.1.tar.gz and /dev/null differ diff --git a/gpMgmt/bin/pythonSrc/ext/parse-1.8.2.tar.gz b/gpMgmt/bin/pythonSrc/ext/parse-1.8.2.tar.gz deleted file mode 100644 index d24aa0d1afa..00000000000 Binary files a/gpMgmt/bin/pythonSrc/ext/parse-1.8.2.tar.gz and /dev/null differ diff --git a/gpMgmt/bin/pythonSrc/ext/psutil-5.7.0.tar.gz b/gpMgmt/bin/pythonSrc/ext/psutil-5.7.0.tar.gz deleted file mode 100644 index e8b1d804420..00000000000 Binary files a/gpMgmt/bin/pythonSrc/ext/psutil-5.7.0.tar.gz and /dev/null differ diff --git a/gpMgmt/bin/pythonSrc/ext/setuptools-36.6.0.tar.gz b/gpMgmt/bin/pythonSrc/ext/setuptools-36.6.0.tar.gz deleted file mode 100644 index bdfc240ce1b..00000000000 Binary files a/gpMgmt/bin/pythonSrc/ext/setuptools-36.6.0.tar.gz and /dev/null differ diff --git a/gpMgmt/test/README b/gpMgmt/test/README index 16a36ab43fe..808a8946e26 100644 --- a/gpMgmt/test/README +++ b/gpMgmt/test/README @@ -29,7 +29,7 @@ make -f Makefile.behave behave flags="--tags smoke --tags mirrors" WARNING: The tag boolean logic syntax is different in this version versus the version documented online. -From gpdb/gpMgmt/bin/pythonSrc/ext/behave-1.2.4/docs/behave.rst: +From behave documentation (behave is now installed via pip): | Tag Expression | -------------- diff --git a/licenses/LICENSE-bsd2-behave.txt b/licenses/LICENSE-bsd2-behave.txt deleted file mode 100644 index 387e41d678d..00000000000 --- a/licenses/LICENSE-bsd2-behave.txt +++ /dev/null @@ -1,24 +0,0 @@ -Copyright (c) 2012-2014 Benno Rice, Richard Jones and others, except where noted. -Copyright (c) 2014-2023 Jens Engel and others, except where noted. -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: - -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - -THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/licenses/LICENSE-bsd2-mock.txt b/licenses/LICENSE-bsd2-mock.txt deleted file mode 100644 index c820924387d..00000000000 --- a/licenses/LICENSE-bsd2-mock.txt +++ /dev/null @@ -1,26 +0,0 @@ -Copyright (c) 2003-2013, Michael Foord & the mock team -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - * Redistributions in binary form must reproduce the above - copyright notice, this list of conditions and the following - disclaimer in the documentation and/or other materials provided - with the distribution. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/licenses/LICENSE-bsd3-psutil.txt b/licenses/LICENSE-bsd3-psutil.txt deleted file mode 100644 index cff5eb74e1b..00000000000 --- a/licenses/LICENSE-bsd3-psutil.txt +++ /dev/null @@ -1,29 +0,0 @@ -BSD 3-Clause License - -Copyright (c) 2009, Jay Loden, Dave Daeschler, Giampaolo Rodola -All rights reserved. - -Redistribution and use in source and binary forms, with or without modification, -are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - * Neither the name of the psutil authors nor the names of its contributors - may be used to endorse or promote products derived from this software without - specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR -ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/licenses/LICENSE-parse.txt b/licenses/LICENSE-parse.txt deleted file mode 100644 index 6c73b16ceb6..00000000000 --- a/licenses/LICENSE-parse.txt +++ /dev/null @@ -1,19 +0,0 @@ -Copyright (c) 2012-2019 Richard Jones <[email protected]> - -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. diff --git a/licenses/LICENSE-pygresql.txt b/licenses/LICENSE-pygresql.txt deleted file mode 100644 index 4ff09c11fe2..00000000000 --- a/licenses/LICENSE-pygresql.txt +++ /dev/null @@ -1,30 +0,0 @@ -Written by D'Arcy J.M. Cain ([email protected]) - -Based heavily on code written by Pascal Andre ([email protected]) - -Copyright (c) 1995, Pascal Andre - -Further modifications copyright (c) 1997-2008 by D'Arcy J.M. Cain - -Further modifications copyright (c) 2009-2020 by the PyGreSQL Development Team - -PyGreSQL is released under the PostgreSQL License, a liberal Open Source -license, similar to the BSD or MIT licenses: - -Permission to use, copy, modify, and distribute this software and its -documentation for any purpose, without fee, and without a written agreement -is hereby granted, provided that the above copyright notice and this -paragraph and the following two paragraphs appear in all copies. In -this license the term "AUTHORS" refers to anyone who has contributed code -to PyGreSQL. - -IN NO EVENT SHALL THE AUTHORS BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, -SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, -ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF -AUTHORS HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -THE AUTHORS SPECIFICALLY DISCLAIM ANY WARRANTIES, INCLUDING, BUT NOT LIMITED -TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND THE -AUTHORS HAVE NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, -ENHANCEMENTS, OR MODIFICATIONS. diff --git a/licenses/LICENSE-pyyaml.txt b/licenses/LICENSE-pyyaml.txt deleted file mode 100644 index 2f1b8e15e56..00000000000 --- a/licenses/LICENSE-pyyaml.txt +++ /dev/null @@ -1,20 +0,0 @@ -Copyright (c) 2017-2021 Ingy döt Net -Copyright (c) 2006-2016 Kirill Simonov - -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. diff --git a/licenses/LICENSE-setuptools.txt b/licenses/LICENSE-setuptools.txt deleted file mode 100644 index 1bb5a44356f..00000000000 --- a/licenses/LICENSE-setuptools.txt +++ /dev/null @@ -1,17 +0,0 @@ -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. diff --git a/python-dependencies.txt b/python-dependencies.txt index 9e63afef528..7ca6d4dcf65 100644 --- a/python-dependencies.txt +++ b/python-dependencies.txt @@ -1,3 +1,3 @@ psutil==5.7.0 pygresql==5.2 -pyyaml==5.3.1 +pyyaml==5.4.1 --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
