From 0023d030b27d32e85bba961b3c7a5c5d751730e5 Mon Sep 17 00:00:00 2001 From: Bryan Hunt Date: Wed, 23 Jun 2021 17:29:53 -0600 Subject: [PATCH] Update python build --- .github/workflows/build.yml | 1 + lib/atca_version.h | 4 +- python/MANIFEST.in | 2 +- python/README.md | 412 -------------------------------- python/cryptoauthlib/library.py | 11 +- python/setup.py | 9 - 6 files changed, 9 insertions(+), 430 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f2ce36574..f64798af1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -28,6 +28,7 @@ jobs: echo $TAG_NAME cd python echo $TAG_NAME >VERSION + cp ../release_notes.md . cp -r ../lib . cp -r ../third_party . mkdir app diff --git a/lib/atca_version.h b/lib/atca_version.h index f46f169a1..535a1fc96 100644 --- a/lib/atca_version.h +++ b/lib/atca_version.h @@ -30,9 +30,9 @@ #define _ATCA_VERSION_H // Version format yyyymmdd -#define ATCA_LIBRARY_VERSION_DATE "20210126" +#define ATCA_LIBRARY_VERSION_DATE "20210623" #define ATCA_LIBRARY_VERSION_MAJOR 3 #define ATCA_LIBRARY_VERSION_MINOR 3 -#define ATCA_LIBRARY_VERSION_BUILD 0 +#define ATCA_LIBRARY_VERSION_BUILD 2 #endif /* _ATCA_VERSION_H */ diff --git a/python/MANIFEST.in b/python/MANIFEST.in index 2a18b782d..c17c65085 100644 --- a/python/MANIFEST.in +++ b/python/MANIFEST.in @@ -2,4 +2,4 @@ recursive-include lib *.c *.h atca_config.h.in CMakeLists.txt 90-cryptohid.rules recursive-include third_party *.c *.h recursive-include app *.c *.h include cryptoauthlib/cryptoauth.json -include MANIFEST.in setup.py setup.cfg README.md VERSION LICENSE.txt +include MANIFEST.in setup.py setup.cfg README.md release_notes.md VERSION LICENSE.txt diff --git a/python/README.md b/python/README.md index e8673e7de..b41206423 100644 --- a/python/README.md +++ b/python/README.md @@ -181,415 +181,3 @@ the interfaces are correct and ctypes structures match the platform. Release notes ----------- See [Release Notes](release_notes.md) - - -Release notes ------------ -See [Release Notes](release_notes.md) - - -Release notes ------------ -See [Release Notes](release_notes.md) - - -Release notes ------------ -See [Release Notes](release_notes.md) - - -Release notes ------------ -See [Release Notes](release_notes.md) - - -Release notes ------------ -See [Release Notes](release_notes.md) - - -Release notes ------------ -See [Release Notes](release_notes.md) - - -Release notes ------------ -See [Release Notes](release_notes.md) - - -Release notes ------------ -See [Release Notes](release_notes.md) - - -Release notes ------------ -See [Release Notes](release_notes.md) - - -Release notes ------------ -See [Release Notes](release_notes.md) - - -Release notes ------------ -See [Release Notes](release_notes.md) - - -Release notes ------------ -See [Release Notes](release_notes.md) - - -Release notes ------------ -See [Release Notes](release_notes.md) - - -Release notes ------------ -See [Release Notes](release_notes.md) - - -Release notes ------------ -See [Release Notes](release_notes.md) - - -Release notes ------------ -See [Release Notes](release_notes.md) - - -Release notes ------------ -See [Release Notes](release_notes.md) - - -Release notes ------------ -See [Release Notes](release_notes.md) - - -Release notes ------------ -See [Release Notes](release_notes.md) - - -Release notes ------------ -See [Release Notes](release_notes.md) - - -Release notes ------------ -See [Release Notes](release_notes.md) - - -Release notes ------------ -See [Release Notes](release_notes.md) - - -Release notes ------------ -See [Release Notes](release_notes.md) - - -Release notes ------------ -See [Release Notes](release_notes.md) - - -Release notes ------------ -See [Release Notes](release_notes.md) - - -Release notes ------------ -See [Release Notes](release_notes.md) - - -Release notes ------------ -See [Release Notes](release_notes.md) - - -Release notes ------------ -See [Release Notes](release_notes.md) - - -Release notes ------------ -See [Release Notes](release_notes.md) - - -Release notes ------------ -See [Release Notes](release_notes.md) - - -Release notes ------------ -See [Release Notes](release_notes.md) - - -Release notes ------------ -See [Release Notes](release_notes.md) - - -Release notes ------------ -See [Release Notes](release_notes.md) - - -Release notes ------------ -See [Release Notes](release_notes.md) - - -Release notes ------------ -See [Release Notes](release_notes.md) - - -Release notes ------------ -See [Release Notes](release_notes.md) - - -Release notes ------------ -See [Release Notes](release_notes.md) - - -Release notes ------------ -See [Release Notes](release_notes.md) - - -Release notes ------------ -See [Release Notes](release_notes.md) - - -Release notes ------------ -See [Release Notes](release_notes.md) - - -Release notes ------------ -See [Release Notes](release_notes.md) - - -Release notes ------------ -See [Release Notes](release_notes.md) - - -Release notes ------------ -See [Release Notes](release_notes.md) - - -Release notes ------------ -See [Release Notes](release_notes.md) - - -Release notes ------------ -See [Release Notes](release_notes.md) - - -Release notes ------------ -See [Release Notes](release_notes.md) - - -Release notes ------------ -See [Release Notes](release_notes.md) - - -Release notes ------------ -See [Release Notes](release_notes.md) - - -Release notes ------------ -See [Release Notes](release_notes.md) - - -Release notes ------------ -See [Release Notes](release_notes.md) - - -Release notes ------------ -See [Release Notes](release_notes.md) - - -Release notes ------------ -See [Release Notes](release_notes.md) - - -Release notes ------------ -See [Release Notes](release_notes.md) - - -Release notes ------------ -See [Release Notes](release_notes.md) - - -Release notes ------------ -See [Release Notes](release_notes.md) - - -Release notes ------------ -See [Release Notes](release_notes.md) - - -Release notes ------------ -See [Release Notes](release_notes.md) - - -Release notes ------------ -See [Release Notes](release_notes.md) - - -Release notes ------------ -See [Release Notes](release_notes.md) - - -Release notes ------------ -See [Release Notes](release_notes.md) - - -Release notes ------------ -See [Release Notes](release_notes.md) - - -Release notes ------------ -See [Release Notes](release_notes.md) - - -Release notes ------------ -See [Release Notes](release_notes.md) - - -Release notes ------------ -See [Release Notes](release_notes.md) - - -Release notes ------------ -See [Release Notes](release_notes.md) - - -Release notes ------------ -See [Release Notes](release_notes.md) - - -Release notes ------------ -See [Release Notes](release_notes.md) - - -Release notes ------------ -See [Release Notes](release_notes.md) - - -Release notes ------------ -See [Release Notes](release_notes.md) - - -Release notes ------------ -See [Release Notes](release_notes.md) - - -Release notes ------------ -See [Release Notes](release_notes.md) - - -Release notes ------------ -See [Release Notes](release_notes.md) - - -Release notes ------------ -See [Release Notes](release_notes.md) - - -Release notes ------------ -See [Release Notes](release_notes.md) - - -Release notes ------------ -See [Release Notes](release_notes.md) - - -Release notes ------------ -See [Release Notes](release_notes.md) - - -Release notes ------------ -See [Release Notes](release_notes.md) - - -Release notes ------------ -See [Release Notes](release_notes.md) - - -Release notes ------------ -See [Release Notes](release_notes.md) - - -Release notes ------------ -See [Release Notes](release_notes.md) - - -Release notes ------------ -See [Release Notes](release_notes.md) - - -Release notes ------------ -See [Release Notes](release_notes.md) - - diff --git a/python/cryptoauthlib/library.py b/python/cryptoauthlib/library.py index 1f02226de..f55f29d51 100644 --- a/python/cryptoauthlib/library.py +++ b/python/cryptoauthlib/library.py @@ -22,7 +22,6 @@ # THIS SOFTWARE. import os.path -import json import sys from ctypes import * from ctypes.util import find_library @@ -95,12 +94,12 @@ def load_cryptoauthlib(lib=None): _CRYPTO_LIB = lib else: try: - _CRYPTO_LIB = cdll.LoadLibrary(find_library('cryptoauth')) + library_file = find_library('cryptoauth') + if library_file is None: + library_file = _force_local_library() + _CRYPTO_LIB = cdll.LoadLibrary(library_file) except: - try: - _CRYPTO_LIB = cdll.LoadLibrary(_force_local_library()) - except: - raise LibraryLoadError('Unable to find cryptoauthlib. You may need to reinstall') + raise LibraryLoadError('Unable to find cryptoauthlib. You may need to reinstall') diff --git a/python/setup.py b/python/setup.py index d6857f6f1..272be081e 100644 --- a/python/setup.py +++ b/python/setup.py @@ -106,15 +106,6 @@ def load_readme(): with open('README.md', 'r') as f: read_me = f.read() - if not _sdist_build: - with open('../README.md', 'r') as f: - notes = f.read() - - read_me += notes[notes.find('Release notes'):notes.find('Host Device Support')] - - with open('README.md', 'w') as f: - f.write(read_me) - return read_me