Skip to content

Commit c636b4d

Browse files
marktennysonmarktennyson
committed
changes for version 0.0.4
1 parent c7b02ab commit c636b4d

File tree

4 files changed

+40
-52
lines changed

4 files changed

+40
-52
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
- Removed unwanted and old dependencies.
66
- UI change at the default index page.
77
- Added the new Organization(FlaskAio) name.
8+
- Removed GPL and added BSD Based license.
89

910
#### Added
1011
- Added flask-mailman for the default mail service.

‎LICENSE‎

Lines changed: 16 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,19 @@
1-
Copyright (c) 2010 by Aniket Sarkar.
1+
Copyright (c) 2018 FlaskAIO Organization.
22

3-
Some rights reserved.
3+
Permission is hereby granted, free of charge, to any person obtaining a copy
4+
of this software and associated documentation files (the "Software"), to deal
5+
in the Software without restriction, including without limitation the rights
6+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
7+
copies of the Software, and to permit persons to whom the Software is
8+
furnished to do so, subject to the following conditions:
49

5-
Redistribution and use in source and binary forms, with or without
6-
modification, are permitted provided that the following conditions are
7-
met:
10+
The above copyright notice and this permission notice shall be included in all
11+
copies or substantial portions of the Software.
812

9-
* Redistributions of source code must retain the above copyright
10-
notice, this list of conditions and the following disclaimer.
11-
12-
* Redistributions in binary form must reproduce the above
13-
copyright notice, this list of conditions and the following
14-
disclaimer in the documentation and/or other materials provided
15-
with the distribution.
16-
17-
* The names of the contributors may not be used to endorse or
18-
promote products derived from this software without specific
19-
prior written permission.
20-
21-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
22-
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
23-
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
24-
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
25-
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
26-
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
27-
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
28-
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
29-
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
30-
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
31-
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
13+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
16+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
18+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
19+
SOFTWARE.

‎navycut/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
66
77
"""
8-
version_info = (0, 0, 3)
8+
version_info = (0, 0, 4)
99

1010

1111
__version__ = ".".join([str(v) for v in version_info])

‎setup.py‎

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33

44
from setuptools import setup,find_packages
55

6+
import os as os
7+
8+
basedir = os.path.abspath(os.path.dirname(__file__))
9+
610

711
with open("README.md", "r") as f:
812
long_description = f.read()
913

10-
def get_install_requires() -> list:
11-
with open("requirements.txt", "r") as f:
12-
return [line.rstrip() for line in f]
13-
1414

1515
setup(
1616
name="Navycut",
@@ -27,24 +27,23 @@ def get_install_requires() -> list:
2727
include_package_data=True,
2828
zip_safe=False,
2929
platforms="any",
30-
install_requires = get_install_requires(),
31-
# install_requires=[
32-
# "Flask-Admin>=1.5.8",
33-
# "Flask-Bootstrap>=3.3.7.1",
34-
# "Flask-Cors>=3.0.10",
35-
# "flask-mailman>=0.3.0",
36-
# "Flask-Login>=0.5.0",
37-
# "Flask-Migrate>=2.7.0",
38-
# "Flask-SQLAlchemy>=2.5.1",
39-
# "Flask-WTF>=0.15.1",
40-
# "nc-console>=0.0.4",
41-
# "python-dotenv>=0.17.1",
42-
# "SQLAlchemy-JSONField>=1.0.0",
43-
# "WTForms<=2.3.3",
44-
# "WTForms-SQLAlchemy>=0.2",
45-
# "pillow>=8.3.0",
46-
# "Flask-Express>=0.1.1" # flask-express will maintain the default flask package and it's version.
47-
# ],
30+
install_requires=[
31+
"Flask-Admin>=1.5.8",
32+
"Flask-Bootstrap>=3.3.7.1",
33+
"Flask-Cors>=3.0.10",
34+
"flask-mailman>=0.3.0",
35+
"Flask-Login>=0.5.0",
36+
"Flask-Migrate>=2.7.0",
37+
"Flask-SQLAlchemy>=2.5.1",
38+
"Flask-WTF>=0.15.1",
39+
"nc-console>=0.0.4",
40+
"python-dotenv>=0.17.1",
41+
"SQLAlchemy-JSONField>=1.0.0",
42+
"WTForms<=2.3.3",
43+
"WTForms-SQLAlchemy>=0.2",
44+
"pillow>=8.3.0",
45+
"Flask-Express>=0.1.1" # flask-express will maintain the default flask package and it's version.
46+
],
4847
extras_require={},
4948
python_requires=">=3.6,<4",
5049
entry_points={
@@ -57,7 +56,7 @@ def get_install_requires() -> list:
5756
"Environment :: Web Environment",
5857
"Framework :: Flask",
5958
"Intended Audience :: Developers",
60-
"License :: OSI Approved :: BSD License",
59+
"License :: OSI Approved :: MIT License",
6160
"Operating System :: OS Independent",
6261
"Programming Language :: Python",
6362
"Programming Language :: Python :: 3",

0 commit comments

Comments
 (0)