diff --git a/.github/dependabot.yml b/.github/dependabot.yml index a396af88..d3e0f784 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -8,5 +8,5 @@ updates: - package-ecosystem: "pip" directory: "/" # Location of package manifests schedule: - interval: "daily" + interval: "weekly" open-pull-requests-limit: 2 diff --git a/.github/workflows/build_publish.yml b/.github/workflows/build_publish.yml index 24243f1b..c13bd067 100644 --- a/.github/workflows/build_publish.yml +++ b/.github/workflows/build_publish.yml @@ -4,7 +4,7 @@ on: release: types: [ published ] pull_request: - branches: [ master ] + branches: [ master, main ] jobs: build_dist: diff --git a/.github/workflows/typechecking.yml b/.github/workflows/typechecking.yml index ceb7dadc..907d80f5 100644 --- a/.github/workflows/typechecking.yml +++ b/.github/workflows/typechecking.yml @@ -2,9 +2,9 @@ name: Typechecking on: push: - branches: [ master ] + branches: [ master, main ] pull_request: - branches: [ master ] + branches: [ master, main ] jobs: diff --git a/.github/workflows/unittests.yml b/.github/workflows/unittests.yml index 80258e32..d236cd88 100644 --- a/.github/workflows/unittests.yml +++ b/.github/workflows/unittests.yml @@ -5,9 +5,9 @@ name: Unit Testing on: push: - branches: [ master ] + branches: [ master, main ] pull_request: - branches: [ master ] + branches: [ master, main ] jobs: unittests: diff --git a/CHANGELOG.md b/CHANGELOG.md index 2d80d479..21eac8e8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ ## new version +## 0.17.0 + +- Remove use of bitarray fork as upstream project now publishes wheels. #557, #567, #573 +- Update dependencies + + ## 0.16.1 - `generate_clk_from_csv` and `generate_clks` now accept an optional `max_workers` argument. diff --git a/requirements.txt b/requirements.txt index ab6074db..edee5491 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,10 +1,10 @@ -bitarray==2.4.1 -cryptography==36.0.2 -jsonschema==4.4.0; python_version >= '3.7' +bitarray==2.6.0 +cryptography==38.0.1 +jsonschema==4.16.0; python_version >= '3.7' jsonschema==3.2.0; python_version < '3.7' hypothesis==6.43.3 mypy_extensions==0.4.3 pyblake2==1.1.2; python_version < '3.6' pytest==7.1.2 pytest-cov==3.0.0 -tqdm==4.64.0 +tqdm==4.64.1 diff --git a/setup.py b/setup.py index 7fe056e8..dbbd600c 100644 --- a/setup.py +++ b/setup.py @@ -2,9 +2,9 @@ requirements = [ "bashplotlib>=0.6.5", - "bitarray>=1.0.0", # Fork of bitarray distributing binary wheels #153 - "cryptography>=2.3", - "jsonschema>=3.0.2", + "bitarray>=2.4", + "cryptography>=36.0", + "jsonschema>=4.8", "mypy_extensions>=0.3", "pyblake2>=1.1.1; python_version < '3.6'", "tqdm>=4.24", @@ -18,7 +18,7 @@ setup( name="clkhash", - version='0.16.1', + version='0.17.0', description='Encoding utility to create Cryptographic Linkage Keys', long_description=readme, long_description_content_type='text/markdown', @@ -37,10 +37,11 @@ classifiers=[ "Development Status :: 5 - Production/Stable", "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", + "Programming Language :: Python :: 3.11", "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", "License :: OSI Approved :: Apache Software License", diff --git a/tox.ini b/tox.ini index cb34b538..0311e947 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py27, py35, py36, py37 +envlist = py38, py39, py310 [testenv] deps =