diff --git a/CHANGES.txt b/CHANGELOG.md similarity index 78% rename from CHANGES.txt rename to CHANGELOG.md index 3dbc41e8..68583dee 100644 --- a/CHANGES.txt +++ b/CHANGELOG.md @@ -1,79 +1,56 @@ -Changes -------- +# Changelog -0.2.5 (2018-02-21) -^^^^^^^^^^^^^^^^^^ +## 0.2.7 (2018-05-18) + +* Fix nightly breakage with proc_macro_path + +## 0.2.6 (2018-04-03) + +* Fix compatibility with TryFrom trait #137 + +## 0.2.5 (2018-02-21) * CPython 3.7 support - * Embedded CPython 3.7b1 crashes on initialization #110 - * Generated extension functions are weakly typed #108 - * call_method*() crashes when the method does not exist #113 - * Allow importing exceptions from nested modules #116 - -0.2.4 (2018-01-19) -^^^^^^^^^^^^^^^^^^ +## 0.2.4 (2018-01-19) * Allow to get mutable ref from PyObject #106 - * Drop `RefFromPyObject` trait - * Add Python::register_any() method - * Fix impl `FromPyObject` for `Py` - * Mark method that work with raw pointers as unsafe #95 -0.2.3 (11-27-2017) -^^^^^^^^^^^^^^^^^^ +## 0.2.3 (11-27-2017) * Proper `c_char` usage #93 - * Remove use of now unneeded 'AsciiExt' trait - * Rustup to 1.23.0-nightly 2017-11-07 - -0.2.2 (09-26-2017) -^^^^^^^^^^^^^^^^^^ +## 0.2.2 (09-26-2017) * Rustup to 1.22.0-nightly 2017-09-30 - -0.2.1 (09-26-2017) -^^^^^^^^^^^^^^^^^^ +## 0.2.1 (09-26-2017) * Fix rustc const_fn nightly breakage - -0.2.0 (08-12-2017) -^^^^^^^^^^^^^^^^^^ +## 0.2.0 (08-12-2017) * Added inheritance support #15 - * Added weakref support #56 - * Allow to add gc support without implementing PyGCProtocol #57 - * Refactor `PyErr` implementation. Drop `py` parameter from constructor. - * Added subclass support #64 - * Added `self.__dict__` supoort #68 - * Added `pyo3::prelude` module #70 - * Better `Iterator` support for PyTuple, PyList, PyDict #75 - * Introduce IntoPyDictPointer similar to IntoPyTuple #69 - -0.1.0 (07-23-2017) -^^^^^^^^^^^^^^^^^^ +## 0.1.0 (07-23-2017) * Initial release diff --git a/Cargo.toml b/Cargo.toml index 56c0d421..528911ac 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,10 +4,10 @@ version = "0.2.5" description = "Bindings to Python interpreter" authors = ["PyO3 Project and Contributors "] readme = "README.md" -keywords = ["pyo3", "python", "cpython"] +keywords = ["pyo3", "python", "cpython", "ffi"] homepage = "https://github.com/pyo3/pyo3" repository = "https://github.com/pyo3/pyo3.git" -documentation = "https://pyo3.github.io/pyo3/pyo3/" +documentation = "https://pyo3.github.io/pyo3/guide/" categories = ["api-bindings", "development-tools::ffi"] license = "Apache-2.0" exclude = [".gitignore", ".travis.yml", ".cargo/config", "appveyor.yml"] diff --git a/Makefile b/Makefile index 0dc67f8e..aa18ab0b 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -.PHONY: default build test doc extensions clean cog +.PHONY: default test ifndef PY PY := $(word 2, $(subst ., ,$(shell python --version 2>&1))) @@ -19,42 +19,8 @@ CARGO_FLAGS := --features "$(FEATURES)" --no-default-features default: test -build: - cargo build $(CARGO_FLAGS) - -test: build +test: cargo test $(CARGO_FLAGS) pip install setuptools-rust pytest pytest-benchmark cd examples/word-count && python setup.py install && pytest -v tests cd examples/word-count-cls && python setup.py install && pytest -v tests - -clippy: - if $$CLIPPY; then cargo clippy $(CARGO_FLAGS); fi - - -#ifeq ($(NIGHTLY),1) -# ast-json output is only supported on nightly -# python$(PY) tests/check_symbols.py -#endif - -doc: build - cargo doc --no-deps $(CARGO_FLAGS) - -clean: - rm -r target - -gh-pages: - git clone --branch gh-pages git@github.com:PyO3/PyO3.git gh-pages - -.PHONY: gh-pages-doc -gh-pages-doc: doc | gh-pages - cd gh-pages && git pull - rm -r gh-pages/doc - cp -r target/doc gh-pages/ - rm gh-pages/doc/.lock - cd gh-pages && git add . - cd gh-pages && git commit -m "Update documentation" - -publish: default gh-pages-doc - cargo publish - cd gh-pages && git push diff --git a/README.md b/README.md index c318485c..7c090f2d 100644 --- a/README.md +++ b/README.md @@ -25,6 +25,8 @@ pyo3 = "0.2" Example program displaying the value of `sys.version`: ```rust +#![feature(proc_macro, specialization)] + extern crate pyo3; use pyo3::prelude::*; @@ -71,12 +73,12 @@ features = ["extension-module"] extern crate pyo3; use pyo3::prelude::*; -use pyo3::py::modinit as pymodinit; +use pyo3::py::modinit; // Add bindings to the generated python module // N.B: names: "librust2py" must be the name of the `.so` or `.pyd` file /// This module is implemented in Rust. -#[pymodinit(rust2py)] +#[modinit(rust2py)] fn init_mod(py: Python, m: &PyModule) -> PyResult<()> { #[pyfn(m, "sum_as_string")] diff --git a/pyo3-derive-backend/Cargo.toml b/pyo3-derive-backend/Cargo.toml index f5c70aa5..ea2a1263 100644 --- a/pyo3-derive-backend/Cargo.toml +++ b/pyo3-derive-backend/Cargo.toml @@ -3,9 +3,10 @@ name = "pyo3-derive-backend" version = "0.2.5" description = "Code generation for PyO3 package" authors = ["PyO3 Project and Contributors "] +keywords = ["pyo3", "python", "cpython", "ffi"] homepage = "https://github.com/pyo3/pyo3" repository = "https://github.com/pyo3/pyo3.git" -documentation = "http://pyo3.github.io/PyO3/pyo3/" +documentation = "https://pyo3.github.io/pyo3/guide/" categories = ["api-bindings", "development-tools::ffi"] license = "Apache-2.0" diff --git a/pyo3cls/Cargo.toml b/pyo3cls/Cargo.toml index 962e2df7..ce54399b 100644 --- a/pyo3cls/Cargo.toml +++ b/pyo3cls/Cargo.toml @@ -3,9 +3,10 @@ name = "pyo3cls" version = "0.2.5" description = "Proc macros for PyO3 package" authors = ["PyO3 Project and Contributors "] +keywords = ["pyo3", "python", "cpython", "ffi"] homepage = "https://github.com/pyo3/pyo3" repository = "https://github.com/pyo3/pyo3.git" -documentation = "http://pyo3.github.io/PyO3/pyo3/" +documentation = "https://pyo3.github.io/pyo3/guide/" categories = ["api-bindings", "development-tools::ffi"] license = "Apache-2.0"