Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

rebrand from nVotes to Sequent Tech #80

Merged
merged 5 commits into from
Apr 5, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- id: "Yarn::agora-gui-booth"
- id: "Yarn::voting-booth"
curations:
comment: "This package needs to be downloaded from git"
vcs:
type: "git"
url: "https://github.com/agoravoting/agora-gui-common.git"
url: "https://github.com/sequentech/common-ui.git"
revision: "4.0.1"
2 changes: 1 addition & 1 deletion .ort-data/disclosure_document.ftl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[#--
Copyright (C) 2020 HERE Europe B.V.
Copyright (C) 2020-2021 Bosch.IO GmbH
Copyright (C) 2021 Agora Voting SL
Copyright (C) 2021 Sequent Tech Inc

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
6 changes: 3 additions & 3 deletions .ort.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# SPDX-FileCopyrightText: 2014-2021 Agora Voting SL <contact@nvotes.com>
# SPDX-FileCopyrightText: 2014-2021 Sequent Tech Inc <contact@sequentech.io>
#
# SPDX-License-Identifier: AGPL-3.0-only

---
resolutions:
rule_violations:
- message: "The package (PIP|PyPI)::agora-(tally|results-requirements):.* has the declared ScanCode copyleft catalogized license AGPL-3.0-only."
- message: "The package (PIP|PyPI)::(tally-methods|tally-pipes-requirements):.* has the declared ScanCode copyleft catalogized license AGPL-3.0-only."
reason: "LICENSE_ACQUIRED_EXCEPTION"
comment: "The project is open source so it's normal that it's set as such."

- message: "The project PIP::agora-results-requirements:.* has the dependency PyPI::agora-tally:.* licensed under the ScanCode copyleft categorized license AGPL-3.0-only."
- message: "The project PIP::tally-pipes-requirements:.* has the dependency PyPI::tally-methods:.* licensed under the ScanCode copyleft categorized license AGPL-3.0-only."
reason: "LICENSE_ACQUIRED_EXCEPTION"
comment: "The project is open source so it's normal that it's set as such."

Expand Down
2 changes: 1 addition & 1 deletion AUTHORS
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Eduardo Robles Elvira <edulix AT agoravoting DOT com>
Eduardo Robles Elvira <edulix@sequentech.io>
Daniel García Moreno <danigm AT wadobo DOT com>
4 changes: 2 additions & 2 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
recursive-include agora_results *.py
recursive-include agora_results/pipes/locale *
recursive-include tally_pipes *.py
recursive-include tally_pipes/pipes/locale *
include *md *txt AUTHORS
38 changes: 19 additions & 19 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# agora-results [![tests_badge]][tests_link]
# tally-pipes [![tests_badge]][tests_link]

[tests_badge]: https://github.com/agoravoting/agora-results/workflows/Test%20python/badge.svg
[tests_link]: https://github.com/agoravoting/agora-results/actions?query=workflow%3A%22Test+python%22
[tests_badge]: https://github.com/sequentech/tally-pipes/workflows/Test%20python/badge.svg
[tests_link]: https://github.com/sequentech/tally-pipes/actions?query=workflow%3A%22Test+python%22

## Introduction

Expand All @@ -15,25 +15,25 @@ Piece of software that processes a tally and given a pipeline it modifies the re

Just execute this (no stable release yet):

$ mkvirtualenv agora-results -p $(which python3)
$ workon agora-results
$ pip install git+https://github.com/agoravoting/agora-results.git
$ mkvirtualenv tally-pipes -p $(which python3)
$ workon tally-pipes
$ pip install git+https://github.com/sequentech/tally-pipes.git

## Usage

$ agora-results --tally tally.tar.gz --config agora_results.test_config
$ tally-pipes --tally tally.tar.gz --config tally_pipes.test_config

Or the same shorter:

$ agora-results -t tally.tar.gz -c config.json
$ tally-pipes -t tally.tar.gz -c config.json

## Configuration file

Configuration file specifies the pipeline of functions to be applied to the results. This is an example configuration file (yes just one variable for the pipeline, at least for now):

[
[
"agora_results.pipes.results.do_tallies",
"tally_pipes.pipes.results.do_tallies",
{}
]
]
Expand All @@ -46,11 +46,11 @@ Execute the unit tests with:

## Available pipes

Available pipes are documented in python, in the agora_results/pipes directory.
Available pipes are documented in python, in the tally_pipes/pipes directory.

## Development

You can of course take a look at the available pipes in the agora_results/pipes/ subdirectory and see how to develop your own pipe. Be careful, you might cook the results in an unexpected way!
You can of course take a look at the available pipes in the tally_pipes/pipes/ subdirectory and see how to develop your own pipe. Be careful, you might cook the results in an unexpected way!

This software is in development state, that's why we haven't released any stable version yet. Patches and new pipes are welcome. We will review the pipe so that it does what is expected.

Expand All @@ -63,27 +63,27 @@ mainly followed the guide here: https://www.mattlayman.com/blog/2015/i18n/

You can see all the available commands with:

$ agora-results --help
$ tally-pipes --help

You can contact us at agora-voting@googlegroups.com mailing list or at #agoravoting freenode.net channel.
You can contact us at sequent-voting@googlegroups.com mailing list or at #sequent freenode.net channel.

## License

Copyright (C) 2015 Agora Voting SL and/or its subsidiary(-ies).
Contact: legal@agoravoting.com
Copyright (C) 2015 Sequent Tech Inc and/or its subsidiary(-ies).
Contact: legal@sequentech.io

This file is part of the agora-core-view module of the Agora Voting project.
This file is part of the sequent-core-view module of the Sequent Tech project.

This program is distributed in the hope that it will be useful, but WITHOUT ANY
WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
PARTICULAR PURPOSE. See the GNU General Public License for more details.

Commercial License Usage
Licensees holding valid commercial Agora Voting project licenses may use this
Licensees holding valid commercial Sequent Tech project licenses may use this
file in accordance with the commercial license agreement provided with the
Software or, alternatively, in accordance with the terms contained in
a written agreement between you and Agora Voting SL. For licensing terms and
conditions and further information contact us at legal@agoravoting.com .
a written agreement between you and Sequent Tech Inc. For licensing terms and
conditions and further information contact us at legal@sequentech.io .

GNU Affero General Public License Usage
Alternatively, this file may be used under the terms of the GNU Affero General
Expand Down
4 changes: 2 additions & 2 deletions config.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[
[
"agora_results.pipes.results.do_tallies",
"tally_pipes.pipes.results.do_tallies",
{"ignore_invalid_votes": true}
],
[
"agora_results.pipes.sort.sort_non_iterative",
"tally_pipes.pipes.sort.sort_non_iterative",
{
"question_indexes": [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15]
}
Expand Down
Binary file removed img/nvotes_logo.jpg
Binary file not shown.
Binary file added img/sequent_logo.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ reportlab==3.5.55
requests==2.20.0
pytz==2021.3
Babel==2.9.1
-e git+https://github.com/agoravoting/agora-tally.git@master#egg=agora-tally
-e git+https://github.com/sequentech/tally-methods.git@master#egg=tally-methods
6 changes: 3 additions & 3 deletions setup.cfg
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[extract_messages]
input_dirs = agora_results/pipes/
output_file = agora_results/pipes/locale/pipes.pot
input_dirs = tally_pipes/pipes/
output_file = tally_pipes/pipes/locale/pipes.pot

[compile_catalog]
domain = pipes
directory = agora_results/pipes/locale
directory = tally_pipes/pipes/locale
26 changes: 13 additions & 13 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
#!/usr/bin/env python3

# This file is part of agora-results.
# Copyright (C) 2014-2016 Agora Voting SL <agora@agoravoting.com>
# This file is part of tally-pipes.
# Copyright (C) 2014-2016 Sequent Tech Inc <legal@sequentech.io>

# agora-results is free software: you can redistribute it and/or modify
# tally-pipes is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation, either version 3 of the License.

# agora-results is distributed in the hope that it will be useful,
# tally-pipes is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.

# You should have received a copy of the GNU Affero General Public License
# along with agora-results. If not, see <http://www.gnu.org/licenses/>.
# along with tally-pipes. If not, see <http://www.gnu.org/licenses/>.

from setuptools import setup
from setuptools.command.sdist import sdist
Expand All @@ -24,15 +24,15 @@ def run(self):
sdist.run(self)

setup(
name='agora-results',
name='tally-pipes',
version='master',
author='Agora Voting SL',
author_email='contact@nvotes.com',
packages=['agora_results', 'agora_results.pipes'],
scripts=['agora-results'],
url='https://github.com/agoravoting/agora-results',
author='Sequent Tech Inc',
author_email='contact@sequentech.io',
packages=['tally_pipes', 'tally_pipes.pipes'],
scripts=['tally-pipes'],
url='https://github.com/sequentech/tally-pipes',
license='AGPL-3.0',
description='agora results processing system',
description='sequent results processing system',
long_description=open('README.md').read(),
setup_requires=['Babel'],
cmdclass={'sdist': SdistI18n},
Expand All @@ -41,6 +41,6 @@ def run(self):
'requests==2.20.0',
'Babel==2.9.1',
'pytz==2021.3',
'agora-tally @ git+https://github.com/agoravoting/agora-tally.git@master'
'tally-methods @ git+https://github.com/sequentech/tally-methods.git@master'
]
)
12 changes: 6 additions & 6 deletions agora-results → tally-pipes
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
#!/usr/bin/env python3
# -*- coding:utf-8 -*-

# This file is part of agora-results.
# Copyright (C) 2014-2016 Agora Voting SL <agora@agoravoting.com>
# This file is part of tally-pipes.
# Copyright (C) 2014-2016 Sequent Tech Inc <legal@sequentech.io>

# agora-results is free software: you can redistribute it and/or modify
# tally-pipes is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation, either version 3 of the License.

# agora-results is distributed in the hope that it will be useful,
# tally-pipes is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.

# You should have received a copy of the GNU Affero General Public License
# along with agora-results. If not, see <http://www.gnu.org/licenses/>.
# along with tally-pipes. If not, see <http://www.gnu.org/licenses/>.

from agora_results import main
from tally_pipes import main
import argparse

if __name__ == '__main__':
Expand Down
File renamed without changes.
Loading