Add script `add-remote`

diff --git a/add-remote b/add-remote
new file mode 100755 (executable)
index 0000000..c6f96e2
--- /dev/null
+++ b/add-remote
@@ -0,0 +1,10 @@
+#! /bin/sh
+
+if [ -z "$1" -o -z "$2" ]; then
+    echo "Usage: $0 remote_name URL " >&2
+    echo "Example: $0 gh https://github.com/phdru/cookiecutter.git"
+    exit 1
+fi
+
+git remote add "$1" "$2" &&
+exec git config --add update-remotes.remotes "$1"

diff --git a/admin2prog b/admin2prog
new file mode 100755 (executable)
index 0000000..2e7dba1
--- /dev/null
+++ b/admin2prog
@@ -0,0 +1,27 @@
+#! /bin/sh
+
+if [ $# -ne 1 ]; then
+   echo "Usage: $0 project_name" >&2
+   exit 1
+fi
+
+project_name="$1"
+old_dir="$HOME/admin/prog/$1"
+new_dir="$HOME/prog/Python/$1"
+
+fix_path() {
+   config_option="$1"
+   path="`git config --get $config_option`"
+   new_path="`echo \"$path\" | sed \"s@$old_dir@$new_dir@\"`"
+   git config "$config_option" "$new_path"
+}
+
+mv "$old_dir" "$new_dir" &&
+
+for project_dir in "$new_dir" "$HOME"/current/projects/"$project_name" \
+      "$HOME"/Internet/WWW/htdocs/git.phdru.name/"$project_name".git; do
+   cd "$project_dir" &&
+   for remote in `git remote`; do
+      fix_path "remote.$remote.url"
+   done
+done

diff --git a/clone2current b/clone2current
index a769ad064fcc22d8cb21a8ea4afcab315c0e36d0..8ffff7cab183afd48e72c724816e363ed3ed5f24 100755 (executable)
--- a/clone2current
+++ b/clone2current
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 if [ ! -d ".git" -a -z "$1" ]; then
-   echo "Usage: $0 repoistory [directories]" >&2
+   echo "Usage: $0 repository [directories]" >&2
    exit 1
 fi
 
@@ -11,7 +11,7 @@ fi &&
 source_dir="`pwd`" &&
 
 if [ ! -d ".git" ]; then
-   echo "$source_dir is not a repoistory (.git isn't found)" >&2
+   echo "$source_dir is not a repository (.git isn't found)" >&2
    exit 1
 fi &&
 
@@ -33,9 +33,18 @@ then
 else
    cp -p "$source_dir"/.git/description .git
 fi &&
+"$HOME"/prog/git-scripts/set-commit-date-recursive &&
+
+echo /publish-docs >>.git/info/exclude &&
+echo /update-remotes >>.git/info/exclude &&
+git config update-remotes.files publish-docs &&
+cp -p "$HOME"/current/projects/m_lib/update-remotes . &&
 
 cd "$source_dir" &&
 if [ -n "$directories" ]; then
    dest_dir="$directories/$dest_dir"
 fi &&
-exec git remote add current "$HOME"/current/projects/"$dest_dir"
+{
+    git remote add current "$HOME"/current/projects/"$dest_dir" ||
+    exec git remote set-url current "$HOME"/current/projects/"$dest_dir"
+}

diff --git a/mk-project b/mk-project
index eecfa53d03c23d52845f9a5fb7d49215c013ba7b..3e6921ee9336f0fbe729bc6684061a464d89aeba 100755 (executable)
--- 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 &&
 
@@ -28,5 +28,6 @@ echo /update-remotes >>.git/info/exclude &&
 git add . &&
 git commit --message "Initial commit - created the project" &&
 git config htdocs.path "$HOME"/Internet/WWW/htdocs/phdru.name/Software/Python/"$project_name"/docs &&
+git config update-remotes.files publish-docs &&
 cp -p "$HOME"/current/projects/m_lib/update-remotes . &&
 exec devscripts/mk-git-aliases

diff --git a/move-project b/move-project
index 2e7dba1029fc5cd7ee97e447d1a610145e024f47..d932b07f7da03dfa1f5ba7b55d8ab18518bcc8f8 100755 (executable)
--- a/move-project
+++ b/move-project
@@ -1,27 +1,60 @@
 #! /bin/sh
 
-if [ $# -ne 1 ]; then
-   echo "Usage: $0 project_name" >&2
-   exit 1
+if [ $# -ne 2 ]; then
+    echo "Usage: $0 project_name dir" >&2
+    exit 1
 fi
 
 project_name="$1"
-old_dir="$HOME/admin/prog/$1"
-new_dir="$HOME/prog/Python/$1"
+dir="$2"
+
+if [ "$project_name" = "$dir" ]; then
+    echo "Error: The script $0 cannot yet move a project into a subdirectory of the same name" >&2
+    exit 1
+fi
 
 fix_path() {
-   config_option="$1"
-   path="`git config --get $config_option`"
-   new_path="`echo \"$path\" | sed \"s@$old_dir@$new_dir@\"`"
-   git config "$config_option" "$new_path"
+    config_option="$1"
+    path="`git config --get $config_option`"
+    new_path="`echo \"$path\" | sed \"s@$project_name@$dir/$project_name@\"`"
+    git config "$config_option" "$new_path"
 }
 
-mv "$old_dir" "$new_dir" &&
+for project_dir in "$HOME"/current/projects "$HOME"/prog/Python \
+        "$HOME"/Internet/WWW/htdocs/git.phdru.name; do
+    if [ "$project_dir" = "$HOME"/Internet/WWW/htdocs/git.phdru.name ]; then
+        pname="$project_name".git
+    else
+        pname="$project_name"
+    fi
+
+    if [ ! -d "$project_dir/$pname" ]; then
+        echo "Error: $project_dir/$pname does not exist" >&2
+        exit 1
+    fi
+
+    if [ -d "$project_dir/$dir" ]; then
+        echo "Error: $project_dir/$dir already exists" >&2
+        exit 1
+    fi
+done
+
+for project_dir in "$HOME"/current/projects "$HOME"/prog/Python \
+        "$HOME"/Internet/WWW/htdocs/git.phdru.name; do
+    if [ "$project_dir" = "$HOME"/Internet/WWW/htdocs/git.phdru.name ]; then
+        pname="$project_name".git
+    else
+        pname="$project_name"
+    fi
 
-for project_dir in "$new_dir" "$HOME"/current/projects/"$project_name" \
-      "$HOME"/Internet/WWW/htdocs/git.phdru.name/"$project_name".git; do
-   cd "$project_dir" &&
-   for remote in `git remote`; do
-      fix_path "remote.$remote.url"
-   done
+    cd "$project_dir" &&
+    mkdir -p "$dir" &&
+    if [ "$project_dir" = "$HOME"/Internet/WWW/htdocs/git.phdru.name ]; then
+        chmod u=rwX,go=rX "$dir"
+    fi &&
+    mv "$pname" "$dir" &&
+    cd "$dir/$pname" &&
+    for remote in `git remote`; do
+        fix_path "remote.$remote.url"
+    done
 done

diff --git a/project_template/.github/workflows/test-publish.yaml b/project_template/.github/workflows/test-publish.yaml
index b4c337a45913dba3d336897beb589234ad26355f..277257667645251840c1bfbc630a0d88c78ee8ab 100644 (file)
--- a/project_template/.github/workflows/test-publish.yaml
+++ b/project_template/.github/workflows/test-publish.yaml
@@ -8,17 +8,32 @@ on: [push, pull_request]
 jobs:
   run-tests:
     env:
-      not_in_conda: "['3.11', 'pypy-3.7']"
+      not_in_conda: "[]"
 
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-11, windows-latest]
-        python-version: ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "pypy-3.7"]
+        os: [ubuntu-latest, macos-latest, windows-latest]
+        python-version: ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13", "=3.9[build=*_pypy]"]
+        exclude:
+        - os: windows-latest
+          python-version: "2.7"
+        - os: macos-latest
+          python-version: "2.7"
+        - os: macos-latest
+          python-version: "3.5"
+        - os: macos-latest
+          python-version: "3.6"
+        - os: macos-latest
+          python-version: "3.7"
+        - os: macos-latest
+          python-version: "=3.9[build=*_pypy]"
+        - os: windows-latest
+          python-version: "=3.9[build=*_pypy]"
         include:
         - os: ubuntu-latest
           os-name: Linux
           pip-cache-path: ~/.cache/pip
-        - os: macos-11
+        - os: macos-latest
           os-name: MacOS
           pip-cache-path: ~/Library/Caches/pip
         - os: windows-latest
@@ -29,56 +44,89 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
-
       # Setup Python/pip
-      - uses: s-weigand/setup-conda@v1
+      - uses: actions/checkout@v4
+      - uses: conda-incubator/setup-miniconda@v3
         with:
+          miniforge-version: latest
           python-version: ${{ matrix.python-version }}
-        if: ${{ runner.os == 'Linux' && !contains(fromJSON(env.not_in_conda), matrix.python-version) }}
-      - uses: actions/setup-python@v4
+        if: ${{ !contains(fromJSON(env.not_in_conda), matrix.python-version) }}
+      # Python 3.7 is needed for ghactions-release script
+      - name: Install additional Python 3.7
+        run: |
+          conda create -n py37 --yes python=3.7
+          py37_prefix="`echo $CONDA_PREFIX | sed 's/__setup_conda/py37/'`"
+          ln -s "$py37_prefix/bin/python" "$CONDA_PREFIX/bin/python3.7"
+          ln -s "$py37_prefix/bin/pip" "$CONDA_PREFIX/bin/pip3.7"
+          python3.7 --version
+          pip3.7 --version
+        shell: bash
+        if: ${{ matrix.python-version == '2.7' && runner.os != 'Windows' && startsWith(github.ref, 'refs/tags/') }}
+      - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
-        if: ${{ runner.os != 'Linux' || contains(fromJSON(env.not_in_conda), matrix.python-version) }}
+        if: ${{ contains(fromJSON(env.not_in_conda), matrix.python-version) }}
+      - uses: actions/cache@v4
+        with:
+          path: ~/conda_pkgs_dir
+          key: ${{ runner.os }}-conda
       - name: Cache pip
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ matrix.pip-cache-path }}
           key: ${{ runner.os }}-pip
