Skip to content

Commit 31ccc65

Browse files
committed
* Split off 3.11 from 3.12 and 3.13
* add Merge for 3.11
1 parent 0905f66 commit 31ccc65

File tree

6 files changed

+74
-2
lines changed

6 files changed

+74
-2
lines changed

admin-tools/check-3.11-versions.sh

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
#!/bin/bash
2+
function finish {
3+
cd $trepan3k_owd
4+
}
5+
6+
# FIXME put some of the below in a common routine
7+
trepan3k_owd=$(pwd)
8+
# trap finish EXIT
9+
10+
cd $(dirname ${BASH_SOURCE[0]})
11+
if ! source ./pyenv-3.11-versions ; then
12+
exit $?
13+
fi
14+
15+
. ./setup-python-3.11.sh
16+
17+
cd ..
18+
for version in $PYVERSIONS; do
19+
if ! pyenv local $version ; then
20+
exit $?
21+
fi
22+
python --version
23+
make clean && pip install -e .
24+
if ! make check; then
25+
exit $?
26+
fi
27+
echo === $version ===
28+
done

admin-tools/merge-for-3.11.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#/bin/bash
2+
trepan_merge_311_owd=$(pwd)
3+
PYTHON_VERSION=3.11
4+
pyenv local $PYTHON_VERSION
5+
cd $(dirname ${BASH_SOURCE[0]})
6+
if . ./setup-python-3.11.sh; then
7+
git merge master
8+
fi
9+
cd $trepan_merge_311_owd

admin-tools/merge-for-3.6.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ PYTHON_VERSION=3.6
44
pyenv local $PYTHON_VERSION
55
cd $(dirname ${BASH_SOURCE[0]})
66
if . ./setup-python-3.6.sh; then
7-
git merge master
7+
git merge python-3.11
88
fi
99
cd $trepan_merge_36_owd

admin-tools/pyenv-3.11-versions

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# -*- shell-script -*-
2+
# Sets PYVERSIONS to be pyenv versions that
3+
# we can use in the master
4+
5+
if [[ $0 == ${BASH_SOURCE[0]} ]] ; then
6+
echo "This script should be *sourced* rather than run directly through bash"
7+
exit 1
8+
fi
9+
10+
export PYVERSIONS='3.11'

admin-tools/pyenv-newest-versions

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ if [[ $0 == ${BASH_SOURCE[0]} ]] ; then
77
exit 1
88
fi
99

10-
export PYVERSIONS='3.11 3.12'
10+
export PYVERSIONS='3.12 3.13'

admin-tools/setup-python-3.11.sh

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
#!/bin/bash
2+
# Check out 3.11 branch and dependent development branches
3+
PYTHON_VERSION=3.11
4+
5+
bs=${BASH_SOURCE[0]}
6+
if [[ $0 == $bs ]] ; then
7+
echo "This script should be *sourced* rather than run directly through bash"
8+
exit 1
9+
fi
10+
11+
export PATH=$HOME/.pyenv/bin/pyenv:$PATH
12+
trepan3k_owd=$(pwd)
13+
mydir=$(dirname $bs)
14+
cd $mydir
15+
. ./checkout_common.sh
16+
(cd $mydir/../../rocky && \
17+
setup_version python-uncompyle6 master && \
18+
setup_version python-filecache master && \
19+
setup_version shell-term-background master && \
20+
setup_version pytracer master \
21+
setup_version pycolumnize master && \
22+
setup_version python-xdis master \
23+
)
24+
25+
checkout_finish python-3.11

0 commit comments

Comments
 (0)