Revert to published version of pyo3-stub-gen (and derive) to allow pu…

…blish to crates.io
MWATelescope · Nov 12, 2024 · 367e4f6 · 367e4f6
1 parent d1ceae4
commit 367e4f6
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 Changes in each release are listed below.
 
+## 1.8.2 12-Nov-2024
+
+* Revert to published version of pyo3-stub-gen (and derive) to allow publish to crates.io.
+
 ## 1.8.1 12-Nov-2024
 
 * Ensure only one version of pyo3-stub-gen-derive is used in the project.

diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "mwalib"
-version = "1.8.1"
+version = "1.8.2"
 homepage = "https://github.com/MWATelescope/mwalib"
 repository = "https://github.com/MWATelescope/mwalib"
 readme = "README.md"
@@ -54,10 +54,11 @@ env_logger = { version = "~0.10", optional = true }
 ndarray = { version = "~0.16", optional = true }
 numpy = { version = "~0.22", optional = true }
 pyo3 = { version = "~0.22", features = ["chrono", "extension-module", "macros"], optional = true }
-# pyo3-stub-gen = { version = "~0.6", optional = true }
+pyo3-stub-gen = { version = "~0.6", optional = true }
+pyo3-stub-gen-derive = { version = "~0.6", optional = true }
 # The below pyo3-stub-gen branch has not been merged with main as of 8-Nov-2024. once it has been it should be fine to go back to using the main branch again.
-pyo3-stub-gen = { branch = "chrono_feature", optional = true, git = "https://github.com/ThatOneShortGuy/pyo3-stub-gen" }
-pyo3-stub-gen-derive = { branch = "chrono_feature", optional = true, git = "https://github.com/ThatOneShortGuy/pyo3-stub-gen" }
+#pyo3-stub-gen = { branch = "chrono_feature", optional = true, git = "https://github.com/ThatOneShortGuy/pyo3-stub-gen" }
+#pyo3-stub-gen-derive = { branch = "chrono_feature", optional = true, git = "https://github.com/ThatOneShortGuy/pyo3-stub-gen" }
 
 # "examples" feature.
 clap = { version = "~4.1", features = ["derive"], optional = true }

diff --git a/src/metafits_context/mod.rs b/src/metafits_context/mod.rs
@@ -347,10 +347,11 @@ impl std::str::FromStr for MWAMode {
 ///
 /// Metafits context. This represents the basic metadata for an MWA observation.
 ///
-#[cfg_attr(feature = "python", gen_stub_pyclass, pyclass(get_all, set_all))]
+#[cfg_attr(feature = "python", gen_stub_pyclass)]
+#[cfg_attr(feature = "python", pyo3::pyclass(get_all, set_all))]
 #[derive(Clone, Debug)]
 pub struct MetafitsContext {
-    /// mwa version
+    /// mwa version    
     pub mwa_version: Option<MWAVersion>,
     /// Observation id
     pub obs_id: u32,