-
       # Setup tox
       - name: Install dependencies
         run: |
           python --version
+          python -m pip || python -m ensurepip --default-pip --upgrade
           python -m pip install --upgrade pip setuptools wheel
           pip --version
-          pip install --upgrade virtualenv tox
+          pip install --upgrade virtualenv "tox >= 3.15, < 4"
+        shell: bash -el {0}
       - name: Set TOXENV
         run: |
+          python -c "
           import os, sys
+          ld_library_path = None
           if hasattr(sys, 'pypy_version_info'):
-            toxenv = 'pypy3'
+              toxenv = 'pypy3'
           else:
-            pyver = '%d%d' % tuple(sys.version_info[:2])
-            toxenv = 'py%s' % pyver
-            if os.name == 'posix':
-              toxenv += ',py%s-flake8' % pyver
+              pyver = '%d%d' % tuple(sys.version_info[:2])
+              if (pyver == '27') and (os.name == 'posix'):  # 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:
-            f.write('TOXENV=' + toxenv + '\n')
-          print(toxenv)
-        shell: python
+              if ld_library_path:
+                  f.write('LD_LIBRARY_PATH=' + ld_library_path + '\n')
+              f.write('TOXENV=' + toxenv + '\n')
+          "
+        shell: bash -el {0}
 
       - name: Run tox
         run: |
           python -c "import os; print(os.environ['TOXENV'])"
           tox --version
           tox
