Skip to content
Open
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
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -103,3 +103,6 @@ ENV/

# mypy
.mypy_cache/

# VSCode
.vscode/
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:16.04
FROM ubuntu:18.04

ADD requirements.txt setup.py package/
ADD modelforge package/modelforge
Expand Down
3 changes: 1 addition & 2 deletions doc/code_of_conduct.md → doc/CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Code of Conduct
# CODE OF CONDUCT

## Our Pledge

Expand Down Expand Up @@ -49,4 +49,3 @@ Project maintainers who do not follow or enforce the Code of Conduct in good fai
## Attribution

This Code of Conduct is adapted from the [Contributor Covenant](https://www.contributor-covenant.org), version 1.4, available at [https://www.contributor-covenant.org/version/1/4/code-of-conduct.html](https://www.contributor-covenant.org/version/1/4/code-of-conduct.html)

7 changes: 3 additions & 4 deletions doc/contributing.md → doc/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Contributing
# CONTRIBUTING

Modelforge project is [Apache 2.0 licensed](../LICENSE) and accepts contributions via GitHub pull requests. This document outlines some of the conventions on development workflow, commit message formatting, contact points, and other resources to make it easier to get your contribution accepted.

Expand All @@ -23,12 +23,12 @@ The official support channels, for both users and contributors, are:

Pull Requests \(PRs\) are the main and exclusive way to contribute to the official Modelforge project. In order for a PR to be accepted it needs to pass a list of requirements:

* Code coverage does not decrease.
* Code Coverage does not decrease.
* All the tests pass.
* The code is formatted according to [![PEP8](https://img.shields.io/badge/code%20style-pep8-orange.svg)](https://www.python.org/dev/peps/pep-0008/).
* If the PR is a bug fix, it has to include a new unit test that fails before the patch is merged.
* If the PR is a new feature, it has to come with a suite of unit tests, that tests the new functionality.
* In any case, all the PRs have to pass the personal evaluation of at least one of the [maintainers](maintainers.md).
* In any case, all the PRs have to pass the personal evaluation of at least one of the [maintainers](MAINTAINERS).

### Format of the commit message

Expand All @@ -41,4 +41,3 @@ Fix a bug
```

Every commit details should describe what was changed, under which context and, if applicable, the GitHub issue it relates to.

2 changes: 2 additions & 0 deletions doc/MAINTAINERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Vadim Markovtsev <vadim@sourced.tech> (@vmarkovtsev)
Romain Keramitas <r.keramitas@gmail.com> (@r0mainK)
3 changes: 0 additions & 3 deletions doc/maintainers.md

This file was deleted.

3 changes: 1 addition & 2 deletions requirements-lint.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
flake8==3.5.0
flake8-bugbear==18.8.0
flake8-docstrings==1.3.0
flake8-docstrings==1.3.1
flake8-import-order==0.18
flake8-quotes==1.0.0
flake8-per-file-ignores==0.6
pydocstyle==3.0.0 # remove when https://github.com/PyCQA/pydocstyle/issues/375 is solved
78 changes: 42 additions & 36 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
from importlib.machinery import SourceFileLoader
import os
from pathlib import Path

from setuptools import find_packages, setup

basedir = os.path.dirname(__file__)
root = Path(__file__).parent
modelforge = SourceFileLoader(
"modelforge", os.path.join(basedir, "modelforge", "version.py")).load_module()
with open(os.path.join(basedir, "README.md"), encoding="utf-8") as f:
"modelforge", (root / "modelforge" / "version.py").as_posix()
).load_module()
with (root / "README.md").open(encoding="utf-8") as f:
long_description = f.read()

setup(
name="modelforge",
description="APIs and tools to work with abstract \"models\" - files "
"with numpy arrays and metadata. It is possible to publish "
"models, list them. There is a built-in cache. Storage has backends.",
description="APIs and tools to work with abstract 'models' - files "
"with numpy arrays and metadata. It is possible to publish "
"models, list them. There is a built-in cache. Storage has backends.",
long_description=long_description,
long_description_content_type="text/markdown",
version=modelforge.__version__,
Expand All @@ -23,41 +24,46 @@
url="https://github.com/src-d/modelforge",
download_url="https://github.com/src-d/modelforge",
packages=find_packages(exclude=("modelforge.tests",)),
keywords=["model", "git", "asdf", "gcs", "google cloud storage",
"machine learning", "registry"],
install_requires=["asdf>=2.4.0,<2.5",
"lz4>=1.0,<3.0",
"numpy>=1.12,<2.0",
"scipy>=1.0,<2.0",
"clint>=0.5.0,<0.6",
"google-cloud-storage>=1.2,<=1.2.0",
# dulwich does not specify an upper version constraint for urllib3
# so we may end up with a conflict otherwise
"urllib3<1.25",
"requests>=2.0,<3.0",
"dulwich>=0.19,<1.0",
"jinja2>=2.10.1,<3.0",
"humanize>=0.5.0,<0.6",
"python-dateutil>=2.0,<3.0",
"typing;python_version<'3.5'",
"pygtrie>=1.0,<3.0",
"xxhash>=1.0,<2.0",
"spdx>=2.0,<3.0"],
entry_points={
"console_scripts": ["modelforge=modelforge.__main__:main"],
},
package_data={"": ["LICENSE", "README.md"],
"modelforge": ["templates/*"], },
keywords=[
"model",
"git",
"asdf",
"gcs",
"google cloud storage",
"machine learning",
"registry",
],
install_requires=[
"asdf>=2.4.0,<2.5",
"lz4>=1.0,<3.0",
"numpy>=1.12,<2.0",
"scipy>=1.0,<2.0",
"clint>=0.5.0,<0.6",
"google-cloud-storage>=1.2,<=1.2.0",
# dulwich does not specify an upper version constraint for urllib3
# so we may end up with a conflict otherwise
"urllib3<1.25",
"requests>=2.0,<3.0",
"dulwich>=0.19,<1.0",
"jinja2>=2.10.1,<3.0",
"humanize>=0.5.0,<0.6",
"python-dateutil>=2.0,<3.0",
"typing;python_version<'3.5'",
"pygtrie>=1.0,<3.0",
"xxhash>=1.0,<2.0",
"spdx>=2.0,<3.0",
],
entry_points={"console_scripts": ["modelforge=modelforge.__main__:main"]},
package_data={"": ["LICENSE", "README.md"], "modelforge": ["templates/*"]},
classifiers=[
"Development Status :: 3 - Alpha",
"Environment :: Console",
"Intended Audience :: Developers",
"License :: OSI Approved :: Apache Software License",
"Operating System :: POSIX",
"Programming Language :: Python :: 3.4",
"Programming Language :: Python :: 3.5",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Topic :: Software Development :: Libraries"

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+ 3.8

]
"Programming Language :: Python :: 3.8",
"Topic :: Software Development :: Libraries",
],
)