From f7f5d958fb70dd93692e349896d776217a823797 Mon Sep 17 00:00:00 2001 From: Matthijs Brobbel Date: Thu, 23 Jan 2020 14:36:29 +0100 Subject: [PATCH 1/3] Update setuptools and wheel to fix pypi wheel upload --- .github/workflows/release.yml | 2 +- python/tools/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index cfd059d91..9c827adfa 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -53,7 +53,7 @@ jobs: - name: Install Swig run: brew install swig - name: Install dependencies - run: python -m pip install wheel + run: python3 -m pip install -U setuptools wheel - name: Build wheel run: python3 setup.py bdist_wheel - uses: actions/upload-artifact@v1 diff --git a/python/tools/Dockerfile b/python/tools/Dockerfile index b5ae7ebb5..7d8bb190c 100644 --- a/python/tools/Dockerfile +++ b/python/tools/Dockerfile @@ -12,7 +12,7 @@ RUN curl -sSf https://sh.rustup.rs | sh -s -- -y && \ ./configure --without-pcre && \ make && \ make install && \ - ${PYBIN}/pip3 install auditwheel + ${PYBIN}/pip3 install -U setuptools wheel auditwheel ENV PATH=$PATH:/root/.cargo/bin From dcd9e26fd02336e850b56310c7f33bad35447b3d Mon Sep 17 00:00:00 2001 From: Matthijs Brobbel Date: Thu, 23 Jan 2020 14:36:42 +0100 Subject: [PATCH 2/3] Release 0.1.1 --- CHANGELOG.md | 7 ++++++- CMakeLists.txt | 2 +- Cargo.lock | 2 +- rust/Cargo.toml | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 17bd8cac1..a83940c7c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ +# [0.1.1] - 2020-01-23 + +- Fix PyPi wheel upload + # [0.1.0] - 2020-01-23 -Initial release +- Initial release +[0.1.1]: https://github.com/mbrobbel/dqcsim/releases/tag/0.1.1 [0.1.0]: https://github.com/mbrobbel/dqcsim/releases/tag/0.1.0 diff --git a/CMakeLists.txt b/CMakeLists.txt index c82d790c2..a8192032b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -93,7 +93,7 @@ else() cmake_minimum_required(VERSION 3.14.0 FATAL_ERROR) project(dqcsim - VERSION 0.1.0 + VERSION 0.1.1 DESCRIPTION "C++ bindings for the Delft Quantum & Classical Simulator" LANGUAGES CXX ) diff --git a/Cargo.lock b/Cargo.lock index f23fb0364..30bec398b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -211,7 +211,7 @@ dependencies = [ [[package]] name = "dqcsim" -version = "0.1.0" +version = "0.1.1" dependencies = [ "ansi_term 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)", "backtrace 0.3.42 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/rust/Cargo.toml b/rust/Cargo.toml index cf189ac3d..a00065dd3 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "dqcsim" -version = "0.1.0" +version = "0.1.1" authors = ["Quantum Computer Architectures, Quantum & Computer Engineering, QuTech, Delft University of Technology"] edition = '2018' build = "tools/build.rs" From 44ea235b706e916b2f49464ad696e5b98e07cb05 Mon Sep 17 00:00:00 2001 From: Matthijs Brobbel Date: Thu, 23 Jan 2020 14:58:47 +0100 Subject: [PATCH 3/3] Undo update of setuptools and wheel in manylinux image --- python/tools/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/tools/Dockerfile b/python/tools/Dockerfile index 7d8bb190c..b5ae7ebb5 100644 --- a/python/tools/Dockerfile +++ b/python/tools/Dockerfile @@ -12,7 +12,7 @@ RUN curl -sSf https://sh.rustup.rs | sh -s -- -y && \ ./configure --without-pcre && \ make && \ make install && \ - ${PYBIN}/pip3 install -U setuptools wheel auditwheel + ${PYBIN}/pip3 install auditwheel ENV PATH=$PATH:/root/.cargo/bin