+        shell: bash -el {0}
 
-      - name: Build and publish wheel
+      - name: Build and publish sdist and wheel on Unix
+        run: |
+          pip install -U --ignore-installed certifi # Replace conda-installed
+          devscripts/CI/ghactions-release
+        env:
+          TWINE_USERNAME: ${{ secrets.TWINE_USERNAME }}
+          TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }}
+        if: ${{ !startsWith(matrix.python-version, 'pypy') && runner.os != 'Windows' && startsWith(github.ref, 'refs/tags/') }}
+      - name: Build and publish wheel on w32
         run: |
           pip install -U pip setuptools twine wheel
           python setup.py bdist_wheel
           twine upload --disable-progress-bar --skip-existing dist\*
-        if: ${{ startsWith(github.ref, 'refs/tags/') }}
+        if: ${{ !startsWith(matrix.python-version, 'pypy') && runner.os == 'Windows' && startsWith(github.ref, 'refs/tags/') }}
         env:
           TWINE_USERNAME: ${{ secrets.TWINE_USERNAME }}
           TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }}
@@ -91,8 +139,8 @@ jobs:
           omitBodyDuringUpdate: true
           omitNameDuringUpdate: true
           omitPrereleaseDuringUpdate: true
-          prerelease: false
+          prerelease: true
           replacesArtifacts: false
           skipIfReleaseExists: false
           updateOnlyUnreleased: false
