Skip to content
This repository was archived by the owner on Feb 19, 2022. It is now read-only.

Commit b39c052

Browse files
committed
get distribution to working state
1 parent 0da13ec commit b39c052

12 files changed

+29
-14
lines changed

.gitignore

+4-7
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
# Compiled python modules.
1+
.python-version
22
*.pyc
3-
4-
# Setuptools distribution folder.
5-
/dist/
6-
7-
# Python egg metadata, regenerated from source files by setuptools.
8-
/*.egg-info
3+
build/
4+
dist/
5+
*.egg-info

LICENSE.txt

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
2+
3+
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
4+
5+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

MANIFEST

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# file GENERATED by distutils, do NOT edit
2+
README.rst
3+
setup.py
4+
flask_restplus_marshmallow/__init__.py
5+
flask_restplus_marshmallow/_http.py
6+
flask_restplus_marshmallow/api.py
7+
flask_restplus_marshmallow/model.py
8+
flask_restplus_marshmallow/namespace.py
9+
flask_restplus_marshmallow/parameters.py
10+
flask_restplus_marshmallow/resource.py
11+
flask_restplus_marshmallow/swagger.py

flask_restplus_patched/__init__.py flask_restplus_marshmallow/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from flask_restplus import *
22
from .api import Api
3-
from .model import Schema, ModelSchema, DefaultHTTPErrorSchema
3+
from .model import Schema, DefaultHTTPErrorSchema
44
from .namespace import Namespace
55
from .parameters import Parameters, PostJSONParameters
66
from .swagger import Swagger
File renamed without changes.

flask_restplus_patched/api.py flask_restplus_marshmallow/api.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from flask_restplus Api as OriginalApi
1+
from flask_restplus import Api as OriginalApi
22
from werkzeug import cached_property
33
from .swagger import Swagger
44

File renamed without changes.

flask_restplus_patched/namespace.py flask_restplus_marshmallow/namespace.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from flask_restplus.utils import merge
66
from webargs.flaskparser import FlaskParser
77
from werkzeug import exceptions as http_exceptions
8-
from .model import Model
8+
from .model import Model, DefaultHTTPErrorSchema
99
from ._http import HTTPStatus
1010

1111

File renamed without changes.
File renamed without changes.
File renamed without changes.

setup.py

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
1-
from setuptools import setup
1+
from distutils.core import setup
22

33

44
setup(
55
name="flask-restplus-marshmallow",
6-
version='0.1.0',
6+
version='0.1.3',
77
url="https://github.com/joeyorlando/flask-restplus-marshmallow",
88
author="Joey Orlando",
99
author_email="[email protected]",
1010
description="Flask RESTPlus with a twist of marshmallow",
11-
long_description=open('README.md').read(),
12-
packages=['flask_restplus_patched']
11+
long_description=open('README.rst').read(),
12+
packages=[
13+
'flask_restplus_marshmallow'
14+
],
1315
zip_safe=False,
1416
platforms='any',
1517
install_requires=[

0 commit comments

Comments
 (0)