From 98261d28bdc2f177405cf76a842f52823ddc63dc Mon Sep 17 00:00:00 2001 From: Tyler Jachetta Date: Thu, 28 Jan 2021 16:14:31 -0500 Subject: [PATCH 01/33] Added tests to express #81 --- tests/integration/gitnative.bats | 36 ++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/tests/integration/gitnative.bats b/tests/integration/gitnative.bats index 1cf7f21..c1b900f 100644 --- a/tests/integration/gitnative.bats +++ b/tests/integration/gitnative.bats @@ -61,3 +61,39 @@ teardown() { avakas_wrapper show "$REPO" [ "$output" == "0.0.2" ] } + +@test "autobump git-native versions with prereleases" { + cd $REPO + + commit_message "$REPO" "FLunkf\nbump:patch" + avakas_wrapper bump "$REPO" auto --flavor "git-native" --prerelease --prerelease-prefix 'alpha' + [[ "$output" =~ ^Version\ updated\ from\ 0\.0\.1\ to\ 0\.0\.2 ]] + avakas_wrapper show "$REPO" + [ "$output" == "0.0.2-alpha.1" ] + + commit_message "$REPO" "squirrels" + avakas_wrapper bump "$REPO" auto --flavor "git-native" --prerelease --prerelease-prefix 'alpha' + [ "$output" == "Version updated from 0.0.2-alpha.1 to 0.0.2-alpha.2" ] + avakas_wrapper show "$REPO" + [ "$output" == "0.0.2-alpha.2" ] + + avakas_wrapper bump "$REPO" auto --flavor "git-native" + [ "$output" == "Version updated from 0.0.2-alpha.2 to 0.0.2" ] + + # Should do nothing because no bumps in messages since last non-prerelease bump + avakas_wrapper bump "$REPO" auto --flavor "git-native" --prerelease --prerelease-prefix 'beta' + [ "$output" == "" ] + avakas_wrapper show "$REPO" + [ "$output" == "0.0.2" ] + + commit_message "$REPO" "hwhelp\nbump:minor" + + avakas_wrapper bump "$REPO" auto --flavor "git-native" --prerelease --prerelease-prefix 'beta' + avakas_wrapper show "$REPO" + [ "$output" == "0.1.0-beta.1" ] + + # No commits since last pre-release bump + avakas_wrapper bump "$REPO" auto --flavor "git-native" --prerelease --prerelease-prefix 'beta' + avakas_wrapper show "$REPO" + [ "$output" == "0.1.0-beta.1" ] +} \ No newline at end of file From b4aacf53caa0456242d4b94a0a765532596434aa Mon Sep 17 00:00:00 2001 From: Tyler Jachetta Date: Thu, 28 Jan 2021 16:16:22 -0500 Subject: [PATCH 02/33] Added some helper commit_message() and tag_repo() functionality to support new tests --- tests/integration/helper.bash | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tests/integration/helper.bash b/tests/integration/helper.bash index e165b65..4b66e0d 100644 --- a/tests/integration/helper.bash +++ b/tests/integration/helper.bash @@ -94,8 +94,13 @@ random_rev() { tag_repo() { local REPO="$1" local TAG="$2" + local LATEST="$3" cd "$REPO" - local REV=$(random_rev "$REPO") + if [[ -z "$LATEST" ]]; then + local REV=$(random_rev "$REPO") + else + local REV=$(current_rev "$REPO") + fi git tag "$TAG" "$REV" } @@ -188,6 +193,7 @@ scan_lines() { commit_message() { local REPO="$1" local MSG="$2" + cd $REPO echo "some kinda ${RANDOM}" > "foo" git add "foo" git commit -qm "$MSG" "foo" From cf564cf8c5b7a8087a38f219281cd1aafdb38304 Mon Sep 17 00:00:00 2001 From: Tyler Jachetta Date: Tue, 2 Feb 2021 13:27:25 -0500 Subject: [PATCH 03/33] Added tests so that tags which are not versions get ignored --- tests/integration/gitnative.bats | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/tests/integration/gitnative.bats b/tests/integration/gitnative.bats index c1b900f..6d06f7d 100644 --- a/tests/integration/gitnative.bats +++ b/tests/integration/gitnative.bats @@ -21,6 +21,20 @@ teardown() { [ -e "$REPO/version" ] } +@test "ignore non-version tags on autobump" { + avakas_wrapper set "$REPO" "1.0.0" --flavor "git-native" + + commit_message "$REPO" "whorp\nbump:minor" + echo "committed" + tag_repo "$REPO" "Florf" "latest" + echo "tagged" + avakas_wrapper bump "$REPO" auto --flavor "git-native" + [ "$output" == "Version updated from 1.0.0 to 1.1.0" ] + avakas_wrapper show "$REPO" + [ "$output" == "1.1.0" ] + +} + @test "set an git-native version" { avakas_wrapper set "$REPO" "0.0.2" --flavor "git-native" scan_lines "Version set to 0.0.2" "${lines[@]}" From 5cf8c50ea446377e24f94451018f335baf72dd32 Mon Sep 17 00:00:00 2001 From: Tyler Jachetta Date: Tue, 2 Feb 2021 13:27:58 -0500 Subject: [PATCH 04/33] Tests for git flavor with version prefixes --- tests/integration/gitnative.bats | 45 ++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/tests/integration/gitnative.bats b/tests/integration/gitnative.bats index 6d06f7d..b460770 100644 --- a/tests/integration/gitnative.bats +++ b/tests/integration/gitnative.bats @@ -59,6 +59,15 @@ teardown() { [ "$output" == "0.0.2" ] } +@test "autobump git-native version once with tag prefix" { + cd $REPO + commit_message "$REPO" "you're probably not gonna read this anyway\nbump:patch" + avakas_wrapper bump "$REPO" auto --tag-prefix "v" --flavor "git-native" + git show-ref --tags + avakas_wrapper show "$REPO" + [ "$output" == "0.0.2" ] +} + @test "autobump git-native versions multiple times" { cd $REPO commit_message "$REPO" "whorp\nbump:patch" @@ -110,4 +119,40 @@ teardown() { avakas_wrapper bump "$REPO" auto --flavor "git-native" --prerelease --prerelease-prefix 'beta' avakas_wrapper show "$REPO" [ "$output" == "0.1.0-beta.1" ] +} + +@test "autobump git-native versions with prereleases and tag prefixes" { + cd $REPO + + commit_message "$REPO" "FLunkf\nbump:patch" + avakas_wrapper bump "$REPO" auto --tag-prefix "v" --flavor "git-native" --prerelease --prerelease-prefix 'alpha' + [ "$output" == "Version updated from v0.0.1 to v0.0.2" ] + avakas_wrapper show "$REPO" + [ "$output" == "v0.0.2-alpha.1" ] + + commit_message "$REPO" "squirrels" + avakas_wrapper bump "$REPO" auto --tag-prefix "v" --flavor "git-native" --prerelease --prerelease-prefix 'alpha' + [ "$output" == "Version updated from v0.0.2-alpha.1 to v0.0.2-alpha.2" ] + avakas_wrapper show "$REPO" + [ "$output" == "v0.0.2-alpha.2" ] + + avakas_wrapper bump "$REPO" auto --tag-prefix "v" --flavor "git-native" + [ "$output" == "Version updated from v0.0.2-alpha.2 to v0.0.2" ] + + # Should do nothing because no bumps in messages since last non-prerelease bump + avakas_wrapper bump "$REPO" auto --tag-prefix "v" --flavor "git-native" --prerelease --prerelease-prefix 'beta' + [ "$output" == "" ] + avakas_wrapper show "$REPO" + [ "$output" == "v0.0.2" ] + + commit_message "$REPO" "hwhelp\nbump:minor" + + avakas_wrapper bump "$REPO" auto --tag-prefix "v" --flavor "git-native" --prerelease --prerelease-prefix 'beta' + avakas_wrapper show "$REPO" + [ "$output" == "v0.1.0-beta.1" ] + + # No commits since last pre-release bump + avakas_wrapper bump "$REPO" auto --tag-prefix "v" --flavor "git-native" --prerelease --prerelease-prefix 'beta' + avakas_wrapper show "$REPO" + [ "$output" == "v0.1.0-beta.1" ] } \ No newline at end of file From 7963684a934514898853f4172c7043093622d783 Mon Sep 17 00:00:00 2001 From: Tyler Jachetta Date: Tue, 2 Feb 2021 13:28:11 -0500 Subject: [PATCH 05/33] WIP on git flavor prefix fixes --- avakas/flavors/git.py | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/avakas/flavors/git.py b/avakas/flavors/git.py index 349dde6..34e7b94 100644 --- a/avakas/flavors/git.py +++ b/avakas/flavors/git.py @@ -7,6 +7,8 @@ from git import Repo, Git +import semantic_version + from avakas.errors import AvakasError from avakas.avakas import Avakas, register_flavor from avakas.utils import sort_versions @@ -60,7 +62,7 @@ def __create_git_tag(self): """Creates a git tag""" return self.repo.create_tag(self.version) - def __determine_bump(self): + def __determine_bump(self, for_prerelease=False): """Will go through the Git history until the last version bump and look for hints that we want to "automatically" bump our version""" @@ -68,11 +70,24 @@ def __determine_bump(self): vsn = None reg = re.compile(r'(\#|bump:|\[)(?P(patch|minor|major))(.*|\])', re.MULTILINE) - tagged_commits = set(tag.commit for tag in self.repo.tags) + tagged_commits = {} + for tag in self.repo.tags: + tagged_commits.setdefault(tag.commit, set()).add(tag) + + # Flag so that when we're getting a prerelease version, if the most + # recent commit is already tagged with a prerelease + prev_commit = True + for commit in self.repo.iter_commits(self.options['branch']): # we go iterate back to the last time we bumped the version - if commit in tagged_commits: - break + for tag in tagged_commits.get(commit, []): + try: + tag_version = semantic_version.Version(tag.name) + except ValueError: + continue + if ((not tag_version.prerelease) or + (for_prerelease and prev_commit)): + return vsn res = reg.search(commit.message) if res: @@ -85,6 +100,8 @@ def __determine_bump(self): vsn = 'major' elif vsn == 'minor' and bump == 'major': vsn = 'major' + + prev_commit = False return vsn def write_versionfile(self): @@ -115,7 +132,7 @@ def bump(self, used and True returned. If not, bump will return False. """ if bump == 'auto': - bump = self.__determine_bump() + bump = self.__determine_bump(for_prerelease=prerelease) if bump is None and self.options['default_bump']: bump = self.options['default_bump'] @@ -130,6 +147,8 @@ def read(self): out = git.tag(merged="HEAD", sort="-creatordate") tags = out.splitlines() tags = [t.strip(self.options['tag_prefix']) for t in tags] + tags = [tag for tag in tags if semantic_version.validate(tag)] + tags = sort_versions(tags) if len(tags) >= 2: latest_tag = tags[-1] From 67a2e4303c8ef2df1e62c0e0321b247bc357b722 Mon Sep 17 00:00:00 2001 From: Tyler Jachetta Date: Wed, 3 Feb 2021 20:53:34 -0500 Subject: [PATCH 06/33] Fixed some issues in new tests --- tests/integration/gitnative.bats | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/integration/gitnative.bats b/tests/integration/gitnative.bats index b460770..0452753 100644 --- a/tests/integration/gitnative.bats +++ b/tests/integration/gitnative.bats @@ -65,7 +65,7 @@ teardown() { avakas_wrapper bump "$REPO" auto --tag-prefix "v" --flavor "git-native" git show-ref --tags avakas_wrapper show "$REPO" - [ "$output" == "0.0.2" ] + [ "$output" == "v0.0.2" ] } @test "autobump git-native versions multiple times" { @@ -126,7 +126,7 @@ teardown() { commit_message "$REPO" "FLunkf\nbump:patch" avakas_wrapper bump "$REPO" auto --tag-prefix "v" --flavor "git-native" --prerelease --prerelease-prefix 'alpha' - [ "$output" == "Version updated from v0.0.1 to v0.0.2" ] + [ "$output" == "Version updated from v0.0.1 to v0.0.2-alpha.1" ] avakas_wrapper show "$REPO" [ "$output" == "v0.0.2-alpha.1" ] From 4862146141bf3f752d99c848911a21b14ea46f50 Mon Sep 17 00:00:00 2001 From: Tyler Jachetta Date: Tue, 10 May 2022 07:15:37 -0600 Subject: [PATCH 07/33] Updated git flavor to better handle tag prefixes --- avakas/flavors/git.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/avakas/flavors/git.py b/avakas/flavors/git.py index 34e7b94..34aa462 100644 --- a/avakas/flavors/git.py +++ b/avakas/flavors/git.py @@ -31,9 +31,11 @@ def guess_flavor(cls, directory): # pylint: disable=unused-argument return False - def __init__(self, **kwargs): + def __init__(self, filename, tag_prefix='v', **kwargs): + # not sure if setting tag_prefix to ! None is too prescriptive super().__init__(**kwargs) - self.version_filename = kwargs['filename'] + self.tag_prefix = tag_prefix + self.version_filename = filename self.repo = self.__load_git() def __load_git(self): @@ -60,7 +62,7 @@ def __git_push(self, tag): def __create_git_tag(self): """Creates a git tag""" - return self.repo.create_tag(self.version) + return self.repo.create_tag(f'{self.tag_prefix}{self.version}') def __determine_bump(self, for_prerelease=False): """Will go through the Git history until the last version bump @@ -146,7 +148,9 @@ def read(self): git = Git(self.directory) out = git.tag(merged="HEAD", sort="-creatordate") tags = out.splitlines() - tags = [t.strip(self.options['tag_prefix']) for t in tags] + import pdb + pdb.set_trace() + tags = [t[len(self.tag_prefix)] if t.startswith(self.tag_prefix) else t for t in tags] tags = [tag for tag in tags if semantic_version.validate(tag)] tags = sort_versions(tags) From 7b38aee675305669e7803564fb7b89c9a0961781 Mon Sep 17 00:00:00 2001 From: Tyler Jachetta Date: Tue, 10 May 2022 18:10:01 -0600 Subject: [PATCH 08/33] Tests: Added and updated integration tests for ansible and gitnative --- tests/integration/ansible.bats | 20 ++++-- tests/integration/gitnative.bats | 107 ++++++++++++++++++++----------- 2 files changed, 83 insertions(+), 44 deletions(-) diff --git a/tests/integration/ansible.bats b/tests/integration/ansible.bats index 7a6394f..ad68758 100644 --- a/tests/integration/ansible.bats +++ b/tests/integration/ansible.bats @@ -15,23 +15,29 @@ teardown() { shared_teardown } -@test "show a ansible version" { - avakas_wrapper show "$REPO" +@test "show an ansible version" { + avakas_wrapper show "$REPO" --tag-prefix "v" scan_lines "v0.0.1" "${lines[@]}" } -@test "set an ansible version" { - avakas_wrapper set "$REPO" "0.0.2" - scan_lines "Version set to 0.0.2" "${lines[@]}" +@test "show a ansible version no tag prefix" { + tag_repo "$REPO" "0.0.1" "latest" avakas_wrapper show "$REPO" + scan_lines "0.0.1" "${lines[@]}" +} + +@test "set an ansible version" { + avakas_wrapper set "$REPO" "0.0.2" --tag-prefix "v" + scan_lines "Version set to v0.0.2" "${lines[@]}" + avakas_wrapper show "$REPO" --tag-prefix "v" scan_lines "v0.0.2" "${lines[@]}" [ -e "$REPO/version" ] } @test "bump an ansible version" { - avakas_wrapper bump "$REPO" patch + avakas_wrapper bump "$REPO" patch --tag-prefix "v" scan_lines "Version updated from v0.0.1 to v0.0.2" "${lines[@]}" - avakas_wrapper show "$REPO" + avakas_wrapper show "$REPO" --tag-prefix "v" scan_lines "v0.0.2" "${lines[@]}" [ -e "$REPO/version" ] } diff --git a/tests/integration/gitnative.bats b/tests/integration/gitnative.bats index 0452753..aba0c8b 100644 --- a/tests/integration/gitnative.bats +++ b/tests/integration/gitnative.bats @@ -16,13 +16,21 @@ teardown() { } @test "show a git-native version" { - avakas_wrapper show "$REPO" --flavor "git-native" + avakas_wrapper show "$REPO" --flavor="git-native" scan_lines "0.0.1" "${lines[@]}" [ -e "$REPO/version" ] } +@test "show a git-native version with a tag prefix" { + commit_message "$REPO" "whorp\nbump:minor" + tag_repo "$REPO" "v0.0.1" "latest" + avakas_wrapper show "$REPO" --flavor="git-native" --tag-prefix "v" + scan_lines "v0.0.1" "${lines[@]}" + [ -e "$REPO/version" ] +} + @test "ignore non-version tags on autobump" { - avakas_wrapper set "$REPO" "1.0.0" --flavor "git-native" + avakas_wrapper set "$REPO" --flavor "git-native" "1.0.0" commit_message "$REPO" "whorp\nbump:minor" echo "committed" @@ -30,7 +38,7 @@ teardown() { echo "tagged" avakas_wrapper bump "$REPO" auto --flavor "git-native" [ "$output" == "Version updated from 1.0.0 to 1.1.0" ] - avakas_wrapper show "$REPO" + avakas_wrapper show "$REPO" --flavor "git-native" [ "$output" == "1.1.0" ] } @@ -38,66 +46,88 @@ teardown() { @test "set an git-native version" { avakas_wrapper set "$REPO" "0.0.2" --flavor "git-native" scan_lines "Version set to 0.0.2" "${lines[@]}" - avakas_wrapper show "$REPO" + avakas_wrapper show "$REPO" --flavor "git-native" scan_lines "0.0.2" "${lines[@]}" [ -e "$REPO/version" ] } + +@test "set a git-native version with tag prefix" { + avakas_wrapper set "$REPO" "v0.0.2" --flavor "git-native" --tag-prefix "v" + scan_lines "Version set to v0.0.2" "${lines[@]}" + avakas_wrapper show "$REPO" --flavor "git-native" --tag-prefix "v" + scan_lines "v0.0.2" "${lines[@]}" + [ -e "$REPO/version" ] +} + @test "bump an git-native version" { avakas_wrapper bump "$REPO" patch --flavor "git-native" scan_lines "Version updated from 0.0.1 to 0.0.2" "${lines[@]}" - avakas_wrapper show "$REPO" + avakas_wrapper show "$REPO" --flavor "git-native" scan_lines "0.0.2" "${lines[@]}" [ -e "$REPO/version" ] } +@test "bump an git-native version with tag prefix" { + tag_repo "$REPO" 'v0.0.1' "latest" + avakas_wrapper bump "$REPO" patch --flavor "git-native" --tag-prefix 'v' + scan_lines "Version updated from v0.0.1 to v0.0.2" "${lines[@]}" + avakas_wrapper show "$REPO" --flavor "git-native" --tag-prefix 'v' + scan_lines "v0.0.2" "${lines[@]}" + [ -e "$REPO/version" ] +} + @test "autobump git-native version once" { cd $REPO commit_message "$REPO" "you're probably not gonna read this anyway\nbump:patch" avakas_wrapper bump "$REPO" auto --flavor "git-native" - avakas_wrapper show "$REPO" + avakas_wrapper show "$REPO" --flavor "git-native" [ "$output" == "0.0.2" ] } @test "autobump git-native version once with tag prefix" { cd $REPO + commit_message "$REPO" "initial commit!" + tag_repo "$REPO" 'v0.0.1' "latest" commit_message "$REPO" "you're probably not gonna read this anyway\nbump:patch" avakas_wrapper bump "$REPO" auto --tag-prefix "v" --flavor "git-native" git show-ref --tags - avakas_wrapper show "$REPO" + avakas_wrapper show "$REPO" --flavor "git-native" --tag-prefix "v" [ "$output" == "v0.0.2" ] } @test "autobump git-native versions multiple times" { cd $REPO + commit_message "$REPO" "initial commit!" + tag_repo "$REPO" 'v0.0.1' "latest" commit_message "$REPO" "whorp\nbump:patch" - avakas_wrapper bump "$REPO" auto --flavor "git-native" - avakas_wrapper show "$REPO" - [ "$output" == "0.0.2" ] - avakas_wrapper bump "$REPO" auto --flavor "git-native" - avakas_wrapper show "$REPO" - [ "$output" == "0.0.2" ] - avakas_wrapper bump "$REPO" auto --flavor "git-native" - avakas_wrapper show "$REPO" - [ "$output" == "0.0.2" ] - avakas_wrapper bump "$REPO" auto --flavor "git-native" - avakas_wrapper show "$REPO" - [ "$output" == "0.0.2" ] + avakas_wrapper bump "$REPO" auto --flavor "git-native" --tag-prefix "v" + avakas_wrapper show "$REPO" --flavor "git-native" --tag-prefix "v" + [ "$output" == "v0.0.2" ] + avakas_wrapper bump "$REPO" auto --flavor "git-native" --tag-prefix "v" + avakas_wrapper show "$REPO" --flavor "git-native" --tag-prefix "v" + [ "$output" == "v0.0.2" ] + avakas_wrapper bump "$REPO" auto --flavor "git-native" --tag-prefix "v" + avakas_wrapper show "$REPO" --flavor "git-native" --tag-prefix "v" + [ "$output" == "v0.0.2" ] + avakas_wrapper bump "$REPO" auto --flavor "git-native" --tag-prefix "v" + avakas_wrapper show "$REPO" --flavor "git-native" --tag-prefix "v" + [ "$output" == "v0.0.2" ] } @test "autobump git-native versions with prereleases" { cd $REPO - commit_message "$REPO" "FLunkf\nbump:patch" + avakas_wrapper bump "$REPO" auto --flavor "git-native" --prerelease --prerelease-prefix 'alpha' [[ "$output" =~ ^Version\ updated\ from\ 0\.0\.1\ to\ 0\.0\.2 ]] - avakas_wrapper show "$REPO" + avakas_wrapper show "$REPO" --flavor "git-native" [ "$output" == "0.0.2-alpha.1" ] commit_message "$REPO" "squirrels" avakas_wrapper bump "$REPO" auto --flavor "git-native" --prerelease --prerelease-prefix 'alpha' [ "$output" == "Version updated from 0.0.2-alpha.1 to 0.0.2-alpha.2" ] - avakas_wrapper show "$REPO" + avakas_wrapper show "$REPO" --flavor "git-native" [ "$output" == "0.0.2-alpha.2" ] avakas_wrapper bump "$REPO" auto --flavor "git-native" @@ -106,7 +136,7 @@ teardown() { # Should do nothing because no bumps in messages since last non-prerelease bump avakas_wrapper bump "$REPO" auto --flavor "git-native" --prerelease --prerelease-prefix 'beta' [ "$output" == "" ] - avakas_wrapper show "$REPO" + avakas_wrapper show "$REPO" --flavor "git-native" [ "$output" == "0.0.2" ] commit_message "$REPO" "hwhelp\nbump:minor" @@ -117,42 +147,45 @@ teardown() { # No commits since last pre-release bump avakas_wrapper bump "$REPO" auto --flavor "git-native" --prerelease --prerelease-prefix 'beta' + [ "$output" == "" ] avakas_wrapper show "$REPO" [ "$output" == "0.1.0-beta.1" ] } @test "autobump git-native versions with prereleases and tag prefixes" { cd $REPO + commit_message "$REPO" "initial commit!" + tag_repo "$REPO" 'v1.0.1' "latest" commit_message "$REPO" "FLunkf\nbump:patch" avakas_wrapper bump "$REPO" auto --tag-prefix "v" --flavor "git-native" --prerelease --prerelease-prefix 'alpha' - [ "$output" == "Version updated from v0.0.1 to v0.0.2-alpha.1" ] - avakas_wrapper show "$REPO" - [ "$output" == "v0.0.2-alpha.1" ] + [ "$output" == "Version updated from v1.0.1 to v1.0.2-alpha.1" ] + avakas_wrapper show "$REPO" --flavor "git-native" --tag-prefix 'v' + [ "$output" == "v1.0.2-alpha.1" ] commit_message "$REPO" "squirrels" avakas_wrapper bump "$REPO" auto --tag-prefix "v" --flavor "git-native" --prerelease --prerelease-prefix 'alpha' - [ "$output" == "Version updated from v0.0.2-alpha.1 to v0.0.2-alpha.2" ] - avakas_wrapper show "$REPO" - [ "$output" == "v0.0.2-alpha.2" ] + [ "$output" == "Version updated from v1.0.2-alpha.1 to v1.0.2-alpha.2" ] + avakas_wrapper show "$REPO" --flavor "git-native" --tag-prefix 'v' + [ "$output" == "v1.0.2-alpha.2" ] avakas_wrapper bump "$REPO" auto --tag-prefix "v" --flavor "git-native" - [ "$output" == "Version updated from v0.0.2-alpha.2 to v0.0.2" ] + [ "$output" == "Version updated from v1.0.2-alpha.2 to v1.0.2" ] # Should do nothing because no bumps in messages since last non-prerelease bump avakas_wrapper bump "$REPO" auto --tag-prefix "v" --flavor "git-native" --prerelease --prerelease-prefix 'beta' [ "$output" == "" ] - avakas_wrapper show "$REPO" - [ "$output" == "v0.0.2" ] + avakas_wrapper show "$REPO" --flavor "git-native" --tag-prefix 'v' + [ "$output" == "v1.0.2" ] commit_message "$REPO" "hwhelp\nbump:minor" avakas_wrapper bump "$REPO" auto --tag-prefix "v" --flavor "git-native" --prerelease --prerelease-prefix 'beta' - avakas_wrapper show "$REPO" - [ "$output" == "v0.1.0-beta.1" ] + avakas_wrapper show "$REPO" --tag-prefix 'v' --flavor "git-native" + [ "$output" == "v1.1.0-beta.1" ] # No commits since last pre-release bump - avakas_wrapper bump "$REPO" auto --tag-prefix "v" --flavor "git-native" --prerelease --prerelease-prefix 'beta' - avakas_wrapper show "$REPO" - [ "$output" == "v0.1.0-beta.1" ] + avakas_wrapper bump "$REPO" auto --flavor "git-native" --tag-prefix "v"--prerelease --prerelease-prefix 'beta' + avakas_wrapper show "$REPO" --flavor "git-native" --tag-prefix 'v' + [ "$output" == "v1.1.0-beta.1" ] } \ No newline at end of file From 2c61290bab1fbbc016224ccf6190b6619044a0b8 Mon Sep 17 00:00:00 2001 From: Tyler Jachetta Date: Tue, 10 May 2022 18:11:20 -0600 Subject: [PATCH 09/33] Used object properties rather than an options dict for some things --- avakas/avakas.py | 21 +++++++++++---------- avakas/flavors/ansible.py | 4 +--- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/avakas/avakas.py b/avakas/avakas.py index 98beecc..b187794 100644 --- a/avakas/avakas.py +++ b/avakas/avakas.py @@ -44,32 +44,33 @@ class Avakas(): """ project_flavors = {} - def __init__(self, **kwargs): + def __init__(self, directory, tag_prefix='v', **kwargs): self._version = Version('0.0.0') - self.directory = kwargs['directory'][0] + self.tag_prefix = tag_prefix or '' + self.directory = directory[0] self.options = kwargs @property def version(self): """Get version""" - tag_prefix = self.options.get('tag_prefix', '') - return "%s%s" % (tag_prefix, self._version) + return f'{self.tag_prefix or ""}{self._version}' @version.setter def version(self, version): + if '1.0.3' in version: + raise ValueError('1.0.3') """Set version""" + if not version: + raise ValueError('Version must non-null/positive length') if not isinstance(version, str): raise TypeError("version must be type of str") - - tag_prefix = self.options.get('tag_prefix', None) - version = version.strip(tag_prefix) - + if self.tag_prefix and version.startswith(self.tag_prefix): + version = version[len(self.tag_prefix):] try: self._version = Version(version) except ValueError as err: - raise AvakasError("Invalid version string %s" % - version) from err + raise AvakasError(f"Invalid version string `{version}`, prefix={self.tag_prefix}") from err @property def version_obj(self): diff --git a/avakas/flavors/ansible.py b/avakas/flavors/ansible.py index 10d9a31..24b9fd3 100644 --- a/avakas/flavors/ansible.py +++ b/avakas/flavors/ansible.py @@ -21,11 +21,9 @@ class AvakasAnsibleProject(AvakasLegacy): def __init__(self, **kwargs): super().__init__(**kwargs) - tag_prefix = self.options.get('tag_prefix', '') - if tag_prefix not in ['v', '']: + if self.tag_prefix not in ['v', '']: raise AvakasError('Cannot specify a tag prefix ' 'with an Ansible Role') - self.options['tag_prefix'] = 'v' @classmethod def guess_flavor(cls, directory): From 4ee91fbaaaf5f823e6c50b47c4caceebcbfbcda3 Mon Sep 17 00:00:00 2001 From: Tyler Jachetta Date: Tue, 10 May 2022 18:11:35 -0600 Subject: [PATCH 10/33] Display final result --- avakas/cli.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/avakas/cli.py b/avakas/cli.py index ad9d4d4..d481328 100644 --- a/avakas/cli.py +++ b/avakas/cli.py @@ -111,7 +111,7 @@ def cli_set_version(prerelease=False, project = add_metadata(project, **kwargs) project.write() - print("Version set to %s" % version) + print("Version set to %s" % project.version) def parse_args(parser): From 72c2f11a47e7d136fc437a42e3690336961ba11c Mon Sep 17 00:00:00 2001 From: Tyler Jachetta Date: Wed, 11 May 2022 22:53:48 -0600 Subject: [PATCH 11/33] Updated test for new behaviour --- tests/integration/gitnative.bats | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/integration/gitnative.bats b/tests/integration/gitnative.bats index aba0c8b..68f4c23 100644 --- a/tests/integration/gitnative.bats +++ b/tests/integration/gitnative.bats @@ -120,7 +120,7 @@ teardown() { commit_message "$REPO" "FLunkf\nbump:patch" avakas_wrapper bump "$REPO" auto --flavor "git-native" --prerelease --prerelease-prefix 'alpha' - [[ "$output" =~ ^Version\ updated\ from\ 0\.0\.1\ to\ 0\.0\.2 ]] + [[ "$output" =~ ^Version\ updated\ from\ 0\.0\.1\ to\ 0\.0\.2-alpha\.1 ]] avakas_wrapper show "$REPO" --flavor "git-native" [ "$output" == "0.0.2-alpha.1" ] @@ -185,7 +185,7 @@ teardown() { [ "$output" == "v1.1.0-beta.1" ] # No commits since last pre-release bump - avakas_wrapper bump "$REPO" auto --flavor "git-native" --tag-prefix "v"--prerelease --prerelease-prefix 'beta' + avakas_wrapper bump "$REPO" auto --flavor "git-native" --tag-prefix "v" --prerelease --prerelease-prefix 'beta' avakas_wrapper show "$REPO" --flavor "git-native" --tag-prefix 'v' [ "$output" == "v1.1.0-beta.1" ] } \ No newline at end of file From cb7e40e08f4a4f6bad697b057b902ed3bc8a503e Mon Sep 17 00:00:00 2001 From: Tyler Jachetta Date: Wed, 11 May 2022 22:58:40 -0600 Subject: [PATCH 12/33] Edit: Fixed comment article choice --- tests/integration/ansible.bats | 2 +- tests/integration/gitnative.bats | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/integration/ansible.bats b/tests/integration/ansible.bats index ad68758..b82a2ff 100644 --- a/tests/integration/ansible.bats +++ b/tests/integration/ansible.bats @@ -20,7 +20,7 @@ teardown() { scan_lines "v0.0.1" "${lines[@]}" } -@test "show a ansible version no tag prefix" { +@test "show an ansible version no tag prefix" { tag_repo "$REPO" "0.0.1" "latest" avakas_wrapper show "$REPO" scan_lines "0.0.1" "${lines[@]}" diff --git a/tests/integration/gitnative.bats b/tests/integration/gitnative.bats index 68f4c23..ba26869 100644 --- a/tests/integration/gitnative.bats +++ b/tests/integration/gitnative.bats @@ -43,7 +43,7 @@ teardown() { } -@test "set an git-native version" { +@test "set a git-native version" { avakas_wrapper set "$REPO" "0.0.2" --flavor "git-native" scan_lines "Version set to 0.0.2" "${lines[@]}" avakas_wrapper show "$REPO" --flavor "git-native" @@ -60,7 +60,7 @@ teardown() { [ -e "$REPO/version" ] } -@test "bump an git-native version" { +@test "bump a git-native version" { avakas_wrapper bump "$REPO" patch --flavor "git-native" scan_lines "Version updated from 0.0.1 to 0.0.2" "${lines[@]}" avakas_wrapper show "$REPO" --flavor "git-native" @@ -68,7 +68,7 @@ teardown() { [ -e "$REPO/version" ] } -@test "bump an git-native version with tag prefix" { +@test "bump a git-native version with tag prefix" { tag_repo "$REPO" 'v0.0.1' "latest" avakas_wrapper bump "$REPO" patch --flavor "git-native" --tag-prefix 'v' scan_lines "Version updated from v0.0.1 to v0.0.2" "${lines[@]}" From cbe1432fab9c650de42876ea7fcbafd5d5633636 Mon Sep 17 00:00:00 2001 From: Tyler Jachetta Date: Wed, 11 May 2022 23:00:04 -0600 Subject: [PATCH 13/33] Implemented fixed git prerelease bumps --- avakas/avakas.py | 71 +++++++++++++++++++++++++++++++------- avakas/flavors/ansible.py | 19 ++--------- avakas/flavors/git.py | 72 ++++++++++++++++++++++++--------------- 3 files changed, 106 insertions(+), 56 deletions(-) diff --git a/avakas/avakas.py b/avakas/avakas.py index b187794..2a49499 100644 --- a/avakas/avakas.py +++ b/avakas/avakas.py @@ -58,19 +58,22 @@ def version(self): @version.setter def version(self, version): - if '1.0.3' in version: - raise ValueError('1.0.3') """Set version""" - if not version: - raise ValueError('Version must non-null/positive length') - if not isinstance(version, str): - raise TypeError("version must be type of str") - if self.tag_prefix and version.startswith(self.tag_prefix): - version = version[len(self.tag_prefix):] - try: - self._version = Version(version) - except ValueError as err: - raise AvakasError(f"Invalid version string `{version}`, prefix={self.tag_prefix}") from err + + if not isinstance(version, Version): + + if not version: + raise ValueError('Version must non-null/positive length') + if not isinstance(version, str): + raise TypeError("version must be type of str") + if self.tag_prefix and version.startswith(self.tag_prefix): + version = version[len(self.tag_prefix):] + try: + version = Version(version) + except ValueError as err: + raise AvakasError(f"Invalid version string `{version}`, prefix={self.tag_prefix}") from err + + self._version = version @property def version_obj(self): @@ -93,6 +96,50 @@ def read(cls): def write(cls): """Write version data to a project""" + + def __determine_bump(self, for_prerelease=False): + """Will go through the Git history until the last version bump + and look for hints that we want to "automatically" bump + our version""" + self.repo = self.__load_git() + vsn = None + reg = re.compile(r'(\#|bump:|\[)(?P(patch|minor|major))(.*|\])', + re.MULTILINE) + tagged_commits = {} + for tag in self.repo.tags: + tagged_commits.setdefault(tag.commit, set()).add(tag) + + # Flag so that when we're getting a prerelease version, if the most + # recent commit is already tagged with a prerelease + prev_commit = True + + for commit in self.repo.iter_commits(self.options['branch']): + # we go iterate back to the last time we bumped the version + for tag in tagged_commits.get(commit, []): + try: + tag_version = semantic_version.Version(tag.name) + except ValueError: + continue + if ((not tag_version.prerelease) or + (for_prerelease and prev_commit)): + return vsn + + res = reg.search(commit.message) + if res: + bump = res.group('bump') + if not vsn: + vsn = bump + elif vsn == 'patch' and bump == 'minor': + vsn = 'minor' + elif vsn == 'patch' and bump == 'major': + vsn = 'major' + elif vsn == 'minor' and bump == 'major': + vsn = 'major' + + prev_commit = False + return vsn + + def bump(self, bump=None, prerelease=False, diff --git a/avakas/flavors/ansible.py b/avakas/flavors/ansible.py index 24b9fd3..9c12827 100644 --- a/avakas/flavors/ansible.py +++ b/avakas/flavors/ansible.py @@ -4,16 +4,13 @@ import os -from git import Git - -from avakas.flavors.base import AvakasLegacy +from avakas.flavors.git import AvakasGitNative from avakas.avakas import register_flavor from avakas.errors import AvakasError -from avakas.utils import sort_versions @register_flavor('ansible') -class AvakasAnsibleProject(AvakasLegacy): +class AvakasAnsibleProject(AvakasGitNative): """ Ansible Avakas Project """ @@ -28,15 +25,3 @@ def __init__(self, **kwargs): @classmethod def guess_flavor(cls, directory): return os.path.exists("%s/meta/main.yml" % directory) - - def read(self): - git = Git(self.directory) - out = git.tag(merged="HEAD", sort="-creatordate") - tags = out.splitlines() - tags = [t.strip(self.options['tag_prefix']) for t in tags] - tags = sort_versions(tags) - latest_tag = tags[-1] - - self.version = latest_tag - - return self.version diff --git a/avakas/flavors/git.py b/avakas/flavors/git.py index 34aa462..6320078 100644 --- a/avakas/flavors/git.py +++ b/avakas/flavors/git.py @@ -47,6 +47,12 @@ def __load_git(self): return repo + def _version_from_tag(self, tag): + try: + return semantic_version.Version(tag.name[len(self.tag_prefix):]) + except ValueError: + return None + def __git_push(self, tag): """Push git tag if remote exists""" opt = self.options @@ -62,7 +68,7 @@ def __git_push(self, tag): def __create_git_tag(self): """Creates a git tag""" - return self.repo.create_tag(f'{self.tag_prefix}{self.version}') + return self.repo.create_tag(self.version) def __determine_bump(self, for_prerelease=False): """Will go through the Git history until the last version bump @@ -76,20 +82,26 @@ def __determine_bump(self, for_prerelease=False): for tag in self.repo.tags: tagged_commits.setdefault(tag.commit, set()).add(tag) - # Flag so that when we're getting a prerelease version, if the most - # recent commit is already tagged with a prerelease - prev_commit = True + # the most recent tag, whether pre-release or no + tag_version = None + release_version = None + bump = None for commit in self.repo.iter_commits(self.options['branch']): # we go iterate back to the last time we bumped the version - for tag in tagged_commits.get(commit, []): - try: - tag_version = semantic_version.Version(tag.name) - except ValueError: - continue - if ((not tag_version.prerelease) or - (for_prerelease and prev_commit)): - return vsn + if commit in tagged_commits: + version_tags = [self._version_from_tag(tag) for tag in tagged_commits[commit]] + version_tags = [tag for tag in version_tags if tag is not None] + release_tags = [tag for tag in version_tags if not tag.prerelease] + if any(release_tags): + release_version = max(release_tags) + if any(version_tags) and tag_version is None: + tag_version = max(version_tags) + if for_prerelease and commit == self.repo.heads[self.options['branch']].commit: + return bump + + if release_version is not None: + break # break out of for commit iterator res = reg.search(commit.message) if res: @@ -103,7 +115,8 @@ def __determine_bump(self, for_prerelease=False): elif vsn == 'minor' and bump == 'major': vsn = 'major' - prev_commit = False + if release_version is not None: + break return vsn def write_versionfile(self): @@ -145,20 +158,21 @@ def bump(self, build_date=build_date) def read(self): - git = Git(self.directory) - out = git.tag(merged="HEAD", sort="-creatordate") - tags = out.splitlines() - import pdb - pdb.set_trace() - tags = [t[len(self.tag_prefix)] if t.startswith(self.tag_prefix) else t for t in tags] - tags = [tag for tag in tags if semantic_version.validate(tag)] - - tags = sort_versions(tags) - if len(tags) >= 2: - latest_tag = tags[-1] - elif len(tags) == 1: - latest_tag = tags[0] - else: + latest_tag = None + commit_to_tags = {} + for tag in self.repo.tags: + commit_to_tags.setdefault(tag.commit, set()).add(tag) + + for commit in self.repo.iter_commits(self.options['branch']): + if commit in commit_to_tags: + version_tags = [self._version_from_tag(tag) for tag in commit_to_tags[commit]] + version_tags = [tag for tag in version_tags if tag is not None] + if version_tags: + latest_tag = max(version_tags) + if latest_tag is not None: + break + + if latest_tag is None: raise AvakasError("No initial tag found!") self.version = latest_tag @@ -172,3 +186,7 @@ def write(self): """ self.write_git() self.write_versionfile() + + +class PreviousCommitTagged(Exception): + pass From b8ee36463682306b16a1cf79ed4fd5f584555c2d Mon Sep 17 00:00:00 2001 From: Tyler Jachetta Date: Wed, 11 May 2022 23:37:36 -0600 Subject: [PATCH 14/33] Fixed some bugs and removed some stale code --- avakas/avakas.py | 55 +++++------------------------------ avakas/cli.py | 2 +- avakas/flavors/git.py | 20 +++++++++---- tests/integration/helper.bash | 3 +- 4 files changed, 25 insertions(+), 55 deletions(-) diff --git a/avakas/avakas.py b/avakas/avakas.py index 2a49499..d445bc5 100644 --- a/avakas/avakas.py +++ b/avakas/avakas.py @@ -71,7 +71,12 @@ def version(self, version): try: version = Version(version) except ValueError as err: - raise AvakasError(f"Invalid version string `{version}`, prefix={self.tag_prefix}") from err + # Doing this to get around the linter, which seems like a + # hobgoblin, but couldn't figure out how to get the pylint + # hints to work + prefix = self.tag_prefix + msg = f"Invalid version string `{version}`,prefix={prefix}" + raise AvakasError(msg) from err self._version = version @@ -96,50 +101,6 @@ def read(cls): def write(cls): """Write version data to a project""" - - def __determine_bump(self, for_prerelease=False): - """Will go through the Git history until the last version bump - and look for hints that we want to "automatically" bump - our version""" - self.repo = self.__load_git() - vsn = None - reg = re.compile(r'(\#|bump:|\[)(?P(patch|minor|major))(.*|\])', - re.MULTILINE) - tagged_commits = {} - for tag in self.repo.tags: - tagged_commits.setdefault(tag.commit, set()).add(tag) - - # Flag so that when we're getting a prerelease version, if the most - # recent commit is already tagged with a prerelease - prev_commit = True - - for commit in self.repo.iter_commits(self.options['branch']): - # we go iterate back to the last time we bumped the version - for tag in tagged_commits.get(commit, []): - try: - tag_version = semantic_version.Version(tag.name) - except ValueError: - continue - if ((not tag_version.prerelease) or - (for_prerelease and prev_commit)): - return vsn - - res = reg.search(commit.message) - if res: - bump = res.group('bump') - if not vsn: - vsn = bump - elif vsn == 'patch' and bump == 'minor': - vsn = 'minor' - elif vsn == 'patch' and bump == 'major': - vsn = 'major' - elif vsn == 'minor' and bump == 'major': - vsn = 'major' - - prev_commit = False - return vsn - - def bump(self, bump=None, prerelease=False, @@ -211,8 +172,8 @@ def get_next_prerelease_version( current_prefix_match = starting_version.prerelease[:prerelease_len] - if (new_version == starting_version.truncate() and - prefix == current_prefix_match): + if (new_version == starting_version.truncate() + and prefix == current_prefix_match): # prerelease bumping for the same release. # this will catch a case where there's e.g. rc.dev.1 diff --git a/avakas/cli.py b/avakas/cli.py index d481328..156b2dd 100644 --- a/avakas/cli.py +++ b/avakas/cli.py @@ -131,7 +131,7 @@ def parse_args(parser): common.add_argument('--branch', dest='branch', help='Branch to use when updating git', - default='master') + default='mainline') common.add_argument('--remote', dest='remote', help='Git remote', diff --git a/avakas/flavors/git.py b/avakas/flavors/git.py index 6320078..dad3572 100644 --- a/avakas/flavors/git.py +++ b/avakas/flavors/git.py @@ -5,13 +5,12 @@ import re import os -from git import Repo, Git +from git import Repo import semantic_version from avakas.errors import AvakasError from avakas.avakas import Avakas, register_flavor -from avakas.utils import sort_versions @register_flavor('git-native') @@ -86,18 +85,25 @@ def __determine_bump(self, for_prerelease=False): tag_version = None release_version = None bump = None + head_commit = self.repo.heads[self.options['branch']].commit for commit in self.repo.iter_commits(self.options['branch']): # we go iterate back to the last time we bumped the version if commit in tagged_commits: - version_tags = [self._version_from_tag(tag) for tag in tagged_commits[commit]] + version_tags = [self._version_from_tag(tag) for tag in + tagged_commits[commit]] + version_tags = [tag for tag in version_tags if tag is not None] - release_tags = [tag for tag in version_tags if not tag.prerelease] + + release_tags = [tag for tag in version_tags if + not tag.prerelease] + if any(release_tags): release_version = max(release_tags) if any(version_tags) and tag_version is None: tag_version = max(version_tags) - if for_prerelease and commit == self.repo.heads[self.options['branch']].commit: + + if for_prerelease and commit == head_commit: return bump if release_version is not None: @@ -165,7 +171,9 @@ def read(self): for commit in self.repo.iter_commits(self.options['branch']): if commit in commit_to_tags: - version_tags = [self._version_from_tag(tag) for tag in commit_to_tags[commit]] + version_tags = [self._version_from_tag(tag) for tag in + commit_to_tags[commit]] + version_tags = [tag for tag in version_tags if tag is not None] if version_tags: latest_tag = max(version_tags) diff --git a/tests/integration/helper.bash b/tests/integration/helper.bash index 4b66e0d..9067a92 100644 --- a/tests/integration/helper.bash +++ b/tests/integration/helper.bash @@ -44,13 +44,14 @@ config_repo() { git config pull.rebase false git config user.email "nobody@example.com" git config user.name "some user" + git.config. } fake_repo() { local REPO="${AVAKAS_TEST_DIR}/briefcase-${BATS_TEST_NAME}-${RANDOM}" mkdir "${REPO}" cd "$REPO" - git init -q + git init -q --initial-branch=mainline config_repo "$REPO" local FILES="$(fake_file "$REPO")" FILES="${FILES} $(fake_file "$REPO")" From de2458800b18c06f0f9d02f568947ee8a6c216e7 Mon Sep 17 00:00:00 2001 From: Tyler Jachetta Date: Wed, 11 May 2022 23:53:11 -0600 Subject: [PATCH 15/33] Made changes necessitated by the linter --- avakas/flavors/git.py | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/avakas/flavors/git.py b/avakas/flavors/git.py index dad3572..826f248 100644 --- a/avakas/flavors/git.py +++ b/avakas/flavors/git.py @@ -12,6 +12,17 @@ from avakas.errors import AvakasError from avakas.avakas import Avakas, register_flavor +PATCH = 'patch' +MAJOR = 'major' +MINOR = 'minor' + +# not gonna convert everything to be an enum just yet -TMJ +BUMPS = { + PATCH: 0, + MINOR: 1, + MAJOR: 2 +} + @register_flavor('git-native') class AvakasGitNative(Avakas): @@ -114,12 +125,8 @@ def __determine_bump(self, for_prerelease=False): bump = res.group('bump') if not vsn: vsn = bump - elif vsn == 'patch' and bump == 'minor': - vsn = 'minor' - elif vsn == 'patch' and bump == 'major': - vsn = 'major' - elif vsn == 'minor' and bump == 'major': - vsn = 'major' + else: + vsn = max((vsn, bump), key=lambda x: BUMPS[x]) if release_version is not None: break @@ -194,7 +201,3 @@ def write(self): """ self.write_git() self.write_versionfile() - - -class PreviousCommitTagged(Exception): - pass From 7721d88da729633334a464ac311d8c8c42601c10 Mon Sep 17 00:00:00 2001 From: Tyler Jachetta Date: Thu, 12 May 2022 08:18:47 -0600 Subject: [PATCH 16/33] kill your masters --- README.md | 2 +- tests/integration/helper.bash | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 9f2abb1..de09ac3 100644 --- a/README.md +++ b/README.md @@ -118,7 +118,7 @@ coverage report from the integration tests. # License -[MIT](https://github.com/otakup0pe/avakas/blob/master/LICENSE) +[MIT](https://github.com/otakup0pe/avakas/blob/mainline/LICENSE) # Author diff --git a/tests/integration/helper.bash b/tests/integration/helper.bash index 9067a92..68ed02d 100644 --- a/tests/integration/helper.bash +++ b/tests/integration/helper.bash @@ -108,7 +108,7 @@ tag_repo() { update_repo() { local REPO="$1" cd "$REPO" - git pull -q origin master + git pull -q origin mainline } plain_version() { From 8e0e17e3d0ef6495b776889028b8f684ebfcd943 Mon Sep 17 00:00:00 2001 From: Tyler Jachetta Date: Thu, 12 May 2022 08:36:50 -0600 Subject: [PATCH 17/33] More futzing to try to get CI happy --- .github/workflows/build.yml | 2 ++ tests/integration/helper.bash | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1186569..4fd99bf 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,6 +23,8 @@ jobs: uses: "actions/setup-python@v2" with: python-version: "${{ matrix.python-version }}" + - name: "Config git" + run: "git config init.defaultbranch=mainline" - name: "run tests" run: "make test" - name: "build container" diff --git a/tests/integration/helper.bash b/tests/integration/helper.bash index d2027a4..df05579 100644 --- a/tests/integration/helper.bash +++ b/tests/integration/helper.bash @@ -44,7 +44,6 @@ config_repo() { git config pull.rebase false git config user.email "nobody@example.com" git config user.name "some user" - git.config. } fake_repo() { @@ -72,6 +71,7 @@ origin_repo() { local REPO="$1" cd "$REPO" git config --bool core.bare true + git config init.defaultbranch mainline rm -rf "${REPO}"/* } From 02cd15841feacd42cf9b13d4f1850eff5ee74c48 Mon Sep 17 00:00:00 2001 From: Tyler Jachetta Date: Thu, 12 May 2022 08:43:58 -0600 Subject: [PATCH 18/33] fixed git config invokation --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4fd99bf..aaea078 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,7 +24,7 @@ jobs: with: python-version: "${{ matrix.python-version }}" - name: "Config git" - run: "git config init.defaultbranch=mainline" + run: "git config init.defaultbranch mainline" - name: "run tests" run: "make test" - name: "build container" From 55ba8ac8a2b74c1ed980e390bf43136e638d2fca Mon Sep 17 00:00:00 2001 From: Tyler Jachetta Date: Thu, 12 May 2022 09:02:02 -0600 Subject: [PATCH 19/33] adding a debug bit --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index a54c35a..b8325a6 100644 --- a/Makefile +++ b/Makefile @@ -20,6 +20,8 @@ testenv: (echo "Within CI" && pip install -r requirements.txt -r requirements-dev.txt) version: testenv + # TOREMOVE + git branch $(CI_ENV)python -m avakas show . --flavor "git-native" install: testenv version From 948f2f30025ebefa5a3b5a65c62dbb5f335a4425 Mon Sep 17 00:00:00 2001 From: Tyler Jachetta Date: Thu, 12 May 2022 09:04:41 -0600 Subject: [PATCH 20/33] Seeing if this gets me my tags while I search --- .github/workflows/build.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index aaea078..d5bf3c3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,8 +17,6 @@ jobs: python-version: [3.7, 3.8] steps: - uses: "actions/checkout@v2" - with: - fetch-depth: 0 - name: "Set up Python ${{ matrix.python-version }}" uses: "actions/setup-python@v2" with: From d2edc7e2264d8342df823aa126836a55a05d5ba4 Mon Sep 17 00:00:00 2001 From: Tyler Jachetta Date: Thu, 12 May 2022 09:11:06 -0600 Subject: [PATCH 21/33] removed `make version` dependency in make targets --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index b8325a6..a31387c 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ version: testenv git branch $(CI_ENV)python -m avakas show . --flavor "git-native" -install: testenv version +install: testenv $(CI_ENV)python setup.py install package: @@ -38,7 +38,7 @@ test: testenv install $(CI_ENV)coverage report -m test -z $(TRAVIS) && $(CI_ENV)coverage erase || true -generate_testing_artifact: version +generate_testing_artifact: tox --sdistonly test_in_container_37: generate_testing_artifact From 6e141668678ddfd970c9ccc4f116629fc6d1cb19 Mon Sep 17 00:00:00 2001 From: Tyler Jachetta Date: Thu, 12 May 2022 09:13:51 -0600 Subject: [PATCH 22/33] Nope, and more debugging --- .github/workflows/build.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d5bf3c3..d702584 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,6 +17,10 @@ jobs: python-version: [3.7, 3.8] steps: - uses: "actions/checkout@v2" + with: + fetch-depth: 0 + - name: test branches + run: git branch - name: "Set up Python ${{ matrix.python-version }}" uses: "actions/setup-python@v2" with: From 7f7721ac5dcb6b13306645402a367b6b0ed35f8c Mon Sep 17 00:00:00 2001 From: Tyler Jachetta Date: Thu, 12 May 2022 09:16:47 -0600 Subject: [PATCH 23/33] CI: using hack I found to maybe fix issue with no branches --- .github/workflows/build.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d702584..b0a771c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,7 +16,14 @@ jobs: matrix: python-version: [3.7, 3.8] steps: - - uses: "actions/checkout@v2" + - uses: actions/checkout@v2 + if: github.event_name == 'pull_request' + with: + fetch-depth: 0 + ref: ${{ github.event.pull_request.head.ref }} + + - uses: actions/checkout@v2 + if: github.event_name == 'push' with: fetch-depth: 0 - name: test branches From 2715712286aa4b2dbe93752541998fc2be58111c Mon Sep 17 00:00:00 2001 From: Tyler Jachetta Date: Thu, 12 May 2022 09:25:55 -0600 Subject: [PATCH 24/33] Revert "removed `make version` dependency in make targets" This reverts commit d2edc7e2264d8342df823aa126836a55a05d5ba4. --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index a31387c..b8325a6 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ version: testenv git branch $(CI_ENV)python -m avakas show . --flavor "git-native" -install: testenv +install: testenv version $(CI_ENV)python setup.py install package: @@ -38,7 +38,7 @@ test: testenv install $(CI_ENV)coverage report -m test -z $(TRAVIS) && $(CI_ENV)coverage erase || true -generate_testing_artifact: +generate_testing_artifact: version tox --sdistonly test_in_container_37: generate_testing_artifact From 67cda1558361b69dd106874d1155dbae030afe05 Mon Sep 17 00:00:00 2001 From: Tyler Jachetta Date: Thu, 12 May 2022 09:33:57 -0600 Subject: [PATCH 25/33] checking if this hack makes CI happy --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b8325a6..8f069bb 100644 --- a/Makefile +++ b/Makefile @@ -22,7 +22,8 @@ testenv: version: testenv # TOREMOVE git branch - $(CI_ENV)python -m avakas show . --flavor "git-native" + git branch --show-current + $(CI_ENV)python -m avakas show . --flavor "git-native" --branch $$(git branch --show-current) install: testenv version $(CI_ENV)python setup.py install From 822c65041e8625eea475a6033dfe634cac9ed4d7 Mon Sep 17 00:00:00 2001 From: Tyler Jachetta Date: Thu, 12 May 2022 09:59:06 -0600 Subject: [PATCH 26/33] removed test code --- Makefile | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 8f069bb..4a1a05c 100644 --- a/Makefile +++ b/Makefile @@ -20,10 +20,7 @@ testenv: (echo "Within CI" && pip install -r requirements.txt -r requirements-dev.txt) version: testenv - # TOREMOVE - git branch - git branch --show-current - $(CI_ENV)python -m avakas show . --flavor "git-native" --branch $$(git branch --show-current) + (CI_ENV)python -m avakas show . --flavor "git-native" --branch $$(git branch --show-current) install: testenv version $(CI_ENV)python setup.py install From 41315738bdebed0ae24f8aafbc7ef947f8e1626f Mon Sep 17 00:00:00 2001 From: Tyler Jachetta Date: Thu, 12 May 2022 12:58:53 -0600 Subject: [PATCH 27/33] fixed bug I introduced in Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 4a1a05c..8f5a18a 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,7 @@ testenv: (echo "Within CI" && pip install -r requirements.txt -r requirements-dev.txt) version: testenv - (CI_ENV)python -m avakas show . --flavor "git-native" --branch $$(git branch --show-current) + $(CI_ENV)python -m avakas show . --flavor "git-native" --branch $$(git branch --show-current) install: testenv version $(CI_ENV)python setup.py install From 86a9669fecda32e64fcbdc534e4e64c02c0f9384 Mon Sep 17 00:00:00 2001 From: Tyler Jachetta Date: Thu, 12 May 2022 13:19:32 -0600 Subject: [PATCH 28/33] Added a comment explaining provenance of some code, returned some style to original state, and removed some test code --- .github/workflows/build.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b0a771c..cc77e39 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,18 +16,19 @@ jobs: matrix: python-version: [3.7, 3.8] steps: - - uses: actions/checkout@v2 + # These two conditional checkouts allow for getting all branches in a + # pull request. I'm having trouble finding a source for these stanzas, but + # definitely found these by searching + - uses: "actions/checkout@v2" if: github.event_name == 'pull_request' with: fetch-depth: 0 ref: ${{ github.event.pull_request.head.ref }} - - uses: actions/checkout@v2 + - uses: "actions/checkout@v2" if: github.event_name == 'push' with: fetch-depth: 0 - - name: test branches - run: git branch - name: "Set up Python ${{ matrix.python-version }}" uses: "actions/setup-python@v2" with: From 873c94f5aa77c8e900f6011f5cc34c34f6b2c199 Mon Sep 17 00:00:00 2001 From: Tyler Jachetta <71654121+tyler-jachetta@users.noreply.github.com> Date: Thu, 12 May 2022 13:22:39 -0600 Subject: [PATCH 29/33] use f-string instead of old-style string interpolation Found a change I would like to make reviewing my code on gh --- avakas/cli.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/avakas/cli.py b/avakas/cli.py index 4b75d4e..053fb20 100644 --- a/avakas/cli.py +++ b/avakas/cli.py @@ -112,7 +112,7 @@ def cli_set_version(prerelease=False, project = add_metadata(project, **kwargs) project.write() - print("Version set to %s" % project.version) + print(f"Version set to {project.version}") def gen_arg_parser(): From 17a2ce36dd717de59e6e7fff9523bf52eff17dee Mon Sep 17 00:00:00 2001 From: Tyler Jachetta Date: Mon, 23 May 2022 06:40:41 -0700 Subject: [PATCH 30/33] Added poetry config so that I could update pyproject.toml --- poetry.lock | 352 ++++++++++++++++++++++++++++++++++--------------- pyproject.toml | 26 ++++ 2 files changed, 275 insertions(+), 103 deletions(-) create mode 100644 pyproject.toml diff --git a/poetry.lock b/poetry.lock index f0abb84..a631677 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,16 +1,16 @@ [[package]] name = "astroid" -version = "2.4.2" +version = "2.11.5" description = "An abstract syntax tree for Python with inference support." category = "dev" optional = false -python-versions = ">=3.5" +python-versions = ">=3.6.2" [package.dependencies] -lazy-object-proxy = ">=1.4.0,<1.5.0" -six = ">=1.12,<2.0" -typed-ast = {version = ">=1.4.0,<1.5", markers = "implementation_name == \"cpython\" and python_version < \"3.8\""} -wrapt = ">=1.11,<2.0" +lazy-object-proxy = ">=1.4.0" +typed-ast = {version = ">=1.4.0,<2.0", markers = "implementation_name == \"cpython\" and python_version < \"3.8\""} +typing-extensions = {version = ">=3.10", markers = "python_version < \"3.10\""} +wrapt = ">=1.11,<2" [[package]] name = "colorama" @@ -22,47 +22,48 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" [[package]] name = "coverage" -version = "5.3" +version = "6.4" description = "Code coverage measurement for Python" category = "dev" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, <4" +python-versions = ">=3.7" [package.extras] -toml = ["toml"] +toml = ["tomli"] [[package]] -name = "erl-terms" -version = "0.1.5" -description = "Erlang term read library" -category = "main" +name = "dill" +version = "0.3.5.1" +description = "serialize all of python" +category = "dev" optional = false -python-versions = "*" +python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*, !=3.6.*" -[package.dependencies] -parsimonious = "0.7.0" +[package.extras] +graph = ["objgraph (>=1.7.2)"] [[package]] name = "gitdb" -version = "4.0.5" +version = "4.0.9" description = "Git Object Database" category = "main" optional = false -python-versions = ">=3.4" +python-versions = ">=3.6" [package.dependencies] -smmap = ">=3.0.1,<4" +smmap = ">=3.0.1,<6" [[package]] name = "gitpython" -version = "3.1.11" -description = "Python Git Library" +version = "3.1.27" +description = "GitPython is a python library used to interact with Git repositories" category = "main" optional = false -python-versions = ">=3.4" +python-versions = ">=3.7" [package.dependencies] gitdb = ">=4.0.1,<5" +typing-extensions = {version = ">=3.7.4.3", markers = "python_version < \"3.8\""} [[package]] name = "isort" @@ -109,55 +110,91 @@ category = "dev" optional = false python-versions = "*" +[[package]] +name = "packaging" +version = "21.3" +description = "Core utilities for Python packages" +category = "main" +optional = false +python-versions = ">=3.6" + +[package.dependencies] +pyparsing = ">=2.0.2,<3.0.5 || >3.0.5" + [[package]] name = "parsimonious" -version = "0.7.0" +version = "0.9.0" description = "(Soon to be) the fastest pure-Python PEG parser I could muster" category = "main" optional = false python-versions = "*" [package.dependencies] -six = "*" +regex = ">=2022.3.15" [[package]] -name = "pycodestyle" -version = "2.6.0" -description = "Python style guide checker" +name = "platformdirs" +version = "2.5.2" +description = "A small Python module for determining appropriate platform-specific dirs, e.g. a \"user data dir\"." category = "dev" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" +python-versions = ">=3.7" + +[package.extras] +docs = ["furo (>=2021.7.5b38)", "proselint (>=0.10.2)", "sphinx-autodoc-typehints (>=1.12)", "sphinx (>=4)"] +test = ["appdirs (==1.4.4)", "pytest-cov (>=2.7)", "pytest-mock (>=3.6)", "pytest (>=6)"] [[package]] name = "pylint" -version = "2.6.0" +version = "2.13.9" description = "python code static checker" category = "dev" optional = false -python-versions = ">=3.5.*" +python-versions = ">=3.6.2" [package.dependencies] -astroid = ">=2.4.0,<=2.5" +astroid = ">=2.11.5,<=2.12.0-dev0" colorama = {version = "*", markers = "sys_platform == \"win32\""} +dill = ">=0.2" isort = ">=4.2.5,<6" -mccabe = ">=0.6,<0.7" -toml = ">=0.7.1" +mccabe = ">=0.6,<0.8" +platformdirs = ">=2.2.0" +tomli = {version = ">=1.1.0", markers = "python_version < \"3.11\""} +typing-extensions = {version = ">=3.10.0", markers = "python_version < \"3.10\""} + +[package.extras] +testutil = ["gitpython (>3)"] [[package]] -name = "semantic-version" -version = "2.8.5" -description = "A library implementing the 'SemVer' scheme." +name = "pyparsing" +version = "3.0.9" +description = "pyparsing module - Classes and methods to define and execute parsing grammars" category = "main" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" +python-versions = ">=3.6.8" + +[package.extras] +diagrams = ["railroad-diagrams", "jinja2"] + +[[package]] +name = "regex" +version = "2022.4.24" +description = "Alternative regular expression module, to replace re." +category = "main" +optional = false +python-versions = ">=3.6" [[package]] -name = "six" -version = "1.15.0" -description = "Python 2 and 3 compatibility utilities" +name = "semantic-version" +version = "2.9.0" +description = "A library implementing the 'SemVer' scheme." category = "main" optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*" +python-versions = ">=2.7" + +[package.extras] +dev = ["Django (>=1.11)", "nose2", "tox", "check-manifest", "coverage", "flake8", "wheel", "zest.releaser", "readme-renderer (<25.0)", "colorama (<=0.4.1)"] +doc = ["sphinx", "sphinx-rtd-theme"] [[package]] name = "smmap" @@ -168,12 +205,12 @@ optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" [[package]] -name = "toml" -version = "0.10.2" -description = "Python Library for Tom's Obvious, Minimal Language" +name = "tomli" +version = "2.0.1" +description = "A lil' TOML parser" category = "dev" optional = false -python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*" +python-versions = ">=3.7" [[package]] name = "typed-ast" @@ -183,6 +220,14 @@ category = "dev" optional = false python-versions = "*" +[[package]] +name = "typing-extensions" +version = "4.2.0" +description = "Backported and Experimental Type Hints for Python 3.7+" +category = "main" +optional = false +python-versions = ">=3.7" + [[package]] name = "wrapt" version = "1.12.1" @@ -194,63 +239,71 @@ python-versions = "*" [metadata] lock-version = "1.1" python-versions = "^3.7" -content-hash = "4e81758eea50ca323d2bc61bffbb90fdcd5fbdc468941de3ba08b2a1d9c0d69d" +content-hash = "c25b4f278e830271271a49e5b67ea5b53d5f1ede7c71de0c97dc7401c708fcaa" [metadata.files] astroid = [ - {file = "astroid-2.4.2-py3-none-any.whl", hash = "sha256:bc58d83eb610252fd8de6363e39d4f1d0619c894b0ed24603b881c02e64c7386"}, - {file = "astroid-2.4.2.tar.gz", hash = "sha256:2f4078c2a41bf377eea06d71c9d2ba4eb8f6b1af2135bec27bbbb7d8f12bb703"}, + {file = "astroid-2.11.5-py3-none-any.whl", hash = "sha256:14ffbb4f6aa2cf474a0834014005487f7ecd8924996083ab411e7fa0b508ce0b"}, + {file = "astroid-2.11.5.tar.gz", hash = "sha256:f4e4ec5294c4b07ac38bab9ca5ddd3914d4bf46f9006eb5c0ae755755061044e"}, ] colorama = [ {file = "colorama-0.4.4-py2.py3-none-any.whl", hash = "sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2"}, {file = "colorama-0.4.4.tar.gz", hash = "sha256:5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b"}, ] coverage = [ - {file = "coverage-5.3-cp27-cp27m-macosx_10_13_intel.whl", hash = "sha256:bd3166bb3b111e76a4f8e2980fa1addf2920a4ca9b2b8ca36a3bc3dedc618270"}, - {file = "coverage-5.3-cp27-cp27m-macosx_10_9_x86_64.whl", hash = "sha256:9342dd70a1e151684727c9c91ea003b2fb33523bf19385d4554f7897ca0141d4"}, - {file = "coverage-5.3-cp27-cp27m-manylinux1_i686.whl", hash = "sha256:63808c30b41f3bbf65e29f7280bf793c79f54fb807057de7e5238ffc7cc4d7b9"}, - {file = "coverage-5.3-cp27-cp27m-manylinux1_x86_64.whl", hash = "sha256:4d6a42744139a7fa5b46a264874a781e8694bb32f1d76d8137b68138686f1729"}, - {file = "coverage-5.3-cp27-cp27m-win32.whl", hash = "sha256:86e9f8cd4b0cdd57b4ae71a9c186717daa4c5a99f3238a8723f416256e0b064d"}, - {file = "coverage-5.3-cp27-cp27m-win_amd64.whl", hash = "sha256:7858847f2d84bf6e64c7f66498e851c54de8ea06a6f96a32a1d192d846734418"}, - {file = "coverage-5.3-cp27-cp27mu-manylinux1_i686.whl", hash = "sha256:530cc8aaf11cc2ac7430f3614b04645662ef20c348dce4167c22d99bec3480e9"}, - {file = "coverage-5.3-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:381ead10b9b9af5f64646cd27107fb27b614ee7040bb1226f9c07ba96625cbb5"}, - {file = "coverage-5.3-cp35-cp35m-macosx_10_13_x86_64.whl", hash = "sha256:71b69bd716698fa62cd97137d6f2fdf49f534decb23a2c6fc80813e8b7be6822"}, - {file = "coverage-5.3-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:1d44bb3a652fed01f1f2c10d5477956116e9b391320c94d36c6bf13b088a1097"}, - {file = "coverage-5.3-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:1c6703094c81fa55b816f5ae542c6ffc625fec769f22b053adb42ad712d086c9"}, - {file = "coverage-5.3-cp35-cp35m-win32.whl", hash = "sha256:cedb2f9e1f990918ea061f28a0f0077a07702e3819602d3507e2ff98c8d20636"}, - {file = "coverage-5.3-cp35-cp35m-win_amd64.whl", hash = "sha256:7f43286f13d91a34fadf61ae252a51a130223c52bfefb50310d5b2deb062cf0f"}, - {file = "coverage-5.3-cp36-cp36m-macosx_10_13_x86_64.whl", hash = "sha256:c851b35fc078389bc16b915a0a7c1d5923e12e2c5aeec58c52f4aa8085ac8237"}, - {file = "coverage-5.3-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:aac1ba0a253e17889550ddb1b60a2063f7474155465577caa2a3b131224cfd54"}, - {file = "coverage-5.3-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:2b31f46bf7b31e6aa690d4c7a3d51bb262438c6dcb0d528adde446531d0d3bb7"}, - {file = "coverage-5.3-cp36-cp36m-win32.whl", hash = "sha256:c5f17ad25d2c1286436761b462e22b5020d83316f8e8fcb5deb2b3151f8f1d3a"}, - {file = "coverage-5.3-cp36-cp36m-win_amd64.whl", hash = "sha256:aef72eae10b5e3116bac6957de1df4d75909fc76d1499a53fb6387434b6bcd8d"}, - {file = "coverage-5.3-cp37-cp37m-macosx_10_13_x86_64.whl", hash = "sha256:e8caf961e1b1a945db76f1b5fa9c91498d15f545ac0ababbe575cfab185d3bd8"}, - {file = "coverage-5.3-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:29a6272fec10623fcbe158fdf9abc7a5fa032048ac1d8631f14b50fbfc10d17f"}, - {file = "coverage-5.3-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:2d43af2be93ffbad25dd959899b5b809618a496926146ce98ee0b23683f8c51c"}, - {file = "coverage-5.3-cp37-cp37m-win32.whl", hash = "sha256:c3888a051226e676e383de03bf49eb633cd39fc829516e5334e69b8d81aae751"}, - {file = "coverage-5.3-cp37-cp37m-win_amd64.whl", hash = "sha256:9669179786254a2e7e57f0ecf224e978471491d660aaca833f845b72a2df3709"}, - {file = "coverage-5.3-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:0203acd33d2298e19b57451ebb0bed0ab0c602e5cf5a818591b4918b1f97d516"}, - {file = "coverage-5.3-cp38-cp38-manylinux1_i686.whl", hash = "sha256:582ddfbe712025448206a5bc45855d16c2e491c2dd102ee9a2841418ac1c629f"}, - {file = "coverage-5.3-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:0f313707cdecd5cd3e217fc68c78a960b616604b559e9ea60cc16795c4304259"}, - {file = "coverage-5.3-cp38-cp38-win32.whl", hash = "sha256:78e93cc3571fd928a39c0b26767c986188a4118edc67bc0695bc7a284da22e82"}, - {file = "coverage-5.3-cp38-cp38-win_amd64.whl", hash = "sha256:8f264ba2701b8c9f815b272ad568d555ef98dfe1576802ab3149c3629a9f2221"}, - {file = "coverage-5.3-cp39-cp39-macosx_10_13_x86_64.whl", hash = "sha256:50691e744714856f03a86df3e2bff847c2acede4c191f9a1da38f088df342978"}, - {file = "coverage-5.3-cp39-cp39-manylinux1_i686.whl", hash = "sha256:9361de40701666b034c59ad9e317bae95c973b9ff92513dd0eced11c6adf2e21"}, - {file = "coverage-5.3-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:c1b78fb9700fc961f53386ad2fd86d87091e06ede5d118b8a50dea285a071c24"}, - {file = "coverage-5.3-cp39-cp39-win32.whl", hash = "sha256:cb7df71de0af56000115eafd000b867d1261f786b5eebd88a0ca6360cccfaca7"}, - {file = "coverage-5.3-cp39-cp39-win_amd64.whl", hash = "sha256:47a11bdbd8ada9b7ee628596f9d97fbd3851bd9999d398e9436bd67376dbece7"}, - {file = "coverage-5.3.tar.gz", hash = "sha256:280baa8ec489c4f542f8940f9c4c2181f0306a8ee1a54eceba071a449fb870a0"}, + {file = "coverage-6.4-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:50ed480b798febce113709846b11f5d5ed1e529c88d8ae92f707806c50297abf"}, + {file = "coverage-6.4-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:26f8f92699756cb7af2b30720de0c5bb8d028e923a95b6d0c891088025a1ac8f"}, + {file = "coverage-6.4-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:60c2147921da7f4d2d04f570e1838db32b95c5509d248f3fe6417e91437eaf41"}, + {file = "coverage-6.4-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:750e13834b597eeb8ae6e72aa58d1d831b96beec5ad1d04479ae3772373a8088"}, + {file = "coverage-6.4-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:af5b9ee0fc146e907aa0f5fb858c3b3da9199d78b7bb2c9973d95550bd40f701"}, + {file = "coverage-6.4-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:a022394996419142b33a0cf7274cb444c01d2bb123727c4bb0b9acabcb515dea"}, + {file = "coverage-6.4-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:5a78cf2c43b13aa6b56003707c5203f28585944c277c1f3f109c7b041b16bd39"}, + {file = "coverage-6.4-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:9229d074e097f21dfe0643d9d0140ee7433814b3f0fc3706b4abffd1e3038632"}, + {file = "coverage-6.4-cp310-cp310-win32.whl", hash = "sha256:fb45fe08e1abc64eb836d187b20a59172053999823f7f6ef4f18a819c44ba16f"}, + {file = "coverage-6.4-cp310-cp310-win_amd64.whl", hash = "sha256:3cfd07c5889ddb96a401449109a8b97a165be9d67077df6802f59708bfb07720"}, + {file = "coverage-6.4-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:03014a74023abaf5a591eeeaf1ac66a73d54eba178ff4cb1fa0c0a44aae70383"}, + {file = "coverage-6.4-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9c82f2cd69c71698152e943f4a5a6b83a3ab1db73b88f6e769fabc86074c3b08"}, + {file = "coverage-6.4-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7b546cf2b1974ddc2cb222a109b37c6ed1778b9be7e6b0c0bc0cf0438d9e45a6"}, + {file = "coverage-6.4-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:cc173f1ce9ffb16b299f51c9ce53f66a62f4d975abe5640e976904066f3c835d"}, + {file = "coverage-6.4-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:c53ad261dfc8695062fc8811ac7c162bd6096a05a19f26097f411bdf5747aee7"}, + {file = "coverage-6.4-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:eef5292b60b6de753d6e7f2d128d5841c7915fb1e3321c3a1fe6acfe76c38052"}, + {file = "coverage-6.4-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:543e172ce4c0de533fa892034cce260467b213c0ea8e39da2f65f9a477425211"}, + {file = "coverage-6.4-cp37-cp37m-win32.whl", hash = "sha256:00c8544510f3c98476bbd58201ac2b150ffbcce46a8c3e4fb89ebf01998f806a"}, + {file = "coverage-6.4-cp37-cp37m-win_amd64.whl", hash = "sha256:b84ab65444dcc68d761e95d4d70f3cfd347ceca5a029f2ffec37d4f124f61311"}, + {file = "coverage-6.4-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:d548edacbf16a8276af13063a2b0669d58bbcfca7c55a255f84aac2870786a61"}, + {file = "coverage-6.4-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:033ebec282793bd9eb988d0271c211e58442c31077976c19c442e24d827d356f"}, + {file = "coverage-6.4-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:742fb8b43835078dd7496c3c25a1ec8d15351df49fb0037bffb4754291ef30ce"}, + {file = "coverage-6.4-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d55fae115ef9f67934e9f1103c9ba826b4c690e4c5bcf94482b8b2398311bf9c"}, + {file = "coverage-6.4-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5cd698341626f3c77784858427bad0cdd54a713115b423d22ac83a28303d1d95"}, + {file = "coverage-6.4-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:62d382f7d77eeeaff14b30516b17bcbe80f645f5cf02bb755baac376591c653c"}, + {file = "coverage-6.4-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:016d7f5cf1c8c84f533a3c1f8f36126fbe00b2ec0ccca47cc5731c3723d327c6"}, + {file = "coverage-6.4-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:69432946f154c6add0e9ede03cc43b96e2ef2733110a77444823c053b1ff5166"}, + {file = "coverage-6.4-cp38-cp38-win32.whl", hash = "sha256:83bd142cdec5e4a5c4ca1d4ff6fa807d28460f9db919f9f6a31babaaa8b88426"}, + {file = "coverage-6.4-cp38-cp38-win_amd64.whl", hash = "sha256:4002f9e8c1f286e986fe96ec58742b93484195defc01d5cc7809b8f7acb5ece3"}, + {file = "coverage-6.4-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:e4f52c272fdc82e7c65ff3f17a7179bc5f710ebc8ce8a5cadac81215e8326740"}, + {file = "coverage-6.4-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:b5578efe4038be02d76c344007b13119b2b20acd009a88dde8adec2de4f630b5"}, + {file = "coverage-6.4-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d8099ea680201c2221f8468c372198ceba9338a5fec0e940111962b03b3f716a"}, + {file = "coverage-6.4-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a00441f5ea4504f5abbc047589d09e0dc33eb447dc45a1a527c8b74bfdd32c65"}, + {file = "coverage-6.4-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2e76bd16f0e31bc2b07e0fb1379551fcd40daf8cdf7e24f31a29e442878a827c"}, + {file = "coverage-6.4-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:8d2e80dd3438e93b19e1223a9850fa65425e77f2607a364b6fd134fcd52dc9df"}, + {file = "coverage-6.4-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:341e9c2008c481c5c72d0e0dbf64980a4b2238631a7f9780b0fe2e95755fb018"}, + {file = "coverage-6.4-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:21e6686a95025927775ac501e74f5940cdf6fe052292f3a3f7349b0abae6d00f"}, + {file = "coverage-6.4-cp39-cp39-win32.whl", hash = "sha256:968ed5407f9460bd5a591cefd1388cc00a8f5099de9e76234655ae48cfdbe2c3"}, + {file = "coverage-6.4-cp39-cp39-win_amd64.whl", hash = "sha256:e35217031e4b534b09f9b9a5841b9344a30a6357627761d4218818b865d45055"}, + {file = "coverage-6.4-pp36.pp37.pp38-none-any.whl", hash = "sha256:e637ae0b7b481905358624ef2e81d7fb0b1af55f5ff99f9ba05442a444b11e45"}, + {file = "coverage-6.4.tar.gz", hash = "sha256:727dafd7f67a6e1cad808dc884bd9c5a2f6ef1f8f6d2f22b37b96cb0080d4f49"}, ] -erl-terms = [ - {file = "erl_terms-0.1.5.tar.gz", hash = "sha256:bd4157f6d34047248914ef3800e8715ecdef0e2ec93e3b8d83857614fe28b6f2"}, +dill = [ + {file = "dill-0.3.5.1-py2.py3-none-any.whl", hash = "sha256:33501d03270bbe410c72639b350e941882a8b0fd55357580fbc873fba0c59302"}, + {file = "dill-0.3.5.1.tar.gz", hash = "sha256:d75e41f3eff1eee599d738e76ba8f4ad98ea229db8b085318aa2b3333a208c86"}, ] gitdb = [ - {file = "gitdb-4.0.5-py3-none-any.whl", hash = "sha256:91f36bfb1ab7949b3b40e23736db18231bf7593edada2ba5c3a174a7b23657ac"}, - {file = "gitdb-4.0.5.tar.gz", hash = "sha256:c9e1f2d0db7ddb9a704c2a0217be31214e91a4fe1dea1efad19ae42ba0c285c9"}, + {file = "gitdb-4.0.9-py3-none-any.whl", hash = "sha256:8033ad4e853066ba6ca92050b9df2f89301b8fc8bf7e9324d412a63f8bf1a8fd"}, + {file = "gitdb-4.0.9.tar.gz", hash = "sha256:bac2fd45c0a1c9cf619e63a90d62bdc63892ef92387424b855792a6cabe789aa"}, ] gitpython = [ - {file = "GitPython-3.1.11-py3-none-any.whl", hash = "sha256:6eea89b655917b500437e9668e4a12eabdcf00229a0df1762aabd692ef9b746b"}, - {file = "GitPython-3.1.11.tar.gz", hash = "sha256:befa4d101f91bad1b632df4308ec64555db684c360bd7d2130b4807d49ce86b8"}, + {file = "GitPython-3.1.27-py3-none-any.whl", hash = "sha256:5b68b000463593e05ff2b261acff0ff0972df8ab1b70d3cdbd41b546c8b8fc3d"}, + {file = "GitPython-3.1.27.tar.gz", hash = "sha256:1c885ce809e8ba2d88a29befeb385fcea06338d3640712b59ca623c220bb5704"}, ] isort = [ {file = "isort-5.6.4-py3-none-any.whl", hash = "sha256:dcab1d98b469a12a1a624ead220584391648790275560e1a43e54c5dceae65e7"}, @@ -293,32 +346,112 @@ nose = [ {file = "nose-1.3.7-py3-none-any.whl", hash = "sha256:9ff7c6cc443f8c51994b34a667bbcf45afd6d945be7477b52e97516fd17c53ac"}, {file = "nose-1.3.7.tar.gz", hash = "sha256:f1bffef9cbc82628f6e7d7b40d7e255aefaa1adb6a1b1d26c69a8b79e6208a98"}, ] +packaging = [ + {file = "packaging-21.3-py3-none-any.whl", hash = "sha256:ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522"}, + {file = "packaging-21.3.tar.gz", hash = "sha256:dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb"}, +] parsimonious = [ - {file = "parsimonious-0.7.0.tar.gz", hash = "sha256:396d424f64f834f9463e81ba79a331661507a21f1ed7b644f7f6a744006fd938"}, + {file = "parsimonious-0.9.0.tar.gz", hash = "sha256:b2ad1ae63a2f65bd78f5e0a8ac510a98f3607a43f1db2a8d46636a5d9e4a30c1"}, ] -pycodestyle = [ - {file = "pycodestyle-2.6.0-py2.py3-none-any.whl", hash = "sha256:2295e7b2f6b5bd100585ebcb1f616591b652db8a741695b3d8f5d28bdc934367"}, - {file = "pycodestyle-2.6.0.tar.gz", hash = "sha256:c58a7d2815e0e8d7972bf1803331fb0152f867bd89adf8a01dfd55085434192e"}, +platformdirs = [ + {file = "platformdirs-2.5.2-py3-none-any.whl", hash = "sha256:027d8e83a2d7de06bbac4e5ef7e023c02b863d7ea5d079477e722bb41ab25788"}, + {file = "platformdirs-2.5.2.tar.gz", hash = "sha256:58c8abb07dcb441e6ee4b11d8df0ac856038f944ab98b7be6b27b2a3c7feef19"}, ] pylint = [ - {file = "pylint-2.6.0-py3-none-any.whl", hash = "sha256:bfe68f020f8a0fece830a22dd4d5dddb4ecc6137db04face4c3420a46a52239f"}, - {file = "pylint-2.6.0.tar.gz", hash = "sha256:bb4a908c9dadbc3aac18860550e870f58e1a02c9f2c204fdf5693d73be061210"}, + {file = "pylint-2.13.9-py3-none-any.whl", hash = "sha256:705c620d388035bdd9ff8b44c5bcdd235bfb49d276d488dd2c8ff1736aa42526"}, + {file = "pylint-2.13.9.tar.gz", hash = "sha256:095567c96e19e6f57b5b907e67d265ff535e588fe26b12b5ebe1fc5645b2c731"}, ] -semantic-version = [ - {file = "semantic_version-2.8.5-py2.py3-none-any.whl", hash = "sha256:45e4b32ee9d6d70ba5f440ec8cc5221074c7f4b0e8918bdab748cc37912440a9"}, - {file = "semantic_version-2.8.5.tar.gz", hash = "sha256:d2cb2de0558762934679b9a104e82eca7af448c9f4974d1f3eeccff651df8a54"}, +pyparsing = [ + {file = "pyparsing-3.0.9-py3-none-any.whl", hash = "sha256:5026bae9a10eeaefb61dab2f09052b9f4307d44aee4eda64b309723d8d206bbc"}, + {file = "pyparsing-3.0.9.tar.gz", hash = "sha256:2b020ecf7d21b687f219b71ecad3631f644a47f01403fa1d1036b0c6416d70fb"}, +] +regex = [ + {file = "regex-2022.4.24-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:f86aef546add4ff1202e1f31e9bb54f9268f17d996b2428877283146bf9bc013"}, + {file = "regex-2022.4.24-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:e944268445b5694f5d41292c9228f0ca46d5a32a67f195d5f8547c1f1d91f4bc"}, + {file = "regex-2022.4.24-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0f8da3145f4b72f7ce6181c804eaa44cdcea313c8998cdade3d9e20a8717a9cb"}, + {file = "regex-2022.4.24-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:0fd464e547dbabf4652ca5fe9d88d75ec30182981e737c07b3410235a44b9939"}, + {file = "regex-2022.4.24-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:071bcb625e890f28b7c4573124a6512ea65107152b1d3ca101ce33a52dad4593"}, + {file = "regex-2022.4.24-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1c2de7f32fa87d04d40f54bce3843af430697aba51c3a114aa62837a0772f219"}, + {file = "regex-2022.4.24-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1a07e8366115069f26822c47732122ab61598830a69f5629a37ea8881487c107"}, + {file = "regex-2022.4.24-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:036d1c1fbe69eba3ee253c107e71749cdbb4776db93d674bc0d5e28f30300734"}, + {file = "regex-2022.4.24-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:af1e687ffab18a75409e5e5d6215b6ccd41a5a1a0ea6ce9665e01253f737a0d3"}, + {file = "regex-2022.4.24-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:165cc75cfa5aa0f12adb2ac6286330e7229a06dc0e6c004ec35da682b5b89579"}, + {file = "regex-2022.4.24-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:3e35c50b27f36176c792738cb9b858523053bc495044d2c2b44db24376b266f1"}, + {file = "regex-2022.4.24-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:43ee0df35925ae4b0cc6ee3f60b73369e559dd2ac40945044da9394dd9d3a51d"}, + {file = "regex-2022.4.24-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:58521abdab76583bd41ef47e5e2ddd93b32501aee4ee8cee71dee10a45ba46b1"}, + {file = "regex-2022.4.24-cp310-cp310-win32.whl", hash = "sha256:275afc7352982ee947fc88f67a034b52c78395977b5fc7c9be15f7dc95b76f06"}, + {file = "regex-2022.4.24-cp310-cp310-win_amd64.whl", hash = "sha256:253f858a0255cd91a0424a4b15c2eedb12f20274f85731b0d861c8137e843065"}, + {file = "regex-2022.4.24-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:85b7ee4d0c7a46296d884f6b489af8b960c4291d76aea4b22fd4fbe05e6ec08e"}, + {file = "regex-2022.4.24-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8e0da7ef160d4f3eb3d4d3e39a02c3c42f7dbcfce62c81f784cc99fc7059765f"}, + {file = "regex-2022.4.24-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:4f2e2cef324ca9355049ee1e712f68e2e92716eba24275e6767b9bfa15f1f478"}, + {file = "regex-2022.4.24-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:6165e737acb3bea3271372e8aa5ebe7226c8a8e8da1b94af2d6547c5a09d689d"}, + {file = "regex-2022.4.24-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3f6bd8178cce5bb56336722d5569d19c50bba5915a69a2050c497fb921e7cb0f"}, + {file = "regex-2022.4.24-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:45b761406777a681db0c24686178532134c937d24448d9e085279b69e9eb7da4"}, + {file = "regex-2022.4.24-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:3dfbadb7b74d95f72f9f9dbf9778f7de92722ab520a109ceaf7927461fa85b10"}, + {file = "regex-2022.4.24-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:9913bcf730eb6e9b441fb176832eea9acbebab6035542c7c89d90c803f5cd3be"}, + {file = "regex-2022.4.24-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:68aed3fb0c61296bd6d234f558f78c51671f79ccb069cbcd428c2eea6fee7a5b"}, + {file = "regex-2022.4.24-cp36-cp36m-musllinux_1_1_ppc64le.whl", hash = "sha256:8e7d33f93cdd01868327d834d0f5bb029241cd293b47d51b96814dec27fc9b4b"}, + {file = "regex-2022.4.24-cp36-cp36m-musllinux_1_1_s390x.whl", hash = "sha256:82b7fc67e49fdce671bdbec1127189fc979badf062ce6e79dc95ef5e07a8bf92"}, + {file = "regex-2022.4.24-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:c36906a7855ec33a9083608e6cd595e4729dab18aeb9aad0dd0b039240266239"}, + {file = "regex-2022.4.24-cp36-cp36m-win32.whl", hash = "sha256:b2df3ede85d778c949d9bd2a50237072cee3df0a423c91f5514f78f8035bde87"}, + {file = "regex-2022.4.24-cp36-cp36m-win_amd64.whl", hash = "sha256:dffd9114ade73137ab2b79a8faf864683dbd2dbbb6b23a305fbbd4cbaeeb2187"}, + {file = "regex-2022.4.24-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:6a0ef57cccd8089b4249eebad95065390e56c04d4a92c51316eab4131bca96a9"}, + {file = "regex-2022.4.24-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:12af15b6edb00e425f713160cfd361126e624ec0de86e74f7cad4b97b7f169b3"}, + {file = "regex-2022.4.24-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:7f271d0831d8ebc56e17b37f9fa1824b0379221d1238ae77c18a6e8c47f1fdce"}, + {file = "regex-2022.4.24-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:37903d5ca11fa47577e8952d2e2c6de28553b11c70defee827afb941ab2c6729"}, + {file = "regex-2022.4.24-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8b747cef8e5dcdaf394192d43a0c02f5825aeb0ecd3d43e63ae500332ab830b0"}, + {file = "regex-2022.4.24-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:582ea06079a03750b5f71e20a87cd99e646d796638b5894ff85987ebf5e04924"}, + {file = "regex-2022.4.24-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:aa6daa189db9104787ff1fd7a7623ce017077aa59eaac609d0d25ba95ed251a0"}, + {file = "regex-2022.4.24-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:7dbc96419ef0fb6ac56626014e6d3a345aeb8b17a3df8830235a88626ffc8d84"}, + {file = "regex-2022.4.24-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:0fb6cb16518ac7eff29d1e0b0cce90275dfae0f17154165491058c31d58bdd1d"}, + {file = "regex-2022.4.24-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:bea61de0c688198e3d9479344228c7accaa22a78b58ec408e41750ebafee6c08"}, + {file = "regex-2022.4.24-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:46cbc5b23f85e94161b093dba1b49035697cf44c7db3c930adabfc0e6d861b95"}, + {file = "regex-2022.4.24-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:50b77622016f03989cd06ecf6b602c7a6b4ed2e3ce04133876b041d109c934ee"}, + {file = "regex-2022.4.24-cp37-cp37m-win32.whl", hash = "sha256:2bde99f2cdfd6db1ec7e02d68cadd384ffe7413831373ea7cc68c5415a0cb577"}, + {file = "regex-2022.4.24-cp37-cp37m-win_amd64.whl", hash = "sha256:66fb765b2173d90389384708e3e1d3e4be1148bd8d4d50476b1469da5a2f0229"}, + {file = "regex-2022.4.24-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:709396c0c95b95045fac89b94f997410ff39b81a09863fe21002f390d48cc7d3"}, + {file = "regex-2022.4.24-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:7a608022f4593fc67518c6c599ae5abdb03bb8acd75993c82cd7a4c8100eff81"}, + {file = "regex-2022.4.24-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:fb7107faf0168de087f62a2f2ed00f9e9da12e0b801582b516ddac236b871cda"}, + {file = "regex-2022.4.24-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:aabc28f7599f781ddaeac168d0b566d0db82182cc3dcf62129f0a4fc2927b811"}, + {file = "regex-2022.4.24-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:92ad03f928675ca05b79d3b1d3dfc149e2226d57ed9d57808f82105d511d0212"}, + {file = "regex-2022.4.24-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b7ba3c304a4a5d8112dbd30df8b3e4ef59b4b07807957d3c410d9713abaee9a8"}, + {file = "regex-2022.4.24-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e2acf5c66fbb62b5fe4c40978ddebafa50818f00bf79d60569d9762f6356336e"}, + {file = "regex-2022.4.24-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:7c4d9770e579eb11b582b2e2fd19fa204a15cb1589ae73cd4dcbb63b64f3e828"}, + {file = "regex-2022.4.24-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:02543d6d5c32d361b7cc468079ba4cddaaf4a6544f655901ba1ff9d8e3f18755"}, + {file = "regex-2022.4.24-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:73ed1b06abadbf6b61f6033a07c06f36ec0ddca117e41ef2ac37056705e46458"}, + {file = "regex-2022.4.24-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:3241db067a7f69da57fba8bca543ac8a7ca415d91e77315690202749b9fdaba1"}, + {file = "regex-2022.4.24-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:d128e278e5e554c5c022c7bed410ca851e00bacebbb4460de546a73bc53f8de4"}, + {file = "regex-2022.4.24-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:b1d53835922cd0f9b74b2742453a444865a70abae38d12eb41c59271da66f38d"}, + {file = "regex-2022.4.24-cp38-cp38-win32.whl", hash = "sha256:f2a5d9f612091812dee18375a45d046526452142e7b78c4e21ab192db15453d5"}, + {file = "regex-2022.4.24-cp38-cp38-win_amd64.whl", hash = "sha256:a850f5f369f1e3b6239da7fb43d1d029c1e178263df671819889c47caf7e4ff3"}, + {file = "regex-2022.4.24-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:bedb3d01ad35ea1745bdb1d57f3ee0f996f988c98f5bbae9d068c3bb3065d210"}, + {file = "regex-2022.4.24-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:8bf867ba71856414a482e4b683500f946c300c4896e472e51d3db8dfa8dc8f32"}, + {file = "regex-2022.4.24-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b415b82e5be7389ec5ee7ee35431e4a549ea327caacf73b697c6b3538cb5c87f"}, + {file = "regex-2022.4.24-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:9dae5affbb66178dad6c6fd5b02221ca9917e016c75ee3945e9a9563eb1fbb6f"}, + {file = "regex-2022.4.24-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:e65580ae3137bce712f505ec7c2d700aef0014a3878c4767b74aff5895fc454f"}, + {file = "regex-2022.4.24-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3e9e983fc8e0d4d5ded7caa5aed39ca2cf6026d7e39801ef6f0af0b1b6cd9276"}, + {file = "regex-2022.4.24-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:cfad3a770839aa456ff9a9aa0e253d98b628d005a3ccb37da1ff9be7c84fee16"}, + {file = "regex-2022.4.24-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:ed625205f5f26984382b68e4cbcbc08e6603c9e84c14b38457170b0cc71c823b"}, + {file = "regex-2022.4.24-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:c4fdf837666f7793a5c3cfa2f2f39f03eb6c7e92e831bc64486c2f547580c2b3"}, + {file = "regex-2022.4.24-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:ed26c3d2d62c6588e0dad175b8d8cc0942a638f32d07b80f92043e5d73b7db67"}, + {file = "regex-2022.4.24-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:f89d26e50a4c7453cb8c415acd09e72fbade2610606a9c500a1e48c43210a42d"}, + {file = "regex-2022.4.24-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:97af238389cb029d63d5f2d931a7e8f5954ad96e812de5faaed373b68e74df86"}, + {file = "regex-2022.4.24-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:be392d9cd5309509175a9d7660dc17bf57084501108dbff0c5a8bfc3646048c3"}, + {file = "regex-2022.4.24-cp39-cp39-win32.whl", hash = "sha256:bcc6f7a3a95119c3568c572ca167ada75f8319890706283b9ba59b3489c9bcb3"}, + {file = "regex-2022.4.24-cp39-cp39-win_amd64.whl", hash = "sha256:5b9c7b6895a01204296e9523b3e12b43e013835a9de035a783907c2c1bc447f0"}, + {file = "regex-2022.4.24.tar.gz", hash = "sha256:92183e9180c392371079262879c6532ccf55f808e6900df5d9f03c9ca8807255"}, ] -six = [ - {file = "six-1.15.0-py2.py3-none-any.whl", hash = "sha256:8b74bedcbbbaca38ff6d7491d76f2b06b3592611af620f8426e82dddb04a5ced"}, - {file = "six-1.15.0.tar.gz", hash = "sha256:30639c035cdb23534cd4aa2dd52c3bf48f06e5f4a941509c8bafd8ce11080259"}, +semantic-version = [ + {file = "semantic_version-2.9.0-py2.py3-none-any.whl", hash = "sha256:db2504ab37902dd2c9876ece53567aa43a5b2a417fbe188097b2048fff46da3d"}, + {file = "semantic_version-2.9.0.tar.gz", hash = "sha256:abf54873553e5e07a6fd4d5f653b781f5ae41297a493666b59dcf214006a12b2"}, ] smmap = [ {file = "smmap-3.0.4-py2.py3-none-any.whl", hash = "sha256:54c44c197c819d5ef1991799a7e30b662d1e520f2ac75c9efbeb54a742214cf4"}, {file = "smmap-3.0.4.tar.gz", hash = "sha256:9c98bbd1f9786d22f14b3d4126894d56befb835ec90cef151af566c7e19b5d24"}, ] -toml = [ - {file = "toml-0.10.2-py2.py3-none-any.whl", hash = "sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b"}, - {file = "toml-0.10.2.tar.gz", hash = "sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f"}, +tomli = [ + {file = "tomli-2.0.1-py3-none-any.whl", hash = "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc"}, + {file = "tomli-2.0.1.tar.gz", hash = "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"}, ] typed-ast = [ {file = "typed_ast-1.4.1-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:73d785a950fc82dd2a25897d525d003f6378d1cb23ab305578394694202a58c3"}, @@ -328,21 +461,34 @@ typed-ast = [ {file = "typed_ast-1.4.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:269151951236b0f9a6f04015a9004084a5ab0d5f19b57de779f908621e7d8b75"}, {file = "typed_ast-1.4.1-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:24995c843eb0ad11a4527b026b4dde3da70e1f2d8806c99b7b4a7cf491612652"}, {file = "typed_ast-1.4.1-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:fe460b922ec15dd205595c9b5b99e2f056fd98ae8f9f56b888e7a17dc2b757e7"}, + {file = "typed_ast-1.4.1-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:fcf135e17cc74dbfbc05894ebca928ffeb23d9790b3167a674921db19082401f"}, {file = "typed_ast-1.4.1-cp36-cp36m-win32.whl", hash = "sha256:4e3e5da80ccbebfff202a67bf900d081906c358ccc3d5e3c8aea42fdfdfd51c1"}, {file = "typed_ast-1.4.1-cp36-cp36m-win_amd64.whl", hash = "sha256:249862707802d40f7f29f6e1aad8d84b5aa9e44552d2cc17384b209f091276aa"}, {file = "typed_ast-1.4.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:8ce678dbaf790dbdb3eba24056d5364fb45944f33553dd5869b7580cdbb83614"}, {file = "typed_ast-1.4.1-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:c9e348e02e4d2b4a8b2eedb48210430658df6951fa484e59de33ff773fbd4b41"}, {file = "typed_ast-1.4.1-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:bcd3b13b56ea479b3650b82cabd6b5343a625b0ced5429e4ccad28a8973f301b"}, + {file = "typed_ast-1.4.1-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:f208eb7aff048f6bea9586e61af041ddf7f9ade7caed625742af423f6bae3298"}, {file = "typed_ast-1.4.1-cp37-cp37m-win32.whl", hash = "sha256:d5d33e9e7af3b34a40dc05f498939f0ebf187f07c385fd58d591c533ad8562fe"}, {file = "typed_ast-1.4.1-cp37-cp37m-win_amd64.whl", hash = "sha256:0666aa36131496aed8f7be0410ff974562ab7eeac11ef351def9ea6fa28f6355"}, {file = "typed_ast-1.4.1-cp38-cp38-macosx_10_15_x86_64.whl", hash = "sha256:d205b1b46085271b4e15f670058ce182bd1199e56b317bf2ec004b6a44f911f6"}, {file = "typed_ast-1.4.1-cp38-cp38-manylinux1_i686.whl", hash = "sha256:6daac9731f172c2a22ade6ed0c00197ee7cc1221aa84cfdf9c31defeb059a907"}, {file = "typed_ast-1.4.1-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:498b0f36cc7054c1fead3d7fc59d2150f4d5c6c56ba7fb150c013fbc683a8d2d"}, + {file = "typed_ast-1.4.1-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:7e4c9d7658aaa1fc80018593abdf8598bf91325af6af5cce4ce7c73bc45ea53d"}, {file = "typed_ast-1.4.1-cp38-cp38-win32.whl", hash = "sha256:715ff2f2df46121071622063fc7543d9b1fd19ebfc4f5c8895af64a77a8c852c"}, {file = "typed_ast-1.4.1-cp38-cp38-win_amd64.whl", hash = "sha256:fc0fea399acb12edbf8a628ba8d2312f583bdbdb3335635db062fa98cf71fca4"}, {file = "typed_ast-1.4.1-cp39-cp39-macosx_10_15_x86_64.whl", hash = "sha256:d43943ef777f9a1c42bf4e552ba23ac77a6351de620aa9acf64ad54933ad4d34"}, + {file = "typed_ast-1.4.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:92c325624e304ebf0e025d1224b77dd4e6393f18aab8d829b5b7e04afe9b7a2c"}, + {file = "typed_ast-1.4.1-cp39-cp39-manylinux1_i686.whl", hash = "sha256:d648b8e3bf2fe648745c8ffcee3db3ff903d0817a01a12dd6a6ea7a8f4889072"}, + {file = "typed_ast-1.4.1-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:fac11badff8313e23717f3dada86a15389d0708275bddf766cca67a84ead3e91"}, + {file = "typed_ast-1.4.1-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:0d8110d78a5736e16e26213114a38ca35cb15b6515d535413b090bd50951556d"}, + {file = "typed_ast-1.4.1-cp39-cp39-win32.whl", hash = "sha256:b52ccf7cfe4ce2a1064b18594381bccf4179c2ecf7f513134ec2f993dd4ab395"}, + {file = "typed_ast-1.4.1-cp39-cp39-win_amd64.whl", hash = "sha256:3742b32cf1c6ef124d57f95be609c473d7ec4c14d0090e5a5e05a15269fb4d0c"}, {file = "typed_ast-1.4.1.tar.gz", hash = "sha256:8c8aaad94455178e3187ab22c8b01a3837f8ee50e09cf31f1ba129eb293ec30b"}, ] +typing-extensions = [ + {file = "typing_extensions-4.2.0-py3-none-any.whl", hash = "sha256:6657594ee297170d19f67d55c05852a874e7eb634f4f753dbd667855e07c1708"}, + {file = "typing_extensions-4.2.0.tar.gz", hash = "sha256:f1c24655a0da0d1b67f07e17a5e6b2a105894e6824b92096378bb3668ef02376"}, +] wrapt = [ {file = "wrapt-1.12.1.tar.gz", hash = "sha256:b62ffa81fb85f4332a4f609cab4ac40709470da05643a082ec1eb88e6d9b97d7"}, ] diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..c7a18c8 --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,26 @@ +[tool.poetry] +name = "avakas" +version = "1.0.19-pre.3" +description = "Interact with project version metadata" +authors = ["Jonathan Freedman "] +license = "MIT" + +[tool.poetry.dependencies] +python = "^3.7" +GitPython = "^3.1.27" +packaging = "^21.3" +semantic-version = "^2.9.0" +parsimonious = "^0.9.0" + +[tool.poetry.dev-dependencies] +gitdb = "^4.0.9" +GitPython = "^3.1.27" +loremipsum = "^1.0.5" +nose = "^1.3.7" +parsimonious = "^0.9.0" +pylint = "^2.13.9" +coverage = "^6.4" + +[build-system] +requires = ["poetry-core>=1.0.0"] +build-backend = "poetry.core.masonry.api" From 13c6e4df4d5222201cd80ce6a3c2f3e1777cb9ee Mon Sep 17 00:00:00 2001 From: Tyler Jachetta Date: Mon, 23 May 2022 06:48:37 -0700 Subject: [PATCH 31/33] Removed erlang references, erl-terms and some dependencies --- README.md | 16 +++--- avakas/flavors/__init__.py | 2 - avakas/flavors/erlang.py | 53 -------------------- poetry.lock | 100 +------------------------------------ pyproject.toml | 2 - requirements-dev.txt | 6 --- requirements.txt | 4 -- 7 files changed, 8 insertions(+), 175 deletions(-) delete mode 100644 avakas/flavors/erlang.py diff --git a/README.md b/README.md index 88c74c4..55de749 100644 --- a/README.md +++ b/README.md @@ -12,13 +12,12 @@ information for the project in a given directory. It is written with [semantic versioning](http://semver.org/) in mind. It currently does it's best to determine whether the given directory contains a -NodeJS, Erlang, Chef Cookbook, or Ansible project before just settling on -keeping the version in a file named `version`. If a NodeJS project is discovered -then the `package.json` will be edited. If an Ansible project is discovered then -no files will be modified but the tags will still be handled. The Erlang -detection is limited to OTP apps, and `avakas` will attempt to edit a rebar -style `foo.app.src`. If a Chef Cookbook is discovered then `avakas` will attempt -to modify the `version` attribute in `metadata.rb`. +NodeJS,Chef Cookbook, or Ansible project before just settling on keeping the +version in a file named `version`. If a NodeJS project is discovered then the +`package.json` will be edited. If an Ansible project is discovered then no +files will be modified but the tags will still be handled. If a Chef Cookbook +is discovered then `avakas` will attempt to modify the `version` attribute in +`metadata.rb`. The avakas tool makes a few assumptions @@ -30,7 +29,6 @@ The avakas tool makes a few assumptions The avakas tool supports the following types of version files * NodeJS `package.json` -* Erlang/OTP and rebar `foo.app.src` * Chef Cookbook `metadata.rb` * Ansible `meta/main.yml` * Plain ol' `version` file @@ -121,7 +119,7 @@ The filename to use for generating a version file. ## --flavor -Flavor of project (Presently: legacy|chef|ansible|nodejs|erlang). +Flavor of project (Presently: legacy|chef|ansible|nodejs). ## --build-meta diff --git a/avakas/flavors/__init__.py b/avakas/flavors/__init__.py index 86b2438..bca205e 100644 --- a/avakas/flavors/__init__.py +++ b/avakas/flavors/__init__.py @@ -5,14 +5,12 @@ from .base import AvakasLegacy from .ansible import AvakasAnsibleProject from .chef import AvakasChefProject -from .erlang import AvakasErlangProject from .git import AvakasGitNative from .node import AvakasNodeProject __all__ = [ 'AvakasAnsibleProject', 'AvakasChefProject', - 'AvakasErlangProject', 'AvakasGitNative', 'AvakasLegacy', 'AvakasNodeProject', diff --git a/avakas/flavors/erlang.py b/avakas/flavors/erlang.py deleted file mode 100644 index 1613ced..0000000 --- a/avakas/flavors/erlang.py +++ /dev/null @@ -1,53 +0,0 @@ -""" -Avakas Built-In Erlang Project Flavor -""" - -from glob import glob -from erl_terms import decode as erl_decode - -from avakas.flavors.base import AvakasLegacy -from avakas.avakas import register_flavor -from avakas.errors import AvakasError -from avakas.utils import match_and_rewrite_lines - - -@register_flavor('erlang') -class AvakasErlangProject(AvakasLegacy): - """ - Erlang Avakas Project Flavor - """ - PROJECT_TYPE = 'erlang' - - @classmethod - def guess_flavor(cls, directory): - return len(glob("%s/src/*.app.src" % directory)) == 1 - - def read(self): - app_file = glob("%s/src/*.app.src" % self.directory)[0] - version_handle = open(app_file, 'r') - erl_terms = erl_decode(version_handle.read()) - version_handle.close() - app_config = erl_terms[0][2] - erlang_version = None - for config in app_config: - if config[0] == 'vsn': - erlang_version = config[1] - - if not erlang_version: - raise AvakasError('Unable to determine Erlang version') - - self.version = erlang_version - return erlang_version - - def write(self): - app_file = glob("%s/src/*.app.src" % self.directory)[0] - app_handle = open(app_file, 'r') - lines, updated = match_and_rewrite_lines(r'(.+vsn.+")(.+)(".+)', - app_handle, self.version) - app_handle.close() - if not updated: - raise AvakasError('Unable to save Erlang version') - - app_handle = open(app_file, 'w') - app_handle.write(''.join(lines)) - app_handle.close() diff --git a/poetry.lock b/poetry.lock index a631677..8561d84 100644 --- a/poetry.lock +++ b/poetry.lock @@ -121,17 +121,6 @@ python-versions = ">=3.6" [package.dependencies] pyparsing = ">=2.0.2,<3.0.5 || >3.0.5" -[[package]] -name = "parsimonious" -version = "0.9.0" -description = "(Soon to be) the fastest pure-Python PEG parser I could muster" -category = "main" -optional = false -python-versions = "*" - -[package.dependencies] -regex = ">=2022.3.15" - [[package]] name = "platformdirs" version = "2.5.2" @@ -176,14 +165,6 @@ python-versions = ">=3.6.8" [package.extras] diagrams = ["railroad-diagrams", "jinja2"] -[[package]] -name = "regex" -version = "2022.4.24" -description = "Alternative regular expression module, to replace re." -category = "main" -optional = false -python-versions = ">=3.6" - [[package]] name = "semantic-version" version = "2.9.0" @@ -239,7 +220,7 @@ python-versions = "*" [metadata] lock-version = "1.1" python-versions = "^3.7" -content-hash = "c25b4f278e830271271a49e5b67ea5b53d5f1ede7c71de0c97dc7401c708fcaa" +content-hash = "93b92682ce87d52345b11ae02f513119a5a14c4ed54d5eca36f73651504e4022" [metadata.files] astroid = [ @@ -350,9 +331,6 @@ packaging = [ {file = "packaging-21.3-py3-none-any.whl", hash = "sha256:ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522"}, {file = "packaging-21.3.tar.gz", hash = "sha256:dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb"}, ] -parsimonious = [ - {file = "parsimonious-0.9.0.tar.gz", hash = "sha256:b2ad1ae63a2f65bd78f5e0a8ac510a98f3607a43f1db2a8d46636a5d9e4a30c1"}, -] platformdirs = [ {file = "platformdirs-2.5.2-py3-none-any.whl", hash = "sha256:027d8e83a2d7de06bbac4e5ef7e023c02b863d7ea5d079477e722bb41ab25788"}, {file = "platformdirs-2.5.2.tar.gz", hash = "sha256:58c8abb07dcb441e6ee4b11d8df0ac856038f944ab98b7be6b27b2a3c7feef19"}, @@ -365,82 +343,6 @@ pyparsing = [ {file = "pyparsing-3.0.9-py3-none-any.whl", hash = "sha256:5026bae9a10eeaefb61dab2f09052b9f4307d44aee4eda64b309723d8d206bbc"}, {file = "pyparsing-3.0.9.tar.gz", hash = "sha256:2b020ecf7d21b687f219b71ecad3631f644a47f01403fa1d1036b0c6416d70fb"}, ] -regex = [ - {file = "regex-2022.4.24-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:f86aef546add4ff1202e1f31e9bb54f9268f17d996b2428877283146bf9bc013"}, - {file = "regex-2022.4.24-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:e944268445b5694f5d41292c9228f0ca46d5a32a67f195d5f8547c1f1d91f4bc"}, - {file = "regex-2022.4.24-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0f8da3145f4b72f7ce6181c804eaa44cdcea313c8998cdade3d9e20a8717a9cb"}, - {file = "regex-2022.4.24-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:0fd464e547dbabf4652ca5fe9d88d75ec30182981e737c07b3410235a44b9939"}, - {file = "regex-2022.4.24-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:071bcb625e890f28b7c4573124a6512ea65107152b1d3ca101ce33a52dad4593"}, - {file = "regex-2022.4.24-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:1c2de7f32fa87d04d40f54bce3843af430697aba51c3a114aa62837a0772f219"}, - {file = "regex-2022.4.24-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1a07e8366115069f26822c47732122ab61598830a69f5629a37ea8881487c107"}, - {file = "regex-2022.4.24-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:036d1c1fbe69eba3ee253c107e71749cdbb4776db93d674bc0d5e28f30300734"}, - {file = "regex-2022.4.24-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:af1e687ffab18a75409e5e5d6215b6ccd41a5a1a0ea6ce9665e01253f737a0d3"}, - {file = "regex-2022.4.24-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:165cc75cfa5aa0f12adb2ac6286330e7229a06dc0e6c004ec35da682b5b89579"}, - {file = "regex-2022.4.24-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:3e35c50b27f36176c792738cb9b858523053bc495044d2c2b44db24376b266f1"}, - {file = "regex-2022.4.24-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:43ee0df35925ae4b0cc6ee3f60b73369e559dd2ac40945044da9394dd9d3a51d"}, - {file = "regex-2022.4.24-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:58521abdab76583bd41ef47e5e2ddd93b32501aee4ee8cee71dee10a45ba46b1"}, - {file = "regex-2022.4.24-cp310-cp310-win32.whl", hash = "sha256:275afc7352982ee947fc88f67a034b52c78395977b5fc7c9be15f7dc95b76f06"}, - {file = "regex-2022.4.24-cp310-cp310-win_amd64.whl", hash = "sha256:253f858a0255cd91a0424a4b15c2eedb12f20274f85731b0d861c8137e843065"}, - {file = "regex-2022.4.24-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:85b7ee4d0c7a46296d884f6b489af8b960c4291d76aea4b22fd4fbe05e6ec08e"}, - {file = "regex-2022.4.24-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8e0da7ef160d4f3eb3d4d3e39a02c3c42f7dbcfce62c81f784cc99fc7059765f"}, - {file = "regex-2022.4.24-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:4f2e2cef324ca9355049ee1e712f68e2e92716eba24275e6767b9bfa15f1f478"}, - {file = "regex-2022.4.24-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:6165e737acb3bea3271372e8aa5ebe7226c8a8e8da1b94af2d6547c5a09d689d"}, - {file = "regex-2022.4.24-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3f6bd8178cce5bb56336722d5569d19c50bba5915a69a2050c497fb921e7cb0f"}, - {file = "regex-2022.4.24-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:45b761406777a681db0c24686178532134c937d24448d9e085279b69e9eb7da4"}, - {file = "regex-2022.4.24-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:3dfbadb7b74d95f72f9f9dbf9778f7de92722ab520a109ceaf7927461fa85b10"}, - {file = "regex-2022.4.24-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:9913bcf730eb6e9b441fb176832eea9acbebab6035542c7c89d90c803f5cd3be"}, - {file = "regex-2022.4.24-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:68aed3fb0c61296bd6d234f558f78c51671f79ccb069cbcd428c2eea6fee7a5b"}, - {file = "regex-2022.4.24-cp36-cp36m-musllinux_1_1_ppc64le.whl", hash = "sha256:8e7d33f93cdd01868327d834d0f5bb029241cd293b47d51b96814dec27fc9b4b"}, - {file = "regex-2022.4.24-cp36-cp36m-musllinux_1_1_s390x.whl", hash = "sha256:82b7fc67e49fdce671bdbec1127189fc979badf062ce6e79dc95ef5e07a8bf92"}, - {file = "regex-2022.4.24-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:c36906a7855ec33a9083608e6cd595e4729dab18aeb9aad0dd0b039240266239"}, - {file = "regex-2022.4.24-cp36-cp36m-win32.whl", hash = "sha256:b2df3ede85d778c949d9bd2a50237072cee3df0a423c91f5514f78f8035bde87"}, - {file = "regex-2022.4.24-cp36-cp36m-win_amd64.whl", hash = "sha256:dffd9114ade73137ab2b79a8faf864683dbd2dbbb6b23a305fbbd4cbaeeb2187"}, - {file = "regex-2022.4.24-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:6a0ef57cccd8089b4249eebad95065390e56c04d4a92c51316eab4131bca96a9"}, - {file = "regex-2022.4.24-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:12af15b6edb00e425f713160cfd361126e624ec0de86e74f7cad4b97b7f169b3"}, - {file = "regex-2022.4.24-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:7f271d0831d8ebc56e17b37f9fa1824b0379221d1238ae77c18a6e8c47f1fdce"}, - {file = "regex-2022.4.24-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:37903d5ca11fa47577e8952d2e2c6de28553b11c70defee827afb941ab2c6729"}, - {file = "regex-2022.4.24-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8b747cef8e5dcdaf394192d43a0c02f5825aeb0ecd3d43e63ae500332ab830b0"}, - {file = "regex-2022.4.24-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:582ea06079a03750b5f71e20a87cd99e646d796638b5894ff85987ebf5e04924"}, - {file = "regex-2022.4.24-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:aa6daa189db9104787ff1fd7a7623ce017077aa59eaac609d0d25ba95ed251a0"}, - {file = "regex-2022.4.24-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:7dbc96419ef0fb6ac56626014e6d3a345aeb8b17a3df8830235a88626ffc8d84"}, - {file = "regex-2022.4.24-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:0fb6cb16518ac7eff29d1e0b0cce90275dfae0f17154165491058c31d58bdd1d"}, - {file = "regex-2022.4.24-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:bea61de0c688198e3d9479344228c7accaa22a78b58ec408e41750ebafee6c08"}, - {file = "regex-2022.4.24-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:46cbc5b23f85e94161b093dba1b49035697cf44c7db3c930adabfc0e6d861b95"}, - {file = "regex-2022.4.24-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:50b77622016f03989cd06ecf6b602c7a6b4ed2e3ce04133876b041d109c934ee"}, - {file = "regex-2022.4.24-cp37-cp37m-win32.whl", hash = "sha256:2bde99f2cdfd6db1ec7e02d68cadd384ffe7413831373ea7cc68c5415a0cb577"}, - {file = "regex-2022.4.24-cp37-cp37m-win_amd64.whl", hash = "sha256:66fb765b2173d90389384708e3e1d3e4be1148bd8d4d50476b1469da5a2f0229"}, - {file = "regex-2022.4.24-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:709396c0c95b95045fac89b94f997410ff39b81a09863fe21002f390d48cc7d3"}, - {file = "regex-2022.4.24-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:7a608022f4593fc67518c6c599ae5abdb03bb8acd75993c82cd7a4c8100eff81"}, - {file = "regex-2022.4.24-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:fb7107faf0168de087f62a2f2ed00f9e9da12e0b801582b516ddac236b871cda"}, - {file = "regex-2022.4.24-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:aabc28f7599f781ddaeac168d0b566d0db82182cc3dcf62129f0a4fc2927b811"}, - {file = "regex-2022.4.24-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:92ad03f928675ca05b79d3b1d3dfc149e2226d57ed9d57808f82105d511d0212"}, - {file = "regex-2022.4.24-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b7ba3c304a4a5d8112dbd30df8b3e4ef59b4b07807957d3c410d9713abaee9a8"}, - {file = "regex-2022.4.24-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e2acf5c66fbb62b5fe4c40978ddebafa50818f00bf79d60569d9762f6356336e"}, - {file = "regex-2022.4.24-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:7c4d9770e579eb11b582b2e2fd19fa204a15cb1589ae73cd4dcbb63b64f3e828"}, - {file = "regex-2022.4.24-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:02543d6d5c32d361b7cc468079ba4cddaaf4a6544f655901ba1ff9d8e3f18755"}, - {file = "regex-2022.4.24-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:73ed1b06abadbf6b61f6033a07c06f36ec0ddca117e41ef2ac37056705e46458"}, - {file = "regex-2022.4.24-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:3241db067a7f69da57fba8bca543ac8a7ca415d91e77315690202749b9fdaba1"}, - {file = "regex-2022.4.24-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:d128e278e5e554c5c022c7bed410ca851e00bacebbb4460de546a73bc53f8de4"}, - {file = "regex-2022.4.24-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:b1d53835922cd0f9b74b2742453a444865a70abae38d12eb41c59271da66f38d"}, - {file = "regex-2022.4.24-cp38-cp38-win32.whl", hash = "sha256:f2a5d9f612091812dee18375a45d046526452142e7b78c4e21ab192db15453d5"}, - {file = "regex-2022.4.24-cp38-cp38-win_amd64.whl", hash = "sha256:a850f5f369f1e3b6239da7fb43d1d029c1e178263df671819889c47caf7e4ff3"}, - {file = "regex-2022.4.24-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:bedb3d01ad35ea1745bdb1d57f3ee0f996f988c98f5bbae9d068c3bb3065d210"}, - {file = "regex-2022.4.24-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:8bf867ba71856414a482e4b683500f946c300c4896e472e51d3db8dfa8dc8f32"}, - {file = "regex-2022.4.24-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:b415b82e5be7389ec5ee7ee35431e4a549ea327caacf73b697c6b3538cb5c87f"}, - {file = "regex-2022.4.24-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:9dae5affbb66178dad6c6fd5b02221ca9917e016c75ee3945e9a9563eb1fbb6f"}, - {file = "regex-2022.4.24-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:e65580ae3137bce712f505ec7c2d700aef0014a3878c4767b74aff5895fc454f"}, - {file = "regex-2022.4.24-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3e9e983fc8e0d4d5ded7caa5aed39ca2cf6026d7e39801ef6f0af0b1b6cd9276"}, - {file = "regex-2022.4.24-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:cfad3a770839aa456ff9a9aa0e253d98b628d005a3ccb37da1ff9be7c84fee16"}, - {file = "regex-2022.4.24-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:ed625205f5f26984382b68e4cbcbc08e6603c9e84c14b38457170b0cc71c823b"}, - {file = "regex-2022.4.24-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:c4fdf837666f7793a5c3cfa2f2f39f03eb6c7e92e831bc64486c2f547580c2b3"}, - {file = "regex-2022.4.24-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:ed26c3d2d62c6588e0dad175b8d8cc0942a638f32d07b80f92043e5d73b7db67"}, - {file = "regex-2022.4.24-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:f89d26e50a4c7453cb8c415acd09e72fbade2610606a9c500a1e48c43210a42d"}, - {file = "regex-2022.4.24-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:97af238389cb029d63d5f2d931a7e8f5954ad96e812de5faaed373b68e74df86"}, - {file = "regex-2022.4.24-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:be392d9cd5309509175a9d7660dc17bf57084501108dbff0c5a8bfc3646048c3"}, - {file = "regex-2022.4.24-cp39-cp39-win32.whl", hash = "sha256:bcc6f7a3a95119c3568c572ca167ada75f8319890706283b9ba59b3489c9bcb3"}, - {file = "regex-2022.4.24-cp39-cp39-win_amd64.whl", hash = "sha256:5b9c7b6895a01204296e9523b3e12b43e013835a9de035a783907c2c1bc447f0"}, - {file = "regex-2022.4.24.tar.gz", hash = "sha256:92183e9180c392371079262879c6532ccf55f808e6900df5d9f03c9ca8807255"}, -] semantic-version = [ {file = "semantic_version-2.9.0-py2.py3-none-any.whl", hash = "sha256:db2504ab37902dd2c9876ece53567aa43a5b2a417fbe188097b2048fff46da3d"}, {file = "semantic_version-2.9.0.tar.gz", hash = "sha256:abf54873553e5e07a6fd4d5f653b781f5ae41297a493666b59dcf214006a12b2"}, diff --git a/pyproject.toml b/pyproject.toml index c7a18c8..fa49364 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -10,14 +10,12 @@ python = "^3.7" GitPython = "^3.1.27" packaging = "^21.3" semantic-version = "^2.9.0" -parsimonious = "^0.9.0" [tool.poetry.dev-dependencies] gitdb = "^4.0.9" GitPython = "^3.1.27" loremipsum = "^1.0.5" nose = "^1.3.7" -parsimonious = "^0.9.0" pylint = "^2.13.9" coverage = "^6.4" diff --git a/requirements-dev.txt b/requirements-dev.txt index ce46888..1143971 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -39,8 +39,6 @@ coverage==5.3; (python_version >= "2.7" and python_full_version < "3.0.0") or (p --hash=sha256:cb7df71de0af56000115eafd000b867d1261f786b5eebd88a0ca6360cccfaca7 \ --hash=sha256:47a11bdbd8ada9b7ee628596f9d97fbd3851bd9999d398e9436bd67376dbece7 \ --hash=sha256:280baa8ec489c4f542f8940f9c4c2181f0306a8ee1a54eceba071a449fb870a0 -erl-terms==0.1.5 \ - --hash=sha256:bd4157f6d34047248914ef3800e8715ecdef0e2ec93e3b8d83857614fe28b6f2 gitdb==4.0.5; python_version >= "3.4" \ --hash=sha256:91f36bfb1ab7949b3b40e23736db18231bf7593edada2ba5c3a174a7b23657ac \ --hash=sha256:c9e1f2d0db7ddb9a704c2a0217be31214e91a4fe1dea1efad19ae42ba0c285c9 @@ -83,8 +81,6 @@ nose==1.3.7 \ --hash=sha256:dadcddc0aefbf99eea214e0f1232b94f2fa9bd98fa8353711dacb112bfcbbb2a \ --hash=sha256:9ff7c6cc443f8c51994b34a667bbcf45afd6d945be7477b52e97516fd17c53ac \ --hash=sha256:f1bffef9cbc82628f6e7d7b40d7e255aefaa1adb6a1b1d26c69a8b79e6208a98 -parsimonious==0.7.0 \ - --hash=sha256:396d424f64f834f9463e81ba79a331661507a21f1ed7b644f7f6a744006fd938 pycodestyle==2.6.0; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.4.0") \ --hash=sha256:2295e7b2f6b5bd100585ebcb1f616591b652db8a741695b3d8f5d28bdc934367 \ --hash=sha256:c58a7d2815e0e8d7972bf1803331fb0152f867bd89adf8a01dfd55085434192e @@ -130,8 +126,6 @@ wrapt==1.12.1 \ gitdb==4.0.5 \ --hash=sha256:91f36bfb1ab7949b3b40e23736db18231bf7593edada2ba5c3a174a7b23657ac \ --hash=sha256:c9e1f2d0db7ddb9a704c2a0217be31214e91a4fe1dea1efad19ae42ba0c285c9 -parsimonious==0.7.0 \ - --hash=sha256:396d424f64f834f9463e81ba79a331661507a21f1ed7b644f7f6a744006fd938 py==1.10.0 \ --hash=sha256:21b81bda15b66ef5e1a777a21c4dcd9c20ad3efd0b3f817e7a809035269e1bd3 \ --hash=sha256:3b80836aa6d1feeaa108e046da6423ab8f6ceda6468545ae8d02d9d58d18818a diff --git a/requirements.txt b/requirements.txt index a0ee774..9f047c9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,8 +4,6 @@ appdirs==1.4.4 \ distlib==0.3.1 \ --hash=sha256:8c09de2c67b3e7deef7184574fc060ab8a793e7adbb183d942c389c8b13c52fb \ --hash=sha256:edf6116872c863e1aa9d5bb7cb5e05a022c519a4594dc703843343a9ddd9bff1 -erl-terms==0.1.5 \ - --hash=sha256:bd4157f6d34047248914ef3800e8715ecdef0e2ec93e3b8d83857614fe28b6f2 filelock==3.0.12 \ --hash=sha256:18d82244ee114f543149c66a6e0c14e9c4f8a1044b5cdaadd0f82159d6a6ff59 \ --hash=sha256:929b7d63ec5b7d6b71b0fa5ac14e030b3f70b75747cef1b10da9b879fef15836 @@ -20,8 +18,6 @@ importlib-metadata==3.4.0; python_version == "3.7" \ packaging==20.8 \ --hash=sha256:24e0da08660a87484d1602c30bb4902d74816b6985b93de36926f5bc95741858 \ --hash=sha256:78598185a7008a470d64526a8059de9aaa449238f280fc9eb6b13ba6c4109093 -parsimonious==0.7.0 \ - --hash=sha256:396d424f64f834f9463e81ba79a331661507a21f1ed7b644f7f6a744006fd938 semantic-version==2.8.5; (python_version >= "2.7" and python_full_version < "3.0.0") or (python_full_version >= "3.4.0") \ --hash=sha256:45e4b32ee9d6d70ba5f440ec8cc5221074c7f4b0e8918bdab748cc37912440a9 \ --hash=sha256:d2cb2de0558762934679b9a104e82eca7af448c9f4974d1f3eeccff651df8a54 From 9509e5e9fb710f61c7fb9d8cd2d746203e44751f Mon Sep 17 00:00:00 2001 From: Tyler Jachetta Date: Wed, 25 May 2022 18:36:43 -0600 Subject: [PATCH 32/33] missed a reference --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index a72ae9c..3f8f5f4 100644 --- a/setup.py +++ b/setup.py @@ -27,7 +27,7 @@ def main(): author_email='jonafree@gmail.com', license='MIT', url='https://github.com/otakup0pe/avakas', - install_requires=['semantic_version', 'gitpython', 'erl_terms'], + install_requires=['semantic_version', 'gitpython'], packages=['avakas', 'avakas.flavors'], entry_points={ 'console_scripts': ['avakas = avakas.cli:main'] From d06cbef97cd8e2ebb6ee28d81b0dac028246efba Mon Sep 17 00:00:00 2001 From: Tyler Jachetta Date: Tue, 21 Jun 2022 07:32:22 -0600 Subject: [PATCH 33/33] removed poetry stuffs --- poetry.lock | 396 ------------------------------------------------- pyproject.toml | 24 --- 2 files changed, 420 deletions(-) delete mode 100644 poetry.lock delete mode 100644 pyproject.toml diff --git a/poetry.lock b/poetry.lock deleted file mode 100644 index 8561d84..0000000 --- a/poetry.lock +++ /dev/null @@ -1,396 +0,0 @@ -[[package]] -name = "astroid" -version = "2.11.5" -description = "An abstract syntax tree for Python with inference support." -category = "dev" -optional = false -python-versions = ">=3.6.2" - -[package.dependencies] -lazy-object-proxy = ">=1.4.0" -typed-ast = {version = ">=1.4.0,<2.0", markers = "implementation_name == \"cpython\" and python_version < \"3.8\""} -typing-extensions = {version = ">=3.10", markers = "python_version < \"3.10\""} -wrapt = ">=1.11,<2" - -[[package]] -name = "colorama" -version = "0.4.4" -description = "Cross-platform colored terminal text." -category = "dev" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" - -[[package]] -name = "coverage" -version = "6.4" -description = "Code coverage measurement for Python" -category = "dev" -optional = false -python-versions = ">=3.7" - -[package.extras] -toml = ["tomli"] - -[[package]] -name = "dill" -version = "0.3.5.1" -description = "serialize all of python" -category = "dev" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*, !=3.6.*" - -[package.extras] -graph = ["objgraph (>=1.7.2)"] - -[[package]] -name = "gitdb" -version = "4.0.9" -description = "Git Object Database" -category = "main" -optional = false -python-versions = ">=3.6" - -[package.dependencies] -smmap = ">=3.0.1,<6" - -[[package]] -name = "gitpython" -version = "3.1.27" -description = "GitPython is a python library used to interact with Git repositories" -category = "main" -optional = false -python-versions = ">=3.7" - -[package.dependencies] -gitdb = ">=4.0.1,<5" -typing-extensions = {version = ">=3.7.4.3", markers = "python_version < \"3.8\""} - -[[package]] -name = "isort" -version = "5.6.4" -description = "A Python utility / library to sort Python imports." -category = "dev" -optional = false -python-versions = ">=3.6,<4.0" - -[package.extras] -pipfile_deprecated_finder = ["pipreqs", "requirementslib"] -requirements_deprecated_finder = ["pipreqs", "pip-api"] -colors = ["colorama (>=0.4.3,<0.5.0)"] - -[[package]] -name = "lazy-object-proxy" -version = "1.4.3" -description = "A fast and thorough lazy object proxy." -category = "dev" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" - -[[package]] -name = "loremipsum" -version = "1.0.5" -description = "A Lorem Ipsum text generator" -category = "dev" -optional = false -python-versions = "*" - -[[package]] -name = "mccabe" -version = "0.6.1" -description = "McCabe checker, plugin for flake8" -category = "dev" -optional = false -python-versions = "*" - -[[package]] -name = "nose" -version = "1.3.7" -description = "nose extends unittest to make testing easier" -category = "dev" -optional = false -python-versions = "*" - -[[package]] -name = "packaging" -version = "21.3" -description = "Core utilities for Python packages" -category = "main" -optional = false -python-versions = ">=3.6" - -[package.dependencies] -pyparsing = ">=2.0.2,<3.0.5 || >3.0.5" - -[[package]] -name = "platformdirs" -version = "2.5.2" -description = "A small Python module for determining appropriate platform-specific dirs, e.g. a \"user data dir\"." -category = "dev" -optional = false -python-versions = ">=3.7" - -[package.extras] -docs = ["furo (>=2021.7.5b38)", "proselint (>=0.10.2)", "sphinx-autodoc-typehints (>=1.12)", "sphinx (>=4)"] -test = ["appdirs (==1.4.4)", "pytest-cov (>=2.7)", "pytest-mock (>=3.6)", "pytest (>=6)"] - -[[package]] -name = "pylint" -version = "2.13.9" -description = "python code static checker" -category = "dev" -optional = false -python-versions = ">=3.6.2" - -[package.dependencies] -astroid = ">=2.11.5,<=2.12.0-dev0" -colorama = {version = "*", markers = "sys_platform == \"win32\""} -dill = ">=0.2" -isort = ">=4.2.5,<6" -mccabe = ">=0.6,<0.8" -platformdirs = ">=2.2.0" -tomli = {version = ">=1.1.0", markers = "python_version < \"3.11\""} -typing-extensions = {version = ">=3.10.0", markers = "python_version < \"3.10\""} - -[package.extras] -testutil = ["gitpython (>3)"] - -[[package]] -name = "pyparsing" -version = "3.0.9" -description = "pyparsing module - Classes and methods to define and execute parsing grammars" -category = "main" -optional = false -python-versions = ">=3.6.8" - -[package.extras] -diagrams = ["railroad-diagrams", "jinja2"] - -[[package]] -name = "semantic-version" -version = "2.9.0" -description = "A library implementing the 'SemVer' scheme." -category = "main" -optional = false -python-versions = ">=2.7" - -[package.extras] -dev = ["Django (>=1.11)", "nose2", "tox", "check-manifest", "coverage", "flake8", "wheel", "zest.releaser", "readme-renderer (<25.0)", "colorama (<=0.4.1)"] -doc = ["sphinx", "sphinx-rtd-theme"] - -[[package]] -name = "smmap" -version = "3.0.4" -description = "A pure Python implementation of a sliding window memory map manager" -category = "main" -optional = false -python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" - -[[package]] -name = "tomli" -version = "2.0.1" -description = "A lil' TOML parser" -category = "dev" -optional = false -python-versions = ">=3.7" - -[[package]] -name = "typed-ast" -version = "1.4.1" -description = "a fork of Python 2 and 3 ast modules with type comment support" -category = "dev" -optional = false -python-versions = "*" - -[[package]] -name = "typing-extensions" -version = "4.2.0" -description = "Backported and Experimental Type Hints for Python 3.7+" -category = "main" -optional = false -python-versions = ">=3.7" - -[[package]] -name = "wrapt" -version = "1.12.1" -description = "Module for decorators, wrappers and monkey patching." -category = "dev" -optional = false -python-versions = "*" - -[metadata] -lock-version = "1.1" -python-versions = "^3.7" -content-hash = "93b92682ce87d52345b11ae02f513119a5a14c4ed54d5eca36f73651504e4022" - -[metadata.files] -astroid = [ - {file = "astroid-2.11.5-py3-none-any.whl", hash = "sha256:14ffbb4f6aa2cf474a0834014005487f7ecd8924996083ab411e7fa0b508ce0b"}, - {file = "astroid-2.11.5.tar.gz", hash = "sha256:f4e4ec5294c4b07ac38bab9ca5ddd3914d4bf46f9006eb5c0ae755755061044e"}, -] -colorama = [ - {file = "colorama-0.4.4-py2.py3-none-any.whl", hash = "sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2"}, - {file = "colorama-0.4.4.tar.gz", hash = "sha256:5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b"}, -] -coverage = [ - {file = "coverage-6.4-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:50ed480b798febce113709846b11f5d5ed1e529c88d8ae92f707806c50297abf"}, - {file = "coverage-6.4-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:26f8f92699756cb7af2b30720de0c5bb8d028e923a95b6d0c891088025a1ac8f"}, - {file = "coverage-6.4-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:60c2147921da7f4d2d04f570e1838db32b95c5509d248f3fe6417e91437eaf41"}, - {file = "coverage-6.4-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:750e13834b597eeb8ae6e72aa58d1d831b96beec5ad1d04479ae3772373a8088"}, - {file = "coverage-6.4-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:af5b9ee0fc146e907aa0f5fb858c3b3da9199d78b7bb2c9973d95550bd40f701"}, - {file = "coverage-6.4-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:a022394996419142b33a0cf7274cb444c01d2bb123727c4bb0b9acabcb515dea"}, - {file = "coverage-6.4-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:5a78cf2c43b13aa6b56003707c5203f28585944c277c1f3f109c7b041b16bd39"}, - {file = "coverage-6.4-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:9229d074e097f21dfe0643d9d0140ee7433814b3f0fc3706b4abffd1e3038632"}, - {file = "coverage-6.4-cp310-cp310-win32.whl", hash = "sha256:fb45fe08e1abc64eb836d187b20a59172053999823f7f6ef4f18a819c44ba16f"}, - {file = "coverage-6.4-cp310-cp310-win_amd64.whl", hash = "sha256:3cfd07c5889ddb96a401449109a8b97a165be9d67077df6802f59708bfb07720"}, - {file = "coverage-6.4-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:03014a74023abaf5a591eeeaf1ac66a73d54eba178ff4cb1fa0c0a44aae70383"}, - {file = "coverage-6.4-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:9c82f2cd69c71698152e943f4a5a6b83a3ab1db73b88f6e769fabc86074c3b08"}, - {file = "coverage-6.4-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7b546cf2b1974ddc2cb222a109b37c6ed1778b9be7e6b0c0bc0cf0438d9e45a6"}, - {file = "coverage-6.4-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:cc173f1ce9ffb16b299f51c9ce53f66a62f4d975abe5640e976904066f3c835d"}, - {file = "coverage-6.4-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:c53ad261dfc8695062fc8811ac7c162bd6096a05a19f26097f411bdf5747aee7"}, - {file = "coverage-6.4-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:eef5292b60b6de753d6e7f2d128d5841c7915fb1e3321c3a1fe6acfe76c38052"}, - {file = "coverage-6.4-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:543e172ce4c0de533fa892034cce260467b213c0ea8e39da2f65f9a477425211"}, - {file = "coverage-6.4-cp37-cp37m-win32.whl", hash = "sha256:00c8544510f3c98476bbd58201ac2b150ffbcce46a8c3e4fb89ebf01998f806a"}, - {file = "coverage-6.4-cp37-cp37m-win_amd64.whl", hash = "sha256:b84ab65444dcc68d761e95d4d70f3cfd347ceca5a029f2ffec37d4f124f61311"}, - {file = "coverage-6.4-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:d548edacbf16a8276af13063a2b0669d58bbcfca7c55a255f84aac2870786a61"}, - {file = "coverage-6.4-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:033ebec282793bd9eb988d0271c211e58442c31077976c19c442e24d827d356f"}, - {file = "coverage-6.4-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:742fb8b43835078dd7496c3c25a1ec8d15351df49fb0037bffb4754291ef30ce"}, - {file = "coverage-6.4-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:d55fae115ef9f67934e9f1103c9ba826b4c690e4c5bcf94482b8b2398311bf9c"}, - {file = "coverage-6.4-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5cd698341626f3c77784858427bad0cdd54a713115b423d22ac83a28303d1d95"}, - {file = "coverage-6.4-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:62d382f7d77eeeaff14b30516b17bcbe80f645f5cf02bb755baac376591c653c"}, - {file = "coverage-6.4-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:016d7f5cf1c8c84f533a3c1f8f36126fbe00b2ec0ccca47cc5731c3723d327c6"}, - {file = "coverage-6.4-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:69432946f154c6add0e9ede03cc43b96e2ef2733110a77444823c053b1ff5166"}, - {file = "coverage-6.4-cp38-cp38-win32.whl", hash = "sha256:83bd142cdec5e4a5c4ca1d4ff6fa807d28460f9db919f9f6a31babaaa8b88426"}, - {file = "coverage-6.4-cp38-cp38-win_amd64.whl", hash = "sha256:4002f9e8c1f286e986fe96ec58742b93484195defc01d5cc7809b8f7acb5ece3"}, - {file = "coverage-6.4-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:e4f52c272fdc82e7c65ff3f17a7179bc5f710ebc8ce8a5cadac81215e8326740"}, - {file = "coverage-6.4-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:b5578efe4038be02d76c344007b13119b2b20acd009a88dde8adec2de4f630b5"}, - {file = "coverage-6.4-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d8099ea680201c2221f8468c372198ceba9338a5fec0e940111962b03b3f716a"}, - {file = "coverage-6.4-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:a00441f5ea4504f5abbc047589d09e0dc33eb447dc45a1a527c8b74bfdd32c65"}, - {file = "coverage-6.4-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2e76bd16f0e31bc2b07e0fb1379551fcd40daf8cdf7e24f31a29e442878a827c"}, - {file = "coverage-6.4-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:8d2e80dd3438e93b19e1223a9850fa65425e77f2607a364b6fd134fcd52dc9df"}, - {file = "coverage-6.4-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:341e9c2008c481c5c72d0e0dbf64980a4b2238631a7f9780b0fe2e95755fb018"}, - {file = "coverage-6.4-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:21e6686a95025927775ac501e74f5940cdf6fe052292f3a3f7349b0abae6d00f"}, - {file = "coverage-6.4-cp39-cp39-win32.whl", hash = "sha256:968ed5407f9460bd5a591cefd1388cc00a8f5099de9e76234655ae48cfdbe2c3"}, - {file = "coverage-6.4-cp39-cp39-win_amd64.whl", hash = "sha256:e35217031e4b534b09f9b9a5841b9344a30a6357627761d4218818b865d45055"}, - {file = "coverage-6.4-pp36.pp37.pp38-none-any.whl", hash = "sha256:e637ae0b7b481905358624ef2e81d7fb0b1af55f5ff99f9ba05442a444b11e45"}, - {file = "coverage-6.4.tar.gz", hash = "sha256:727dafd7f67a6e1cad808dc884bd9c5a2f6ef1f8f6d2f22b37b96cb0080d4f49"}, -] -dill = [ - {file = "dill-0.3.5.1-py2.py3-none-any.whl", hash = "sha256:33501d03270bbe410c72639b350e941882a8b0fd55357580fbc873fba0c59302"}, - {file = "dill-0.3.5.1.tar.gz", hash = "sha256:d75e41f3eff1eee599d738e76ba8f4ad98ea229db8b085318aa2b3333a208c86"}, -] -gitdb = [ - {file = "gitdb-4.0.9-py3-none-any.whl", hash = "sha256:8033ad4e853066ba6ca92050b9df2f89301b8fc8bf7e9324d412a63f8bf1a8fd"}, - {file = "gitdb-4.0.9.tar.gz", hash = "sha256:bac2fd45c0a1c9cf619e63a90d62bdc63892ef92387424b855792a6cabe789aa"}, -] -gitpython = [ - {file = "GitPython-3.1.27-py3-none-any.whl", hash = "sha256:5b68b000463593e05ff2b261acff0ff0972df8ab1b70d3cdbd41b546c8b8fc3d"}, - {file = "GitPython-3.1.27.tar.gz", hash = "sha256:1c885ce809e8ba2d88a29befeb385fcea06338d3640712b59ca623c220bb5704"}, -] -isort = [ - {file = "isort-5.6.4-py3-none-any.whl", hash = "sha256:dcab1d98b469a12a1a624ead220584391648790275560e1a43e54c5dceae65e7"}, - {file = "isort-5.6.4.tar.gz", hash = "sha256:dcaeec1b5f0eca77faea2a35ab790b4f3680ff75590bfcb7145986905aab2f58"}, -] -lazy-object-proxy = [ - {file = "lazy-object-proxy-1.4.3.tar.gz", hash = "sha256:f3900e8a5de27447acbf900b4750b0ddfd7ec1ea7fbaf11dfa911141bc522af0"}, - {file = "lazy_object_proxy-1.4.3-cp27-cp27m-macosx_10_13_x86_64.whl", hash = "sha256:a2238e9d1bb71a56cd710611a1614d1194dc10a175c1e08d75e1a7bcc250d442"}, - {file = "lazy_object_proxy-1.4.3-cp27-cp27m-win32.whl", hash = "sha256:efa1909120ce98bbb3777e8b6f92237f5d5c8ea6758efea36a473e1d38f7d3e4"}, - {file = "lazy_object_proxy-1.4.3-cp27-cp27m-win_amd64.whl", hash = "sha256:4677f594e474c91da97f489fea5b7daa17b5517190899cf213697e48d3902f5a"}, - {file = "lazy_object_proxy-1.4.3-cp27-cp27mu-manylinux1_x86_64.whl", hash = "sha256:0c4b206227a8097f05c4dbdd323c50edf81f15db3b8dc064d08c62d37e1a504d"}, - {file = "lazy_object_proxy-1.4.3-cp34-cp34m-manylinux1_x86_64.whl", hash = "sha256:d945239a5639b3ff35b70a88c5f2f491913eb94871780ebfabb2568bd58afc5a"}, - {file = "lazy_object_proxy-1.4.3-cp34-cp34m-win32.whl", hash = "sha256:9651375199045a358eb6741df3e02a651e0330be090b3bc79f6d0de31a80ec3e"}, - {file = "lazy_object_proxy-1.4.3-cp34-cp34m-win_amd64.whl", hash = "sha256:eba7011090323c1dadf18b3b689845fd96a61ba0a1dfbd7f24b921398affc357"}, - {file = "lazy_object_proxy-1.4.3-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:48dab84ebd4831077b150572aec802f303117c8cc5c871e182447281ebf3ac50"}, - {file = "lazy_object_proxy-1.4.3-cp35-cp35m-win32.whl", hash = "sha256:ca0a928a3ddbc5725be2dd1cf895ec0a254798915fb3a36af0964a0a4149e3db"}, - {file = "lazy_object_proxy-1.4.3-cp35-cp35m-win_amd64.whl", hash = "sha256:194d092e6f246b906e8f70884e620e459fc54db3259e60cf69a4d66c3fda3449"}, - {file = "lazy_object_proxy-1.4.3-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:97bb5884f6f1cdce0099f86b907aa41c970c3c672ac8b9c8352789e103cf3156"}, - {file = "lazy_object_proxy-1.4.3-cp36-cp36m-win32.whl", hash = "sha256:cb2c7c57005a6804ab66f106ceb8482da55f5314b7fcb06551db1edae4ad1531"}, - {file = "lazy_object_proxy-1.4.3-cp36-cp36m-win_amd64.whl", hash = "sha256:8d859b89baf8ef7f8bc6b00aa20316483d67f0b1cbf422f5b4dc56701c8f2ffb"}, - {file = "lazy_object_proxy-1.4.3-cp37-cp37m-macosx_10_13_x86_64.whl", hash = "sha256:1be7e4c9f96948003609aa6c974ae59830a6baecc5376c25c92d7d697e684c08"}, - {file = "lazy_object_proxy-1.4.3-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:d74bb8693bf9cf75ac3b47a54d716bbb1a92648d5f781fc799347cfc95952383"}, - {file = "lazy_object_proxy-1.4.3-cp37-cp37m-win32.whl", hash = "sha256:9b15f3f4c0f35727d3a0fba4b770b3c4ebbb1fa907dbcc046a1d2799f3edd142"}, - {file = "lazy_object_proxy-1.4.3-cp37-cp37m-win_amd64.whl", hash = "sha256:9254f4358b9b541e3441b007a0ea0764b9d056afdeafc1a5569eee1cc6c1b9ea"}, - {file = "lazy_object_proxy-1.4.3-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:a6ae12d08c0bf9909ce12385803a543bfe99b95fe01e752536a60af2b7797c62"}, - {file = "lazy_object_proxy-1.4.3-cp38-cp38-win32.whl", hash = "sha256:5541cada25cd173702dbd99f8e22434105456314462326f06dba3e180f203dfd"}, - {file = "lazy_object_proxy-1.4.3-cp38-cp38-win_amd64.whl", hash = "sha256:59f79fef100b09564bc2df42ea2d8d21a64fdcda64979c0fa3db7bdaabaf6239"}, -] -loremipsum = [ - {file = "loremipsum-1.0.5-py2.7.egg", hash = "sha256:30481f59ef323fc5566efe2271f63e85ea5bc358a8f25274927232388a1557ee"}, - {file = "loremipsum-1.0.5.tar.gz", hash = "sha256:b849c69305c3f52badfe25ecc0495b991769d96cafdfd99014d17f50ee523af5"}, - {file = "loremipsum-1.0.5.zip", hash = "sha256:a38672c145c0e0790cb40403d46bee695e5e9a0350f0643199a012a18f65449a"}, -] -mccabe = [ - {file = "mccabe-0.6.1-py2.py3-none-any.whl", hash = "sha256:ab8a6258860da4b6677da4bd2fe5dc2c659cff31b3ee4f7f5d64e79735b80d42"}, - {file = "mccabe-0.6.1.tar.gz", hash = "sha256:dd8d182285a0fe56bace7f45b5e7d1a6ebcbf524e8f3bd87eb0f125271b8831f"}, -] -nose = [ - {file = "nose-1.3.7-py2-none-any.whl", hash = "sha256:dadcddc0aefbf99eea214e0f1232b94f2fa9bd98fa8353711dacb112bfcbbb2a"}, - {file = "nose-1.3.7-py3-none-any.whl", hash = "sha256:9ff7c6cc443f8c51994b34a667bbcf45afd6d945be7477b52e97516fd17c53ac"}, - {file = "nose-1.3.7.tar.gz", hash = "sha256:f1bffef9cbc82628f6e7d7b40d7e255aefaa1adb6a1b1d26c69a8b79e6208a98"}, -] -packaging = [ - {file = "packaging-21.3-py3-none-any.whl", hash = "sha256:ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522"}, - {file = "packaging-21.3.tar.gz", hash = "sha256:dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb"}, -] -platformdirs = [ - {file = "platformdirs-2.5.2-py3-none-any.whl", hash = "sha256:027d8e83a2d7de06bbac4e5ef7e023c02b863d7ea5d079477e722bb41ab25788"}, - {file = "platformdirs-2.5.2.tar.gz", hash = "sha256:58c8abb07dcb441e6ee4b11d8df0ac856038f944ab98b7be6b27b2a3c7feef19"}, -] -pylint = [ - {file = "pylint-2.13.9-py3-none-any.whl", hash = "sha256:705c620d388035bdd9ff8b44c5bcdd235bfb49d276d488dd2c8ff1736aa42526"}, - {file = "pylint-2.13.9.tar.gz", hash = "sha256:095567c96e19e6f57b5b907e67d265ff535e588fe26b12b5ebe1fc5645b2c731"}, -] -pyparsing = [ - {file = "pyparsing-3.0.9-py3-none-any.whl", hash = "sha256:5026bae9a10eeaefb61dab2f09052b9f4307d44aee4eda64b309723d8d206bbc"}, - {file = "pyparsing-3.0.9.tar.gz", hash = "sha256:2b020ecf7d21b687f219b71ecad3631f644a47f01403fa1d1036b0c6416d70fb"}, -] -semantic-version = [ - {file = "semantic_version-2.9.0-py2.py3-none-any.whl", hash = "sha256:db2504ab37902dd2c9876ece53567aa43a5b2a417fbe188097b2048fff46da3d"}, - {file = "semantic_version-2.9.0.tar.gz", hash = "sha256:abf54873553e5e07a6fd4d5f653b781f5ae41297a493666b59dcf214006a12b2"}, -] -smmap = [ - {file = "smmap-3.0.4-py2.py3-none-any.whl", hash = "sha256:54c44c197c819d5ef1991799a7e30b662d1e520f2ac75c9efbeb54a742214cf4"}, - {file = "smmap-3.0.4.tar.gz", hash = "sha256:9c98bbd1f9786d22f14b3d4126894d56befb835ec90cef151af566c7e19b5d24"}, -] -tomli = [ - {file = "tomli-2.0.1-py3-none-any.whl", hash = "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc"}, - {file = "tomli-2.0.1.tar.gz", hash = "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"}, -] -typed-ast = [ - {file = "typed_ast-1.4.1-cp35-cp35m-manylinux1_i686.whl", hash = "sha256:73d785a950fc82dd2a25897d525d003f6378d1cb23ab305578394694202a58c3"}, - {file = "typed_ast-1.4.1-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:aaee9905aee35ba5905cfb3c62f3e83b3bec7b39413f0a7f19be4e547ea01ebb"}, - {file = "typed_ast-1.4.1-cp35-cp35m-win32.whl", hash = "sha256:0c2c07682d61a629b68433afb159376e24e5b2fd4641d35424e462169c0a7919"}, - {file = "typed_ast-1.4.1-cp35-cp35m-win_amd64.whl", hash = "sha256:4083861b0aa07990b619bd7ddc365eb7fa4b817e99cf5f8d9cf21a42780f6e01"}, - {file = "typed_ast-1.4.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:269151951236b0f9a6f04015a9004084a5ab0d5f19b57de779f908621e7d8b75"}, - {file = "typed_ast-1.4.1-cp36-cp36m-manylinux1_i686.whl", hash = "sha256:24995c843eb0ad11a4527b026b4dde3da70e1f2d8806c99b7b4a7cf491612652"}, - {file = "typed_ast-1.4.1-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:fe460b922ec15dd205595c9b5b99e2f056fd98ae8f9f56b888e7a17dc2b757e7"}, - {file = "typed_ast-1.4.1-cp36-cp36m-manylinux2014_aarch64.whl", hash = "sha256:fcf135e17cc74dbfbc05894ebca928ffeb23d9790b3167a674921db19082401f"}, - {file = "typed_ast-1.4.1-cp36-cp36m-win32.whl", hash = "sha256:4e3e5da80ccbebfff202a67bf900d081906c358ccc3d5e3c8aea42fdfdfd51c1"}, - {file = "typed_ast-1.4.1-cp36-cp36m-win_amd64.whl", hash = "sha256:249862707802d40f7f29f6e1aad8d84b5aa9e44552d2cc17384b209f091276aa"}, - {file = "typed_ast-1.4.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:8ce678dbaf790dbdb3eba24056d5364fb45944f33553dd5869b7580cdbb83614"}, - {file = "typed_ast-1.4.1-cp37-cp37m-manylinux1_i686.whl", hash = "sha256:c9e348e02e4d2b4a8b2eedb48210430658df6951fa484e59de33ff773fbd4b41"}, - {file = "typed_ast-1.4.1-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:bcd3b13b56ea479b3650b82cabd6b5343a625b0ced5429e4ccad28a8973f301b"}, - {file = "typed_ast-1.4.1-cp37-cp37m-manylinux2014_aarch64.whl", hash = "sha256:f208eb7aff048f6bea9586e61af041ddf7f9ade7caed625742af423f6bae3298"}, - {file = "typed_ast-1.4.1-cp37-cp37m-win32.whl", hash = "sha256:d5d33e9e7af3b34a40dc05f498939f0ebf187f07c385fd58d591c533ad8562fe"}, - {file = "typed_ast-1.4.1-cp37-cp37m-win_amd64.whl", hash = "sha256:0666aa36131496aed8f7be0410ff974562ab7eeac11ef351def9ea6fa28f6355"}, - {file = "typed_ast-1.4.1-cp38-cp38-macosx_10_15_x86_64.whl", hash = "sha256:d205b1b46085271b4e15f670058ce182bd1199e56b317bf2ec004b6a44f911f6"}, - {file = "typed_ast-1.4.1-cp38-cp38-manylinux1_i686.whl", hash = "sha256:6daac9731f172c2a22ade6ed0c00197ee7cc1221aa84cfdf9c31defeb059a907"}, - {file = "typed_ast-1.4.1-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:498b0f36cc7054c1fead3d7fc59d2150f4d5c6c56ba7fb150c013fbc683a8d2d"}, - {file = "typed_ast-1.4.1-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:7e4c9d7658aaa1fc80018593abdf8598bf91325af6af5cce4ce7c73bc45ea53d"}, - {file = "typed_ast-1.4.1-cp38-cp38-win32.whl", hash = "sha256:715ff2f2df46121071622063fc7543d9b1fd19ebfc4f5c8895af64a77a8c852c"}, - {file = "typed_ast-1.4.1-cp38-cp38-win_amd64.whl", hash = "sha256:fc0fea399acb12edbf8a628ba8d2312f583bdbdb3335635db062fa98cf71fca4"}, - {file = "typed_ast-1.4.1-cp39-cp39-macosx_10_15_x86_64.whl", hash = "sha256:d43943ef777f9a1c42bf4e552ba23ac77a6351de620aa9acf64ad54933ad4d34"}, - {file = "typed_ast-1.4.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:92c325624e304ebf0e025d1224b77dd4e6393f18aab8d829b5b7e04afe9b7a2c"}, - {file = "typed_ast-1.4.1-cp39-cp39-manylinux1_i686.whl", hash = "sha256:d648b8e3bf2fe648745c8ffcee3db3ff903d0817a01a12dd6a6ea7a8f4889072"}, - {file = "typed_ast-1.4.1-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:fac11badff8313e23717f3dada86a15389d0708275bddf766cca67a84ead3e91"}, - {file = "typed_ast-1.4.1-cp39-cp39-manylinux2014_aarch64.whl", hash = "sha256:0d8110d78a5736e16e26213114a38ca35cb15b6515d535413b090bd50951556d"}, - {file = "typed_ast-1.4.1-cp39-cp39-win32.whl", hash = "sha256:b52ccf7cfe4ce2a1064b18594381bccf4179c2ecf7f513134ec2f993dd4ab395"}, - {file = "typed_ast-1.4.1-cp39-cp39-win_amd64.whl", hash = "sha256:3742b32cf1c6ef124d57f95be609c473d7ec4c14d0090e5a5e05a15269fb4d0c"}, - {file = "typed_ast-1.4.1.tar.gz", hash = "sha256:8c8aaad94455178e3187ab22c8b01a3837f8ee50e09cf31f1ba129eb293ec30b"}, -] -typing-extensions = [ - {file = "typing_extensions-4.2.0-py3-none-any.whl", hash = "sha256:6657594ee297170d19f67d55c05852a874e7eb634f4f753dbd667855e07c1708"}, - {file = "typing_extensions-4.2.0.tar.gz", hash = "sha256:f1c24655a0da0d1b67f07e17a5e6b2a105894e6824b92096378bb3668ef02376"}, -] -wrapt = [ - {file = "wrapt-1.12.1.tar.gz", hash = "sha256:b62ffa81fb85f4332a4f609cab4ac40709470da05643a082ec1eb88e6d9b97d7"}, -] diff --git a/pyproject.toml b/pyproject.toml deleted file mode 100644 index fa49364..0000000 --- a/pyproject.toml +++ /dev/null @@ -1,24 +0,0 @@ -[tool.poetry] -name = "avakas" -version = "1.0.19-pre.3" -description = "Interact with project version metadata" -authors = ["Jonathan Freedman "] -license = "MIT" - -[tool.poetry.dependencies] -python = "^3.7" -GitPython = "^3.1.27" -packaging = "^21.3" -semantic-version = "^2.9.0" - -[tool.poetry.dev-dependencies] -gitdb = "^4.0.9" -GitPython = "^3.1.27" -loremipsum = "^1.0.5" -nose = "^1.3.7" -pylint = "^2.13.9" -coverage = "^6.4" - -[build-system] -requires = ["poetry-core>=1.0.0"] -build-backend = "poetry.core.masonry.api"