-        if: ${{ startsWith(github.ref, 'refs/tags/') }}
+        if: ${{ !startsWith(matrix.python-version, 'pypy') && startsWith(github.ref, 'refs/tags/') }}

diff --git a/project_template/ChangeLog b/project_template/ChangeLog
index e45d3d1285704a077fd22fab7b137e082a8967a3..d0c23da53c4e40de4bcc103753bb996d7d8bc018 100644 (file)
--- a/project_template/ChangeLog
+++ b/project_template/ChangeLog
@@ -1 +1 @@
-Version 0.0.1 (2018-04-01)
+Version 0.0.1 (2025-01-01)

diff --git a/project_template/README.rst b/project_template/README.rst
index 749389f6b71206c727378d168a69c9864ae1df95..007361007db39a68998cd67441d4a3574743b877 100644 (file)
--- a/project_template/README.rst
+++ b/project_template/README.rst
@@ -4,7 +4,7 @@
 
 Author: Oleg Broytman <phd@phdru.name>.
 
-Copyright (C) 2018 PhiloSoft Design.
+Copyright (C) 2025 PhiloSoft Design.
 
 License: GPL.
 

diff --git a/project_template/devscripts/requirements/requirements.txt b/project_template/devscripts/requirements/requirements.txt
index 06736f72fe6dc0fd01f840195fe4ab0634139f68..627fa17f23087351db27c0c10a68748756b0f9c3 100644 (file)
--- a/project_template/devscripts/requirements/requirements.txt
+++ b/project_template/devscripts/requirements/requirements.txt
@@ -1,6 +1,5 @@
 --trusted-host phdru.name
 --find-links=https://phdru.name/Software/Python/
---install-option=-O2
 
 m_lib.defenc >= 1.0
 m_lib >= 2.0; python_version >= '2.7' and python_version < '3.0'

diff --git a/project_template/docs/install.rst b/project_template/docs/install.rst
index cfaf935bd9c5bdeb48e5574111ced6ab551a0b22..e52a39042e09c202f1f23d7289ee1b83534961dc 100644 (file)
--- a/project_template/docs/install.rst
+++ b/project_template/docs/install.rst
@@ -6,14 +6,14 @@ System-wide
 
 ::
 
-    sudo pip install --find-links=https://phdru.name/Software/Python/ --no-index --install-option='-O2' {project}
+    sudo pip install --find-links=https://phdru.name/Software/Python/ --no-index {project}
 
 User mode
 ---------
 
 ::
 
