From 78883b9ed045447687c752b62303cf46ae12b5cd Mon Sep 17 00:00:00 2001
From: Ryosuke Kamesawa <emak.ryo@gmail.com>
Date: Thu, 25 Nov 2021 22:28:27 +0900
Subject: [PATCH] Upadte package metadata

---
 .github/workflows/test.yml |  6 ++----
 Cargo.lock                 |  2 +-
 Cargo.toml                 | 18 +-----------------
 pyproject.toml             | 35 ++++++++++++++++++++++++++++-------
 4 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 058f00e..274a1cb 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -55,9 +55,9 @@ jobs:
     - name: Install cargo-edit
       if: steps.cache-cargo-edit.outputs.cache-hit != 'true'
       run: cargo install cargo-edit
-    - name: Python syntax check
+    - name: Check flake8
       run: flake8
-    - name: Rust lint
+    - name: Check clippy
       run: cargo clippy
     - name: Build wheel
       run: |
@@ -72,8 +72,6 @@ jobs:
       run: pip install target/wheels/rustdef-*${{ matrix.python-name }}*.whl
     - name: Execute examples
       shell: bash
-      # Skip numpy.ipynb due to problem w/ pyo3 https://github.com/PyO3/rust-numpy/issues/97
-      # ##[error]thread '<unnamed>' panicked at 'An error occurred while initializing class SliceBox', rustdef_cell_4f1f27901aca8ef8c2b7ba8fd8a3fd78760e5ae7/src/lib.rs:1:1
       run: jupyter-nbconvert --to html --debug --stdout --ExecutePreprocessor.timeout=-1 --execute 'Get started.ipynb' types.ipynb numpy.ipynb
       working-directory: examples
 
diff --git a/Cargo.lock b/Cargo.lock
index 707eb1b..4a834c5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -266,7 +266,7 @@ checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"
 
 [[package]]
 name = "rustdef"
-version = "0.3.0"
+version = "0.3.1-rc"
 dependencies = [
  "pyo3",
  "quote",
diff --git a/Cargo.toml b/Cargo.toml
index 7e58b46..63341c1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "rustdef"
-version = "0.3.0"
+version = "0.3.1-rc"
 authors = ["Ryosuke Kamesawa <emak.ryo@gmail.com>"]
 edition = "2018"
 
@@ -15,19 +15,3 @@ quote = "1.0.10"
 zip = "0.5.13"
 syn = { version = "1.0.81", features = ["full"] }
 pyo3 = { version = "0.15.1", features = ["extension-module"] }  # version corresponds to numpy
-
-[package.metadata.maturin]
-requires-dist = ["maturin", "jupyter"]
-classifier = [
-    "Framework :: Jupyter",
-    "Framework :: IPython",
-    "Operating System :: MacOS",
-    "Operating System :: POSIX :: Linux",
-    "Programming Language :: Python :: 3.6",
-    "Programming Language :: Python :: 3.7",
-    "Programming Language :: Python :: 3.8",
-    "Programming Language :: Rust",
-]
-requires-python = ">=3.6"
-requires-external = ["rust"]
-project-url = { Github = "https://github.com/emakryo/rustdef" }
diff --git a/pyproject.toml b/pyproject.toml
index e9a5648..5b4f666 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,11 +1,35 @@
 [build-system]
-requires = ["maturin"]
+requires = ["maturin>=0.12,<0.13"]
 build-backend = "maturin"
 
-[package.metadata.maturin]
-requires-dist = [
+[project]
+name = "rustdef"
+description = "Jupyter extension which executes Rust functions in Python"
+readme = "README.md"
+license = { file = "LICENSE" }
+keywords = ["Jupyter notebook", "Rust", "Jupyter extension"]
+requires-dist = ["maturin", "jupyter"]
+classifiers = [
+    "Framework :: Jupyter",
+    "Framework :: IPython",
+    "Operating System :: MacOS",
+    "Operating System :: POSIX :: Linux",
+    "Programming Language :: Python :: 3.6",
+    "Programming Language :: Python :: 3.7",
+    "Programming Language :: Python :: 3.8",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Rust",
+]
+requires-python = ">=3.6"
+project-url = { Github = "https://github.com/emakryo/rustdef" }
+dependencies = [
     "jupyter",
-    "pip>=21.1"
+    "pip",
+    "toml>=0.10",
+    "maturin>=0.12",
+]
+authors = [
+    { email = "emak.ryo@gmail.com", name = "Ryosuke Kamesawa" }
 ]
 
 # Poetry is used for development
@@ -13,7 +37,6 @@ requires-dist = [
 name = "rustdef"
 version = "0.3.0"
 description = ""
-authors = ["Ryosuke Kamesawa <emak.ryo@gmail.com>"]
 
 [tool.poetry.dependencies]
 python = "^3.6"
@@ -21,5 +44,3 @@ pip = "^21.1"
 jupyter = "^1.0.0"
 maturin = "^0.8.3"
 numpy = "^1.19.4"
-
-[tool.poetry.dev-dependencies]