Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge Downstream Features Into Original Project #1

Merged
merged 26 commits into from
Oct 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
81f49ad
rewrite
ampledata Jan 12, 2023
a7c1c9f
readme cleanup
ampledata Jan 12, 2023
208874b
code cleanup
ampledata Jan 12, 2023
8d72c0e
added tests
ampledata Jan 12, 2023
7d3d4a7
Fixed install_requires
ampledata Jan 13, 2023
0c1271f
fixed timestamp conversion
ampledata Jan 13, 2023
f77078b
updated ci build versions
ampledata Jan 13, 2023
0da800f
GOD HATES YAML
ampledata Jan 13, 2023
ea4476c
adding pinned protobuf version
ampledata Jan 13, 2023
d461955
adding pinned protobuf version
ampledata Jan 13, 2023
5fb9953
Merge pull request #1 from ampledata/protoc21
ampledata Jan 13, 2023
bac4daa
added details to readme
ampledata Jan 13, 2023
bb3e142
more RST formatting
ampledata Jan 13, 2023
46c5be6
added more fields to readme
ampledata Jan 13, 2023
80e8892
fixed rst
ampledata Jan 13, 2023
e293d6f
Ripped off the band-aid: 1.0.0.
ampledata Jan 13, 2023
dc0bf61
added note about protocol buffers to readme
ampledata Jan 13, 2023
fc9c40d
patch bump
ampledata Jan 13, 2023
2ea6e51
How does spelling work
ampledata Jan 13, 2023
ee172d4
patch bump
ampledata Jan 13, 2023
93123c3
Include generated protobuf folder in the install
shelbydavis Feb 20, 2023
1db5bcf
rewrite to add support for mesh & stream formats
ampledata Apr 9, 2023
3146e47
fixed example error and problem encoding xmldetail
ampledata Apr 9, 2023
af529e9
Merge branch 'main' into patch-1
ampledata Apr 9, 2023
eed28a1
Merge pull request #2 from shelbydavis/patch-1
ampledata Apr 9, 2023
b91f5a0
fixed git repo url
ampledata Apr 9, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# These are supported funding model platforms

github: ampledata
patreon: # Replace with a single Patreon username
open_collective: # Replace with a single Open Collective username
ko_fi: ampledata
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
liberapay: # Replace with a single Liberapay username
issuehunt: # Replace with a single IssueHunt username
otechie: # Replace with a single Otechie username
lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
custom: https://www.buymeacoffee.com/ampledata
63 changes: 63 additions & 0 deletions .github/workflows/debian.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
name: Build Debian package

on:
push:
tags:
- '*'

env:
DEB_BUILD_OPTIONS: nocheck

jobs:
build-artifact:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@master

- name: Install packaging dependencies
run: |
sudo apt-get update -qq
sudo apt-get install -y \
python3 python3-dev python3-pip python3-venv python3-all \
dh-python debhelper devscripts dput software-properties-common \
python3-distutils python3-setuptools python3-wheel python3-stdeb

