Skip to content

Commit 193c262

Browse files
committed
Administrivia
Folloow branching of other projects in this ilk
1 parent f0e1a7b commit 193c262

File tree

7 files changed

+34
-6
lines changed

7 files changed

+34
-6
lines changed

admin-tools/merge-for-3.3.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
uncompyle6_merge_33_owd=$(pwd)
33
cd $(dirname ${BASH_SOURCE[0]})
44
if . ./setup-python-3.3.sh; then
5-
git merge master
5+
git merge python-3.6-to-3.10
66
fi
77
cd $uncompyle6_merge_33_owd

admin-tools/merge-for-3.6.sh

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

admin-tools/setup-master.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ if [[ $0 == $bs ]] ; then
66
exit 1
77
fi
88

9-
PYTHON_VERSION=3.8
9+
PYTHON_VERSION=3.12
1010

1111
uncompyle6_owd=$(pwd)
1212
mydir=$(dirname $bs)
@@ -16,5 +16,5 @@ cd $mydir
1616
cd $fulldir/..
1717
(cd $fulldir/.. && \
1818
setup_version python-spark master && \
19-
setup_version python-xdis python-3.6 )
19+
setup_version python-xdis master )
2020
checkout_finish master

admin-tools/setup-python-2.4.sh

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

10-
PYTHON_VERSION=2.4.6
10+
PYTHON_VERSION=2.4
1111

1212
uncompyle6_owd=$(pwd)
1313
mydir=$(dirname $bs)

admin-tools/setup-python-3.0.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ if [[ $0 == $bs ]] ; then
66
exit 1
77
fi
88

9-
PYTHON_VERSION=3.0.1
9+
PYTHON_VERSION=3.0
1010

1111
uncompyle6_owd=$(pwd)
1212
mydir=$(dirname $bs)

admin-tools/setup-python-3.3.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ if [[ $0 == $bs ]] ; then
66
exit 1
77
fi
88

9-
PYTHON_VERSION=3.3.7
9+
PYTHON_VERSION=3.3
1010

1111
uncompyle6_owd=$(pwd)
1212
mydir=$(dirname $bs)

admin-tools/setup-python-3.6.sh

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
#!/bin/bash
2+
# Check out python-3.6-to-3.10 and dependent development branches.
3+
bs=${BASH_SOURCE[0]}
4+
if [[ $0 == $bs ]] ; then
5+
echo "This script should be *sourced* rather than run directly through bash"
6+
exit 1
7+
fi
8+
9+
PYTHON_VERSION=3.6
10+
11+
uncompyle6_owd=$(pwd)
12+
mydir=$(dirname $bs)
13+
cd $mydir
14+
fulldir=$(readlink -f $mydir)
15+
. ./checkout_common.sh
16+
cd $fulldir/..
17+
(cd $fulldir/.. && \
18+
setup_version python-spark python-3.6 && \
19+
setup_version python-xdis python-3.6 )
20+
21+
checkout_finish python-3.6-to-3.10

0 commit comments

Comments
 (0)