Skip to content

Commit

Permalink
Update version number, dependencies, and projector metadata
Browse files Browse the repository at this point in the history
This update increments the library version to 1.7.1, adjusts the version of certain dependencies, and modifies the project metadata including the list of authors, contact information, and relevant links. It further includes changes in the internal code for optimisations and refactors the worker threads' setup to respect system memory availability with a new boolean `allow_swap`.
  • Loading branch information
gabrielspadon committed Feb 28, 2024
1 parent e72f8ae commit 65955d1
Show file tree
Hide file tree
Showing 17 changed files with 140 additions and 139 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
# This file is autogenerated by maturin v1.3.1
# To update, run
#
# maturin generate-ci github
#
name: CI

on:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,18 @@ on:
push:
branches:
- main
- master
- master-jk-working
tags:
- '*'
pull_request:
branches:
- main
workflow_dispatch:

jobs:
build-and-test:
runs-on: Ubuntu
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v3
Expand Down Expand Up @@ -41,4 +46,4 @@ jobs:
- name: Verify Installation
run: |
source ./AISdb/bin/activate
python -c "import aisdb; assert aisdb.__version__ >= '1.7.0', f'Unexpected aisdb version: {aisdb.__version__}'"
python -c "import aisdb; assert aisdb.__version__ >= '1.7.1', f'Unexpected aisdb version: {aisdb.__version__}'"
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -71,3 +71,5 @@ target
/testdata/
testinput
!aisdb/tests/testdata/
build.sh
install-rust.sh
3 changes: 1 addition & 2 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,7 @@ representative at an online or offline event.
## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported to the community leaders responsible for enforcement at
[email protected].
reported to the community leaders responsible for enforcement at [email protected].
All complaints will be reviewed and investigated promptly and fairly.

All community leaders are obligated to respect the privacy and security of the
Expand Down
59 changes: 19 additions & 40 deletions 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,7 +1,7 @@
[package]
version = "1.7.0"
name = "aisdb"
edition = "2021"
version = "1.7.1"
include = [ "aisdb/*.py", "aisdb/aisdb_sql", "aisdb/database/*.py", "aisdb/webdata/*.py", "/src", "pyproject.toml", "aisdb_web/dist_map/index.html", "aisdb_web/dist_map/favicon.svg", "aisdb_web/dist_map/favicon.png", "aisdb_web/dist_map/assets/*", "aisdb_web/dist_map_bingmaps/index.html", "aisdb_web/dist_map_bingmaps/favicon.svg", "aisdb_web/dist_map_bingmaps/favicon.png", "aisdb_web/dist_map_bingmaps/assets/*",]

[lib]
Expand Down
2 changes: 1 addition & 1 deletion SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ The AISdb team takes security vulnerabilities seriously. If you discover a secur

### How to Report a Security Vulnerability:

- **Email:** Send an email to Gabriel Spadon at [email protected]. Please include a detailed description of the issue, including the steps to reproduce the vulnerability. If possible, include patches, scripts, or other resources that could help evaluate the vulnerability.
- **Email:** Send an email to [email protected]. Please include a detailed description of the issue, including the steps to reproduce the vulnerability. If possible, include patches, scripts, or other resources that could help evaluate the vulnerability.
- **GitHub Issue:** For vulnerabilities that do not immediately impact the security of the project or its users (such as potential optimizations or best practices), consider opening a GitHub issue on our repository.

### Response Expectations:
Expand Down
4 changes: 1 addition & 3 deletions aisdb/proc_util.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,7 @@ def _segment_rng(track, maxdelta, key='time') -> filter:
yield rng


def write_csv_rows(rows,
pathname='/data/smith6/ais/scripts/output.csv',
mode='a'):
def write_csv_rows(rows, pathname='output.csv', mode='a'):
with open(pathname, mode) as f:
f.write('\n'.join(
map(
Expand Down
2 changes: 1 addition & 1 deletion aisdb_lib/Cargo.lock

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

13 changes: 7 additions & 6 deletions aisdb_lib/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
[package]
version = "1.7.0"
version = "1.7.1"
name = "aisdb-lib"
authors = [ "MERIDIAN // Matt Smith matthew.smith@dal.ca",]
authors = [ "[AISViz] Making vessels tracking data available to everyone // aisviz@dal.ca",]
edition = "2021"
include = [ "../aisdb/aisdb_sql", "/src/*",]
build = "build.rs"
readme = "../readme.rst"
description = "AIS Database and Processing Utils"
homepage = "https://aisdb.meridian.cs.dal.ca/"
documentation = "https://aisdb.meridian.cs.dal.ca/doc/readme.html"
repository = "https://git-dev.cs.dal.ca/meridian/aisdb"
license-file = "../license.txt"
homepage = "https://aisviz.github.io/"
repository = "https://github.com/AISViz/AISdb"
tutorials = "https://aisviz.gitbook.io/tutorials/"
documentation = "https://aisviz.gitbook.io/documentation/"
license-file = "../LICENSE"

[features]
default = [ "sqlite", "postgres",]
Expand Down
26 changes: 13 additions & 13 deletions aisdb_lib/src/csvreader.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
pub use std::{
fs::{create_dir_all, read_dir, File},
io::{BufRead, BufReader, Error, Write},
path::Path,
time::{Duration, Instant},
path::{Path},
};

use chrono::{NaiveDateTime, TimeZone, Utc};
Expand Down Expand Up @@ -170,12 +170,12 @@ pub fn sqlite_decodemsgs_ee_csv(
let f3 = filename.to_str().unwrap();
let f4 = Path::new(f3);
let fname = f4.file_name().unwrap().to_str().unwrap();
// let fname = filename
// .to_str()
// .unwrap()
// .rsplit_once(std::path::MAIN_SEPARATOR)
// .unwrap()
// .1;
// let fname = filename
// .to_str()
// .unwrap()
// .rsplit_once(std::path::MAIN_SEPARATOR)
// .unwrap()
// .1;
let fname1 = format!("{:<1$}", fname, 64);
let elapsed1 = format!(
"elapsed: {:>1$}s",
Expand Down Expand Up @@ -309,12 +309,12 @@ pub fn postgres_decodemsgs_ee_csv(
let f3 = filename.to_str().unwrap();
let f4 = Path::new(f3);
let fname = f4.file_name().unwrap().to_str().unwrap();
// let fname = filename
// .to_str()
// .unwrap()
// .rsplit_once(std::path::MAIN_SEPARATOR)
// .unwrap()
// .1;
// let fname = filename
// .to_str()
// .unwrap()
// .rsplit_once(std::path::MAIN_SEPARATOR)
// .unwrap()
// .1;
let fname1 = format!("{:<1$}", fname, 64);
let elapsed1 = format!(
"elapsed: {:>1$}s",
Expand Down
Loading

0 comments on commit 65955d1

Please sign in to comment.