-    pip install --find-links=https://phdru.name/Software/Python/ --no-index --install-option='-O2' --user {project}
+    pip install --find-links=https://phdru.name/Software/Python/ --no-index --user {project}
 
 Installation from sources
 =========================

diff --git a/project_template/docs/news.rst b/project_template/docs/news.rst
index 40563541addebd730bb1c432e2e1373b17e32d6f..3ff807b8f23658da0af4c1b9b974242d9d3e38eb 100644 (file)
--- a/project_template/docs/news.rst
+++ b/project_template/docs/news.rst
@@ -1,7 +1,7 @@
 News
 ====
 
-Version 0.0.1 (2018-04-??)
+Version 0.0.1 (2025-01-01)
 ---------------------------
 
 * 

diff --git a/project_template/setup.py b/project_template/setup.py
index cff05a0995420a908edd581f85c4105a2d291b89..7066def4b2b538deaf456703237a5df087db57a8 100755 (executable)
--- a/project_template/setup.py
+++ b/project_template/setup.py
@@ -65,6 +65,8 @@ setup(
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',
         'Programming Language :: Python :: 3.11',
+        'Programming Language :: Python :: 3.12',
+        'Programming Language :: Python :: 3.13',
     ],
     packages=['{project}'],
     package_data={'{project}': []},

diff --git a/project_template/tox.ini b/project_template/tox.ini
index 827f97076c67d08f7152c3ba30bfdc8dead285af..2c88fcd27aa90d0394ebfb1bcf793fe952a2a642 100644 (file)
--- a/project_template/tox.ini
+++ b/project_template/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 3.15
-envlist = py27,py3{4,5,6,7,8,9,10,11},pypy,pypy3,py{27,36,311}-flake8
+envlist = py{27,34,35,36,37,38,39,310,311,312,313,py,py3},py{27,37,312}-flake8
 
 [testenv]
 commands =
@@ -11,12 +11,12 @@ passenv = CI DISTUTILS_USE_SDK MSSdk INCLUDE LIB WINDIR
 deps =
     -rdevscripts/requirements/requirements_tests.txt
 
-[testenv:py{27,34,35,36,37,38,39,310,311,py,py3}]
+[testenv:py{27,34,35,36,37,38,39,310,311,312,313,py,py3}]
 commands =
     {[testenv]commands}
     {envpython} -m pytest
 
-[testenv:py{27,34,35,36,37,38,39,310,311}-flake8]
+[testenv:py{27,34,35,36,37,38,39,310,311,312,313,py,py3}-flake8]
 deps =
     flake8
     pytest < 7.0

diff --git a/publish2web b/publish2web
index 1b7a6f9c3b00c79ec27e7cde93573772f49eac31..1590b82196dbe8a0a3f10ef80c199587dc7d54e3 100755 (executable)
--- a/publish2web
+++ b/publish2web
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 if [ ! -d ".git" -a -z "$1" ]; then
-   echo "Usage: $0 repoistory [directories]" >&2
+   echo "Usage: $0 repository [directories]" >&2
    exit 1
 fi
 
@@ -12,7 +12,7 @@ fi &&
 source_dir="`pwd`" &&
 
 if [ ! -d ".git" ]; then
-   echo "$source_dir is not a repoistory (.git isn't found)" >&2
+   echo "$source_dir is not a repository (.git isn't found)" >&2
    exit 1
 fi &&
 
@@ -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." ]
@@ -52,5 +52,8 @@ cd "$source_dir" &&
 if [ -n "$directories" ]; then
    dest_dir="$directories/$dest_dir"
 fi &&
-git remote add web "$HOME"/Internet/WWW/htdocs/git.phdru.name/"$dest_dir" &&
+{
+    git remote add web "$HOME"/Internet/WWW/htdocs/git.phdru.name/"$dest_dir" ||
+    git remote set-url web "$HOME"/Internet/WWW/htdocs/git.phdru.name/"$dest_dir"
+} &&
 exec git push --set-upstream web master