diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index deb742d..7820132 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,6 +16,9 @@ concurrency: group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} cancel-in-progress: true +env: + TZ: Asia/Shanghai + jobs: job-ruff: runs-on: ubuntu-latest @@ -52,9 +55,9 @@ jobs: - name: pip-install-test run: | - sudo pip3 install -UI pip && sudo pip3 install -UI setuptools wheel twine pyOpenSSL + sudo pip3 install -UI pip && sudo pip3 install -UI build setuptools wheel twine pyOpenSSL cd src - sudo python3 setup.py sdist bdist_wheel + sudo python3 -m build pip3 install ./dist/*.tar.gz aloha info pip3 list | sort @@ -66,7 +69,7 @@ jobs: run: | env | sort -f && cd src && ls -alh sudo python3 -c "import fcntl; fcntl.fcntl(1, fcntl.F_SETFL, 0)" - sudo python3 setup.py sdist bdist_wheel + sudo python3 -m build ls -alh ./dist if [ "${GITHUB_REPOSITORY}" = "QPod/aloha-python" ] && [ "${GITHUB_REF_NAME}" = "main" ] ; then diff --git a/app/requirements.txt b/app/requirements.txt index b9b47b6..f718c00 100644 --- a/app/requirements.txt +++ b/app/requirements.txt @@ -18,7 +18,7 @@ pymongo redis confluent_kafka pandas -openpyxl>=3 +openpyxl XlsxWriter pytest-cov mkdocs diff --git a/doc/requirements.txt b/doc/requirements.txt index 4f3f82e..b0be5a1 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -14,12 +14,12 @@ psutil pyjwt # db -sqlalchemy<2 +sqlalchemy psycopg2-binary pymysql elasticsearch pymongo -redis>4.2.0 +redis # stream confluent_kafka @@ -28,7 +28,7 @@ confluent_kafka pandas # report -openpyxl>=3 +openpyxl XlsxWriter # test diff --git a/src/setup.py b/src/setup.py index bd4bb1b..bc966a0 100644 --- a/src/setup.py +++ b/src/setup.py @@ -17,7 +17,7 @@ "db": ["sqlalchemy", "psycopg[binary]", "pymysql", "elasticsearch", "pymongo", "redis"], "stream": ["confluent_kafka"], "data": ["pandas"], - "report": ["openpyxl>=3", "XlsxWriter"], + "report": ["openpyxl", "XlsxWriter"], "test": ["pytest-cov"], "docs": ["mkdocs", "mkdocstrings[python]", "markdown-include", "mkdocs-material"], } @@ -27,7 +27,7 @@ version=_version, author="LabNow.ai", author_email="postmaster@labnow.ai", - license="Apache Software License", + license="Apache-2.0", url="https://github.com/LabNow.ai/aloha", project_urls={ "Source": "https://github.com/LabNow-ai/aloha", @@ -55,7 +55,6 @@ "Intended Audience :: System Administrators", "Intended Audience :: Science/Research", "Programming Language :: Python :: 3", - "License :: OSI Approved :: Apache Software License", "Operating System :: OS Independent", ], )