Skip to content

Commit 503da17

Browse files
JeremyBYUJeremyBYU
committed
Update artifacts creation
1 parent 345f4a0 commit 503da17

File tree

3 files changed

+71
-165
lines changed

3 files changed

+71
-165
lines changed

‎.github/workflows/wheels.yml

+46-164
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,45 @@ env:
99
NPROC: 2
1010

1111
jobs:
12+
13+
# Create Source Distribution and upload artifacts
14+
sdist:
15+
name: Source distribution
16+
runs-on: ubuntu-latest
17+
steps:
18+
- name: Checkout code
19+
uses: actions/checkout@v2
20+
21+
- name: Setup Python
22+
uses: actions/setup-python@v2
23+
with:
24+
python-version: '3.6'
25+
26+
- name: Setup CMake
27+
uses: jwlawson/[email protected]
28+
29+
- name: Install requirements
30+
run: pip install --user twine
31+
32+
- name: Build sdist
33+
run: |
34+
python setup.py sdist -d wheelhouse
35+
36+
- name: Install from sdist
37+
run: |
38+
pip install --user wheelhouse/*.tar.gz
39+
40+
- name: Check sdist
41+
run: |
42+
python -m twine check wheelhouse/*
43+
44+
- name: Upload sdist
45+
uses: actions/upload-artifact@v2
46+
with:
47+
name: wheels
48+
path: wheelhouse/*.tar.gz
49+
50+
# Create Binary Distribution (wheels) and upload artifacts
1251
wheels:
1352
runs-on: ${{ matrix.os }}
1453
strategy:
@@ -17,20 +56,18 @@ jobs:
1756
include:
1857
- os: ubuntu-latest
1958
cibw-arch: manylinux_x86_64
20-
# - runs-on: ubuntu-latest
21-
# cibw-arch: manylinux_i686
59+
- runs-on: windows-latest
60+
cibw-arch: win_amd64
2261
# - runs-on: macos-latest
2362
# cibw-arch: macosx_x86_64
24-
# - runs-on: windows-latest
25-
# cibw-arch: win_amd64
63+
# - runs-on: ubuntu-latest
64+
# cibw-arch: manylinux_i686
2665
# - runs-on: windows-latest
2766
# cibw-arch: win32
2867
# python-arch: x86
2968
# cmake-arch: -A Win32
3069
env:
31-
# CIBW_BUILD: "cp36-* cp37-*"
32-
CIBW_SKIP: "cp27-* cp35-* cp39-* cp27-* pp27-* pp36-* pp37-*"
33-
# CIBW_BUILD: "cp35-* cp36-* cp37-* cp38-* cp39-*"
70+
CIBW_SKIP: "cp27-* cp35-* cp27-* pp27-* pp36-* pp37-*"
3471
steps:
3572
- name: Checkout source code
3673
uses: actions/checkout@v2
@@ -64,160 +101,5 @@ jobs:
64101
uses: actions/upload-artifact@v2
65102
with:
66103
path: wheelhouse/*.whl
67-
68-
69-
# build-wheel:
70-
# name: Build wheel
71-
# runs-on: Ubuntu-18.04
72-
# strategy:
73-
# fail-fast: false
74-
# matrix:
75-
# python_version: [3.6, 3.7, 3.8]
76-
# env:
77-
# BUILD_CUDA_MODULE: ON
78-
# OPEN3D_ML_ROOT: ${{ github.workspace }}/Open3D-ML
79-
# DEVELOPER_BUILD: ${{ github.event.inputs.developer_build }}
80-
# steps:
81-
# - name: Checkout source code
82-
# uses: actions/checkout@v2
83-
# with:
84-
# submodules: true
85-
86-
# - name: Checkout Open3D-ML source code
87-
# uses: actions/checkout@v2
88-
# with:
89-
# repository: intel-isl/Open3D-ML
90-
# path: ${{ env.OPEN3D_ML_ROOT }}
91-
92-
# - name: Setup cache
93-
# uses: actions/cache@v2
94-
# with:
95-
# # Ref: https://github.com/apache/incubator-mxnet/pull/18459/files
96-
# path: ~/.ccache
97-
# # We include the commit sha in the cache key, as new cache entries are
98-
# # only created if there is no existing entry for the key yet.
99-
# key: ${{ runner.os }}-ccache-${{ github.sha }}
100-
# # Restore any ccache cache entry, if none for
101-
# # ${{ runner.os }}-ccache-${{ github.sha }} exists.
102-
# # Common prefix will be used so that ccache can be used across commits.
103-
# restore-keys: |
104-
# ${{ runner.os }}-ccache
105-
# - name: Set up Python version
106-
# uses: conda-incubator/setup-miniconda@v2
107-
# with:
108-
# auto-update-conda: false
109-
# python-version: ${{ matrix.python_version }}
110-
# # Pre-installed 18.04 packages: https://git.io/JfHmW
111-
# - name: Install dependencies
112-
# shell: bash -l {0}
113-
# run: |
114-
# ./util/install_deps_ubuntu.sh assume-yes
115-
# sudo apt-get --yes install ccache
116-
# ccache -M 500M # See .github/workflows/readme.md for ccache strategy.
117-
# source util/ci_utils.sh
118-
# echo
119-
# install_cuda_toolkit with-cudnn purge-cache
120-
# nvcc --version
121-
# # Export PATH and LD_LIBRARY_PATH (for CUDA) for the next step
122-
# echo "PATH=$PATH" >> $GITHUB_ENV
123-
# echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH" >> $GITHUB_ENV
124-
# echo
125-
# echo "Installing CPU versions of packages"
126-
# install_python_dependencies with-conda
127-
# echo
128-
# echo -n "Using conda"
129-
# conda info
130-
# echo "Using python: $(which python)"
131-
# python --version
132-
# echo -n "Using pip: "
133-
# python -m pip --version
134-
# echo "Using cmake: $(which cmake)"
135-
# cmake --version
136-
137-
# - name: Config and build wheel
138-
# shell: bash -l {0}
139-
# run: |
140-
# PATH=/usr/lib/ccache:$PATH
141-
# ccache -s
142-
# source util/ci_utils.sh
143-
# build_pip_conda_package build_azure_kinect
144-
# ccache -s
145-
# PIP_PKG_NAME="$(basename build/lib/python_package/pip_package/open3d*.whl)"
146-
# echo "PIP_PKG_NAME=$PIP_PKG_NAME" >> $GITHUB_ENV
147-
# CONDA_PKG_NAME="$(basename build/lib/python_package/conda_package/linux-64/open3d*.tar.bz2)"
148-
# echo "CONDA_PKG_NAME=$CONDA_PKG_NAME" >> $GITHUB_ENV
149-
150-
# - name: Upload wheel
151-
# uses: actions/upload-artifact@v2
152-
# with:
153-
# name: open3d_linux_x86_64_wheels
154-
# path: |
155-
# build/lib/python_package/pip_package/${{ env.PIP_PKG_NAME }}
156-
# build/lib/python_package/conda_package/linux-64/${{ env.CONDA_PKG_NAME }}
157-
# if-no-files-found: error
158-
159-
# - name: GCloud CLI setup
160-
# if: ${{ github.ref == 'refs/heads/master' }}
161-
# uses: google-github-actions/setup-gcloud@master
162-
# with:
163-
# version: ${{ env.GCE_CLI_GHA_VERSION }}
164-
# service_account_key: ${{ secrets.GCE_SA_KEY_GPU_CI }}
165-
# project_id: ${{ secrets.GCE_DOCS_PROJECT }}
166-
# export_default_credentials: true
167-
168-
# - name: Upload wheel to GCS bucket
169-
# if: ${{ github.ref == 'refs/heads/master' }}
170-
# env:
171-
# python_version: ${{ matrix.python_version }}
172-
# run: |
173-
# PYTAG="-cp$(echo ${{ env.python_version }} | tr -d '.')"
174-
# gsutil cp build/lib/python_package/pip_package/${{ env.PIP_PKG_NAME }} gs://open3d-releases-master/python-wheels/
175-
# echo "Download pip package at: https://storage.googleapis.com/open3d-releases-master/python-wheels/${{ env.PIP_PKG_NAME }}"
176-
# gsutil cp build/lib/python_package/conda_package/linux-64/${{ env.CONDA_PKG_NAME }} gs://open3d-releases-master/conda_package/linux-64/
177-
# echo "Download conda package at: https://storage.googleapis.com/open3d-releases-master/conda_package/linux-64/${{ env.CONDA_PKG_NAME }}"
178-
179-
# test-wheel:
180-
# name: Test wheel
181-
# runs-on: ubuntu-18.04
182-
# needs: [build-wheel]
183-
# strategy:
184-
# fail-fast: false
185-
# matrix:
186-
# python_version: [3.6, 3.7, 3.8]
187-
# env:
188-
# OPEN3D_ML_ROOT: ${{ github.workspace }}/Open3D-ML
189-
# steps:
190-
# - name: Checkout source code
191-
# uses: actions/checkout@v2
192-
# with:
193-
# submodules: false
194-
195-
# - name: Checkout Open3D-ML source code
196-
# uses: actions/checkout@v2
197-
# with:
198-
# repository: intel-isl/Open3D-ML
199-
# path: ${{ env.OPEN3D_ML_ROOT }}
200-
201-
# - name: Download wheels
202-
# uses: actions/download-artifact@v2
203-
# # See https://github.com/dawidd6/action-download-artifact for more
204-
# # flexible artifact download options
205-
# with:
206-
# name: open3d_linux_x86_64_wheels
207-
# - name: Set up Python
208-
# uses: actions/setup-python@v2
209-
# with:
210-
# python-version: ${{ matrix.python_version }}
211-
212-
# - name: Test Python package
213-
# run: |
214-
# python -V
215-
# source util/ci_utils.sh
216-
# pi_tag=$(python -c "import sys; print(f'cp{sys.version_info.major}{sys.version_info.minor}')")
217-
# test_wheel pip_package/open3d*-"$pi_tag"-*.whl
218-
219-
# - name: Run Python unit tests (benchmarks)
220-
# run: |
221-
# source util/ci_utils.sh
222-
# echo "Running Open3D python tests..."
223-
# run_python_tests
104+
name: wheels
105+

‎MANIFEST.in

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
include *.txt
2+
include LICENSE
3+
recursive-include bench *.cpp
4+
recursive-include bench *.txt
5+
recursive-include cmake *.cmake
6+
recursive-include examples *.cpp
7+
recursive-include examples *.py
8+
recursive-include examples *.txt
9+
recursive-include include *.hpp
10+
recursive-include scripts *.py
11+
recursive-include scripts *.sh
12+
recursive-include src *.cmake
13+
recursive-include src *.cpp
14+
recursive-include src *.hpp
15+
recursive-include src *.in
16+
recursive-include src *.md
17+
recursive-include src *.py
18+
recursive-include src *.txt
19+
recursive-include tests *.cpp
20+
recursive-include tests *.txt
21+
recursive-include thirdparty *.txt

‎setup.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,10 @@ def build_extension(self, ext):
128128
author="Jeremy Castagno",
129129
author_email="[email protected]",
130130
description="Test CPPLib integration",
131-
long_description="",
131+
long_description=open('README.md').read(),
132+
long_description_content_type='text/markdown',
133+
license="MIT",
134+
include_package_data=True,
132135
packages=['cpplib'],
133136
package_dir={'':'src/Python'},
134137
ext_modules=[CMakeExtension("cpplib_pybind")],

0 commit comments

Comments
 (0)