From f8861585e302f2e084053ea5a3755aad763ead2b Mon Sep 17 00:00:00 2001 From: Oleg Broytman Date: Thu, 8 Dec 2022 18:45:57 +0300 Subject: [PATCH 1/3] CI(GHActions): Set `$LD_LIBRARY_PATH` Python 2.7 on Linux requires `$LD_LIBRARY_PATH`. --- project_template/.github/workflows/test-publish.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/project_template/.github/workflows/test-publish.yaml b/project_template/.github/workflows/test-publish.yaml index b4c337a..5c4ae12 100644 --- a/project_template/.github/workflows/test-publish.yaml +++ b/project_template/.github/workflows/test-publish.yaml @@ -55,14 +55,21 @@ jobs: - name: Set TOXENV run: | import os, sys + ld_library_path = None if hasattr(sys, 'pypy_version_info'): toxenv = 'pypy3' else: pyver = '%d%d' % tuple(sys.version_info[:2]) + if os.name == 'posix': + if pyver == '27': # Python 2.7 on Linux requires `$LD_LIBRARY_PATH` + ld_library_path = os.path.join( + os.path.dirname(os.path.dirname(sys.executable)), 'lib') toxenv = 'py%s' % pyver if os.name == 'posix': toxenv += ',py%s-flake8' % pyver with open(os.environ['GITHUB_ENV'], 'a') as f: + if ld_library_path: + f.write('LD_LIBRARY_PATH=' + ld_library_path + '\n') f.write('TOXENV=' + toxenv + '\n') print(toxenv) shell: python -- 2.39.2 From abf4f84ad9fca390e6cf31b0c55f5b65dd727c2e Mon Sep 17 00:00:00 2001 From: Oleg Broytman Date: Sat, 24 Dec 2022 18:46:15 +0300 Subject: [PATCH 2/3] Style(publish2web): Fix casing: `updateserverinfo` -> `updateServerInfo` --- publish2web | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/publish2web b/publish2web index 1b7a6f9..b0898f1 100755 --- a/publish2web +++ b/publish2web @@ -24,7 +24,7 @@ cd "$dest_dir" && git gc --aggressive && git repack -a -d -f --depth=20 --window=250 && git fsck --strict && -git config receive.updateserverinfo true && git update-server-info && +git config receive.updateServerInfo true && git update-server-info && cp -p "$HOME"/Internet/WWW/htdocs/git.phdru.name/phdru.name/phdru.name.git/git-daemon-export-ok . && if [ "`cat \"$source_dir\"/.git/description`" = \ "Unnamed repository; edit this file 'description' to name the repository." ] -- 2.39.2 From 8eea79d1b0e8fef0adda75a7ba2a3af4e881197d Mon Sep 17 00:00:00 2001 From: Oleg Broytman Date: Sat, 24 Dec 2022 18:58:54 +0300 Subject: [PATCH 3/3] Fix(mk-project): `sed` requires `s` for substitute --- mk-project | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mk-project b/mk-project index eecfa53..788ddbe 100755 --- a/mk-project +++ b/mk-project @@ -14,7 +14,7 @@ cp -ap project_template "$HOME/tmp/$project_name" && cd "$HOME/tmp/$project_name" && mv project "$project_name" && -sed -i /'{project}'/"$project_name"/g .gitignore README.rst \ +sed -i s/'{project}'/"$project_name"/g .gitignore README.rst \ devscripts/README.html docs/genapidocs docs/install.rst \ mk-distr publish-docs setup.py tox.ini && -- 2.39.2