From 78112d7792221d86aa54f1971eb06c6dca1b8c87 Mon Sep 17 00:00:00 2001 From: jmorat Date: Thu, 29 Feb 2024 09:23:12 +0100 Subject: [PATCH] v1.1.9 --- .github/workflows/release.yml | 52 ++++++++++++++++++++++------------- requirements.txt | 1 + setup.py | 11 ++++---- 3 files changed, 40 insertions(+), 24 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8ee3c58..8a17928 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -8,27 +8,41 @@ on: types: [created] jobs: - deploy_pip: + release-build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 - - name: Set up Python - uses: actions/setup-python@v4 - with: - python-version: '3.10' - - name: Install dependencies - run: | - sudo apt-get install -y pandoc asciidoctor - python -m pip install --upgrade pip - pip install setuptools wheel twine - if [ -f requirements.txt ]; then pip install -r requirements.txt; fi - - name: pypi Build and publish - env: - TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }} - TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }} - run: | - python setup.py sdist bdist_wheel - twine upload --verbose --skip-existing dist/* + - uses: actions/checkout@v4 + - uses: actions/setup-python@v4 + with: + python-version: "3.10" + - name: build release distributions + run: | + # NOTE: put your own distribution build steps here. + python -m build + + - name: upload windows dists + uses: actions/upload-artifact@v4 + with: + name: release-dists + path: dist/ + + pypi-publish: + runs-on: ubuntu-latest + needs: + - release-build + permissions: + id-token: write + + steps: + - name: Retrieve release distributions + uses: actions/download-artifact@v4 + with: + name: release-dists + path: dist/ + + - name: Publish release distributions to PyPI + uses: pypa/gh-action-pypi-publish@release/v1 + deploy_docker: runs-on: ubuntu-latest steps: diff --git a/requirements.txt b/requirements.txt index 3771174..662e0af 100644 --- a/requirements.txt +++ b/requirements.txt @@ -13,4 +13,5 @@ wcmatch tabulate>=0.8.7 pytz>=2021.1 pytest>=6 +build>=1.0.3 open3d;python_version<'3.12' diff --git a/setup.py b/setup.py index 55a3c56..976582e 100644 --- a/setup.py +++ b/setup.py @@ -37,7 +37,6 @@ def read_doc(filepath): return content - readme_filepath = path.join(HERE, 'README.adoc') long_description = read_doc(readme_filepath) @@ -45,7 +44,7 @@ def read_doc(filepath): setuptools.setup( # description name='kapture', - version="1.1.8", + version="1.1.9", author="naverlabs", author_email="kapture@naverlabs.com", description="kapture: file format for SfM", @@ -59,14 +58,14 @@ def read_doc(filepath): ], # dependencies - python_requires='>=3.6', + python_requires='>=3.8', install_requires=[ 'dataclasses>=0.3;python_version<\'3.7\'', 'numpy>=1.16', 'numpy-quaternion>=2019.3.18.14.33.20', 'numba>=0.42', 'matplotlib>=3.0', - 'scipy>=1.4', + 'scipy>=1.12', 'tqdm>=4.30', 'Pillow>=8.1.1', 'piexif==1.1.3', @@ -74,12 +73,14 @@ def read_doc(filepath): 'pyyaml>=5.1', 'wcmatch>=5.0', 'tabulate>=0.8.7', - 'pytz>=2021.1' + 'pytz>=2021.1', + 'build>=1.0.3' ], extras_require={ 'dev': ['pytest'], }, # sources packages=setuptools.find_packages(), + data_files=[(".", ["README.adoc"])], scripts=[f for f in glob(os.path.join(HERE, 'tools', '*.py'))], )