Skip to content

Commit

Permalink
version = "1.0.5"
Browse files Browse the repository at this point in the history
  • Loading branch information
CarlKCarlK committed Jul 3, 2024
1 parent 8a5e2bc commit 47085a3
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[package]
version = "1.0.5-beta.3"
version = "1.0.5"
name = "bed-reader"
description = "Read and write the PLINK BED format, simply and efficiently."
repository = "https://github.com/fastlmm/bed-reader"
Expand Down
2 changes: 0 additions & 2 deletions bed_reader/_open_bed.py
Original file line number Diff line number Diff line change
Expand Up @@ -1832,8 +1832,6 @@ def _convert_to_dtype(str_arr, dtype):
return str_arr

try:
if str_arr[0].startswith("np."):
raise ValueError("invalid cmk for int: 'np.'")
new_arr = str_arr.astype(dtype)
except ValueError as e:
if dtype == np.float32:
Expand Down
10 changes: 5 additions & 5 deletions src/python_module.rs
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ fn bed_reader(_py: Python<'_>, m: &Bound<'_, PyModule>) -> PyResult<()> {

#[pyfn(m)]
fn url_to_bytes(location: &str, options: &Bound<'_, PyDict>) -> Result<Vec<u8>, PyErr> {
let options: HashMap<String, String> = options.extract()?; // cmk
let options: HashMap<String, String> = options.extract()?;
let cloud_file = CloudFile::new_with_options(location, options)
.map_err(|e| Box::new(BedErrorPlus::CloudFileError(e)))?;
let rt = runtime::Runtime::new()?;
Expand Down Expand Up @@ -178,7 +178,7 @@ fn bed_reader(_py: Python<'_>, m: &Bound<'_, PyModule>) -> PyResult<()> {

#[pyfn(m)]
fn check_file_cloud(location: &str, options: &Bound<'_, PyDict>) -> Result<(), PyErr> {
let options: HashMap<String, String> = options.extract()?; // cmk
let options: HashMap<String, String> = options.extract()?;
runtime::Runtime::new()?.block_on(async {
BedCloud::new_with_options(location, options).await?;
Ok(())
Expand All @@ -200,7 +200,7 @@ fn bed_reader(_py: Python<'_>, m: &Bound<'_, PyModule>) -> PyResult<()> {
max_concurrent_requests: usize,
max_chunk_bytes: usize,
) -> Result<(), PyErr> {
let options: HashMap<String, String> = options.extract()?; // cmk
let options: HashMap<String, String> = options.extract()?;

let iid_index = iid_index.readonly();
let sid_index = sid_index.readonly();
Expand Down Expand Up @@ -247,7 +247,7 @@ fn bed_reader(_py: Python<'_>, m: &Bound<'_, PyModule>) -> PyResult<()> {
max_concurrent_requests: usize,
max_chunk_bytes: usize,
) -> Result<(), PyErr> {
let options: HashMap<String, String> = options.extract()?; // cmk
let options: HashMap<String, String> = options.extract()?;

let iid_index = iid_index.readonly();
let sid_index = sid_index.readonly();
Expand Down Expand Up @@ -294,7 +294,7 @@ fn bed_reader(_py: Python<'_>, m: &Bound<'_, PyModule>) -> PyResult<()> {
max_concurrent_requests: usize,
max_chunk_bytes: usize,
) -> Result<(), PyErr> {
let options: HashMap<String, String> = options.extract()?; // cmk
let options: HashMap<String, String> = options.extract()?;

let iid_index = iid_index.readonly();
let sid_index = sid_index.readonly();
Expand Down
1 change: 0 additions & 1 deletion useful.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

To get some Rust PyO3 debugging to work I had to set this before starting vscode:

<!-- cmk -->
```cmd
set PYO3_PYTHON=C:/Users/carlk/OneDrive/programs/bed-reader/.venv\Scripts\python.exe
```
Expand Down

0 comments on commit 47085a3

Please sign in to comment.