- name: Build Debian/Apt sdist_dsc
run: |
rm -Rf deb_dist/*
python3 setup.py --command-packages=stdeb.command sdist_dsc

- name: Build Debian/Apt bdist_deb
run: |
export REPO_NAME=$(echo ${{ github.repository }} | awk -F"/" '{print $2}')
python3 setup.py --command-packages=stdeb.command bdist_deb
ls -al deb_dist/
cp deb_dist/python3-${REPO_NAME}_*_all.deb deb_dist/python3-${REPO_NAME}_latest_all.deb

- uses: actions/upload-artifact@master
with:
name: artifact-deb
path: |
deb_dist/*.deb

- name: Create Release
id: create_release
uses: actions/create-release@master
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag_name: ${{ github.ref }}
release_name: Release ${{ github.ref }}
draft: false
prerelease: false

- name: Upload Release Asset
id: upload-release-asset
uses: svenstaro/upload-release-action@v2
with:
repo_token: ${{ secrets.GITHUB_TOKEN }}
file: deb_dist/*.deb
tag: ${{ github.ref }}
overwrite: true
file_glob: true
39 changes: 0 additions & 39 deletions .github/workflows/python-package.yml

This file was deleted.

31 changes: 31 additions & 0 deletions .github/workflows/python-publish_to_pypi.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
# This workflow will upload a Python Package using Twine when a release is created
name: Publish package to PyPI

on:
push:
tags:
- '*'

jobs:
deploy:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: '3.x'
- name: Install dependencies
run: |
python3 -m pip install --upgrade pip
python3 -m pip install setuptools wheel twine
- name: Build
run: |
python3 setup.py sdist bdist_wheel
- name: Publish package
uses: pypa/gh-action-pypi-publish@release/v1
with:
user: __token__
password: ${{ secrets.PYPI_API_TOKEN }}
38 changes: 38 additions & 0 deletions .github/workflows/python-test_and_lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
name: Lint & Test Code

on:
push:
branches: [ main ]
pull_request:
branches: [ main ]

jobs:
build:

runs-on: ubuntu-20.04
strategy:
fail-fast: false
matrix:
python-version: [3.6, 3.7, 3.8, 3.9, "3.10"]

steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
- name: Install test requirements
run: |
make install_test_requirements
- name: Install package itself (editable)
run: |
make editable
- name: Lint with pylint
run: |
make pylint
- name: Lint with flake8
run: |
make flake8
- name: Test with pytest-cov
run: |
make test_cov
35 changes: 35 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
.vscode/
*.deb
*.egg
*.egg-info/
*.egg/
*.ignore
*.py[co]
*.py[oc]
*.spl
*.vagrant
.DS_Store
.coverage
.eggs/
.eggs/*
.idea
.idea/
.pt
.vagrant/
RELEASE-VERSION.txt
build/
cover/
dist/
dump.rdb
flake8.log
local/
local_*
metadata/
nosetests.xml
output.xml
pylint.log
redis-server.log
redis-server/
__pycache__
.ipynb_checkpoints/
config.ini
5 changes: 2 additions & 3 deletions LICENSE.md → LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# MIT License

## Copyright (c) 2020 Delta Bravo-15
Copyright 2023 Sensors & Signals LLC
Copyright 2020 Delta Bravo-15 <deltabravo15ga@gmail.com>

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
83 changes: 83 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
#
# Copyright 2023 Sensors & Signals LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
# Author:: Greg Albrecht <gba@snstac.com>
# Copyright:: Copyright 2023 Sensors & Signals LLC
# License:: Apache License, Version 2.0
#

this_app = takproto
.DEFAULT_GOAL := all

all: editable

develop:
python3 setup.py develop

editable:
python3 -m pip install -e .

install_test_requirements:
python3 -m pip install -r requirements_test.txt

install:
python3 setup.py install

uninstall:
python3 -m pip uninstall -y $(this_app)

reinstall: uninstall install

publish:
python3 setup.py publish

clean:
@rm -rf *.egg* build dist *.py[oc] */*.py[co] cover doctest_pypi.cfg \
nosetests.xml pylint.log output.xml flake8.log tests.log \
test-result.xml htmlcov fab.log .coverage __pycache__ \
*/__pycache__ .mypy_cache .pytest_cache

pep8:
flake8 --max-line-length=88 --extend-ignore=E203,E231 --exit-zero $(this_app)/*.py

flake8: pep8

lint:
pylint --msg-template="{path}:{line}: [{msg_id}({symbol}), {obj}] {msg}" \
--max-line-length=88 -r n $(this_app)/*.py || exit 0

pylint: lint

checkmetadata:
python3 setup.py check -s --restructuredtext

mypy:
mypy --strict .

pytest:
pytest

test: editable install_test_requirements pytest

test_cov:
pytest --cov=$(this_app) --cov-report term-missing

black:
black .

proto:
for p in src-protobuf/*.proto; do \
protoc -v -I=src-protobuf --python_out=takprotobuf/proto $$p; \
done
Loading
Loading