Skip to content

Commit

Permalink
7 FILE(s) | CHANGELOG.md README.md open2fa/version.py pyproject.toml ...
Browse files Browse the repository at this point in the history
  • Loading branch information
cc-d committed Jun 6, 2024
1 parent eaf6d2f commit ef03e24
Show file tree
Hide file tree
Showing 7 changed files with 40 additions and 50 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Change Log

## 1.4.4

updated dependency ranges

updated set version script and documentation

## 1.4.3

fixed tests for earlier versions of python
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ The tests are not complete, and need to be expanded.

Feel free to open an issue or pull request. If you are opening a pull request, please make sure to run the tests and ensure that the coverage does not decrease, and any new code is covered by tests.

Remember to update the [changelog](https://github.com/cc-d/open2fa/blob/main/CHANGELOG.md) with any changes and to update the version in `open2fa/version.py` and `pyproject.toml` (can use the `set_version.py` script).
Remember to update the [changelog](https://github.com/cc-d/open2fa/blob/main/CHANGELOG.md) with any changes and to update the version in `open2fa/version.py` and `pyproject.toml` (can use the `set_version.sh` script).

## License

Expand Down
2 changes: 1 addition & 1 deletion open2fa/version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "1.4.3"
__version__ = '1.4.4'
8 changes: 4 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ target-version = ['py37']

[project]
name = "open2fa"
version = "1.4.3"
version = '1.4.4'
authors = [
{ name="Cary Carter", email="[email protected]" },
]
Expand All @@ -38,9 +38,9 @@ classifiers = [
]
dependencies = [
"requests",
"logfunc<3.0.0",
"cryptography<=41.0.7",
"pyshared<1.6.0",
"logfunc<3",
"cryptography<42,
"pyshared<2"
"base58==2.1.1",
]

Expand Down
6 changes: 3 additions & 3 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
base58==2.1.1
cryptography<=41.0.7
logfunc>=2.6.0,<3
pyshared<2,>=1.5.8
cryptography<42
logfunc<3
pyshared<2
41 changes: 0 additions & 41 deletions set_version.py

This file was deleted.

25 changes: 25 additions & 0 deletions set_version.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
#!/bin/sh
set -e

SET_VER_DIR=$(cd "$(dirname $0)" && pwd)

echo "Using DIR: $SET_VER_DIR"

SET_VER_PY=$(find "$SET_VER_DIR" -name "version.py" -maxdepth 5 | head -n 1)
SET_VER_PROJ=$(find "$SET_VER_DIR" -name "pyproject.toml" -maxdepth 5 | head -n 1)

SET_VER_CURVER=$(cat "$SET_VER_PY" | grep -oE "= [\"'].*[\"']" | tr -d "'\"= ")

echo "version.py: $SET_VER_PY"
echo "pyproject.toml: $SET_VER_PROJ"
echo "Current version: $SET_VER_CURVER"

read -p "Enter New Version: " SET_VER_NEWVER

echo "Setting new version to: $SET_VER_NEWVER"

echo "Setting version in $SET_VER_PY"
echo "__version__ = '$SET_VER_NEWVER'" > "$SET_VER_PY"

echo "Setting version in $SET_VER_PROJ"
sed -E -i '' "s/^version = .*$/version = '$SET_VER_NEWVER'/" "$SET_VER_PROJ"

0 comments on commit ef03e24

Please sign in to comment.