Skip to content

Commit 7e216e0

Browse files
author
yuzelin
committed
[Build] Refactor project structure and refactor release tools
1 parent 33d5253 commit 7e216e0

31 files changed

+209
-285
lines changed

.github/workflows/check-java-bridge-licensing.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,14 @@ jobs:
4040
- name: Build
4141
run: |
4242
set -o pipefail
43-
cd pypaimon/py4j/paimon-python-java-bridge
43+
cd paimon-python-java-bridge
4444
mvn clean deploy ${{ env.MVN_COMMON_OPTIONS }} -DskipTests \
4545
-DaltDeploymentRepository=validation_repository::default::file:${{ env.MVN_VALIDATION_DIR }} \
4646
| tee ${{ env.MVN_BUILD_OUTPUT_FILE }}
4747
4848
- name: Check licensing
4949
run: |
50-
cd pypaimon/py4j/paimon-python-java-bridge
50+
cd paimon-python-java-bridge
5151
mvn ${{ env.MVN_COMMON_OPTIONS }} exec:java@check-licensing -N \
5252
-Dexec.args="${{ env.MVN_BUILD_OUTPUT_FILE }} $(pwd) ${{ env.MVN_VALIDATION_DIR }}" \
5353
-Dlog4j.configurationFile=file://$(pwd)/tools/ci/log4j.properties

MANIFEST.in

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
################################################################################
2+
# Licensed to the Apache Software Foundation (ASF) under one
3+
# or more contributor license agreements. See the NOTICE file
4+
# distributed with this work for additional information
5+
# regarding copyright ownership. The ASF licenses this file
6+
# to you under the Apache License, Version 2.0 (the
7+
# "License"); you may not use this file except in compliance
8+
# with the License. You may obtain a copy of the License at
9+
#
10+
# http://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# Unless required by applicable law or agreed to in writing, software
13+
# distributed under the License is distributed on an "AS IS" BASIS,
14+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
# See the License for the specific language governing permissions and
16+
# limitations under the License.
17+
################################################################################
18+
19+
global-exclude *.py[cod] __pycache__ .DS_Store
20+
recursive-include deps/jars *.jar
21+
include README.md
22+
include LICENSE
23+
include NOTICE

dev/lint-python.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -577,8 +577,9 @@ function tox_check() {
577577
# Ensure the permission of the scripts set correctly
578578
chmod +x $PAIMON_PYTHON_DIR/dev/*
579579

580-
# tox runs codes in virtual env, set var to avoid error
581-
export _PYPAIMON_TOX_TEST="true"
580+
# dummy jar needed bt setup.py
581+
mkdir -p $PAIMON_PYTHON_DIR/deps/jars
582+
touch $PAIMON_PYTHON_DIR/deps/jars/dummy.jar
582583

583584
if [[ -n "$GITHUB_ACTION" ]]; then
584585
# Run tests in all versions triggered by a Git push (tests aren't so many currently)
@@ -596,6 +597,9 @@ function tox_check() {
596597
$TOX_PATH -vv -c $PAIMON_PYTHON_DIR/tox.ini -e ${ENV_LIST[$index]} --recreate 2>&1 | tee -a $LOG_FILE
597598
fi
598599

600+
# clean dummy jar
601+
rm -rf $PAIMON_PYTHON_DIR/deps/jars
602+
599603
TOX_RESULT=$((grep -c "congratulations :)" "$LOG_FILE") 2>&1)
600604
if [ $TOX_RESULT -eq '0' ]; then
601605
print_function "STAGE" "tox checks... [FAILED]"
File renamed without changes.
File renamed without changes.

pypaimon/py4j/paimon-python-java-bridge/src/main/java/org/apache/paimon/python/BytesWriter.java renamed to paimon-python-java-bridge/src/main/java/org/apache/paimon/python/BytesWriter.java

File renamed without changes.

pypaimon/py4j/paimon-python-java-bridge/src/main/java/org/apache/paimon/python/FileLock.java renamed to paimon-python-java-bridge/src/main/java/org/apache/paimon/python/FileLock.java

File renamed without changes.

pypaimon/py4j/paimon-python-java-bridge/src/main/java/org/apache/paimon/python/InvocationUtil.java renamed to paimon-python-java-bridge/src/main/java/org/apache/paimon/python/InvocationUtil.java

File renamed without changes.

pypaimon/py4j/paimon-python-java-bridge/src/main/java/org/apache/paimon/python/NetUtils.java renamed to paimon-python-java-bridge/src/main/java/org/apache/paimon/python/NetUtils.java

File renamed without changes.

pypaimon/py4j/paimon-python-java-bridge/src/main/java/org/apache/paimon/python/ParallelBytesReader.java renamed to paimon-python-java-bridge/src/main/java/org/apache/paimon/python/ParallelBytesReader.java

File renamed without changes.

0 commit comments

Comments
 (0)