diff --git a/AUTHORS.rst b/AUTHORS.rst index 8fa4737..ce4f9c6 100644 --- a/AUTHORS.rst +++ b/AUTHORS.rst @@ -1,7 +1 @@ -======= -Credits -======= - -* Kevin Alex Zhang -* Kalyan Veeramachaneni -* Carles Sala +See: https://github.com/sdv-dev/DeepEcho/graphs/contributors diff --git a/LICENSE b/LICENSE index da2b55b..3d6cf1e 100644 --- a/LICENSE +++ b/LICENSE @@ -1,22 +1,107 @@ -MIT License +Business Source License 1.1 -Copyright (c) 2020, MIT Data To AI Lab +Parameters -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: +Licensor: DataCebo, Inc. -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. +Licensed Work: DeepEcho + The Licensed Work is (c) DataCebo, Inc. -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. +Additional Use Grant: You may make use of the Licensed Work, and derivatives of the Licensed + Work, provided that you do not use the Licensed Work, or derivatives of + the Licensed Work, for a Synthetic Data Creation Service. + A "Synthetic Data Creation Service" is a commercial offering + that allows third parties (other than your employees and + contractors) to access the functionality of the Licensed + Work so that such third parties directly benefit from the + data processing, machine learning or synthetic data creation + features of the Licensed Work. + +Change Date: Change date is four years from release date. + Please see https://github.com/sdv-dev/DeepEcho/releases + for exact dates. + +Change License: MIT License + + + +Notice + +The Business Source License (this document, or the "License") is not an Open +Source license. However, the Licensed Work will eventually be made available +under an Open Source License, as stated in this License. + +License text copyright (c) 2017 MariaDB Corporation Ab, All Rights Reserved. +"Business Source License" is a trademark of MariaDB Corporation Ab. + +----------------------------------------------------------------------------- + +Business Source License 1.1 + +Terms + +The Licensor hereby grants you the right to copy, modify, create derivative +works, redistribute, and make non-production use of the Licensed Work. The +Licensor may make an Additional Use Grant, above, permitting limited +production use. + +Effective on the Change Date, or the fourth anniversary of the first publicly +available distribution of a specific version of the Licensed Work under this +License, whichever comes first, the Licensor hereby grants you rights under +the terms of the Change License, and the rights granted in the paragraph +above terminate. + +If your use of the Licensed Work does not comply with the requirements +currently in effect as described in this License, you must purchase a +commercial license from the Licensor, its affiliated entities, or authorized +resellers, or you must refrain from using the Licensed Work. + +All copies of the original and modified Licensed Work, and derivative works +of the Licensed Work, are subject to this License. This License applies +separately for each version of the Licensed Work and the Change Date may vary +for each version of the Licensed Work released by Licensor. + +You must conspicuously display this License on each original or modified copy +of the Licensed Work. If you receive the Licensed Work in original or +modified form from a third party, the terms and conditions set forth in this +License apply to your use of that work. + +Any use of the Licensed Work in violation of this License will automatically +terminate your rights under this License for the current and all other +versions of the Licensed Work. + +This License does not grant you any right in any trademark or logo of +Licensor or its affiliates (provided that you may use a trademark or logo of +Licensor as expressly required by this License). + +TO THE EXTENT PERMITTED BY APPLICABLE LAW, THE LICENSED WORK IS PROVIDED ON +AN "AS IS" BASIS. LICENSOR HEREBY DISCLAIMS ALL WARRANTIES AND CONDITIONS, +EXPRESS OR IMPLIED, INCLUDING (WITHOUT LIMITATION) WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, AND +TITLE. + +MariaDB hereby grants you permission to use this License’s text to license +your works, and to refer to it using the trademark "Business Source License", +as long as you comply with the Covenants of Licensor below. + +Covenants of Licensor + +In consideration of the right to use this License’s text and the "Business +Source License" name and trademark, Licensor covenants to MariaDB, and to all +other recipients of the licensed work to be provided by Licensor: + +1. To specify as the Change License the GPL Version 2.0 or any later version, + or a license that is compatible with GPL Version 2.0 or a later version, + where "compatible" means that software provided under the Change License can + be included in a program with software provided under GPL Version 2.0 or a + later version. Licensor may specify additional Change Licenses without + limitation. + +2. To either: (a) specify an additional grant of rights to use that does not + impose any additional restriction on the right granted in this License, as + the Additional Use Grant; or (b) insert the text "None". + +3. To specify a Change Date. + +4. Not to modify this License in any other way. diff --git a/README.md b/README.md index ecce2fa..70960eb 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,6 @@ time series**. It provides: | :orange_book: **[SDV Blog]** | Regular publshing of useful content about Synthetic Data Generation. | | :book: **[Documentation]** | Quickstarts, User and Development Guides, and API Reference. | | :octocat: **[Repository]** | The link to the Github Repository of this library. | -| :scroll: **[License]** | The entire ecosystem is published under the MIT License. | | :keyboard: **[Development Status]** | This software is in its Pre-Alpha stage. | | [![][Slack Logo] **Community**][Community] | Join our Slack Workspace for announcements and discussions. | | [![][MyBinder Logo] **Tutorials**][Tutorials] | Run the SDV Tutorials in a Binder environment. | diff --git a/conda/README.md b/conda/README.md deleted file mode 100644 index 6791520..0000000 --- a/conda/README.md +++ /dev/null @@ -1,29 +0,0 @@ -## Instructions - -These are instructions to deploy the latest version of **DeepEcho** to [conda](https://docs.conda.io/en/latest/). -It should be done after every new release. - -## Update the recipe -Prior to making the release on PyPI, you should update the meta.yaml to reflect any changes in the dependencies. -Note that you do not need to edit the version number as that is managed by bumpversion. - -## Make the PyPI release -Follow the standard release instructions to make a PyPI release. Then, return here to make the conda release. - -## Build a package -As part of the PyPI release, you will have updated the stable branch. You should now check out the stable -branch and build the conda package. - -```bash -git checkout stable -cd conda -conda build -c sdv-dev -c pytorch -c conda-forge . -``` - -## Upload to Anaconda -Finally, you can upload the resulting package to Anaconda. - -```bash -anaconda login -anaconda upload -u sdv-dev -``` \ No newline at end of file diff --git a/conda/meta.yaml b/conda/meta.yaml deleted file mode 100644 index cb57d84..0000000 --- a/conda/meta.yaml +++ /dev/null @@ -1,43 +0,0 @@ -{% set name = "deepecho" %} -{% set version = '0.3.1.dev0' %} - -package: - name: "{{ name|lower }}" - version: "{{ version }}" - -source: - url: "https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz" - -build: - number: 0 - noarch: python - script: "{{ PYTHON }} -m pip install . -vv" - -requirements: - host: - - pip - - pytest-runner - - python >=3.6,<3.10 - - numpy >=1.18.0,<2 - - pandas >=1.1.3,<2 - - pytorch >=1.8.0,<2 - - tqdm >=4.10,<5 - run: - - python >=3.6,<3.10 - - numpy >=1.20.0,<2 - - pandas >=1.1.3,<2 - - pytorch >=1.8.0,<2 - - tqdm >=4.10,<5 - -about: - home: "https://github.com/sdv-dev/DeepEcho" - license: MIT - license_family: MIT - license_file: - summary: "Mixed-type multivariate time series modeling with generative adversarial networks." - doc_url: - dev_url: - -extra: - recipe-maintainers: - - sdv-dev diff --git a/deepecho/__init__.py b/deepecho/__init__.py index ef94ab2..ad29e08 100644 --- a/deepecho/__init__.py +++ b/deepecho/__init__.py @@ -1,7 +1,7 @@ """Top-level package for DeepEcho.""" -__author__ = 'MIT Data To AI Lab' -__email__ = 'dailabmit@gmail.com' +__author__ = 'DataCebo, Inc.' +__email__ = 'info@sdv.dev' __version__ = '0.3.1.dev0' __path__ = __import__('pkgutil').extend_path(__path__, __name__) diff --git a/setup.py b/setup.py index eb9c62a..39abb3f 100644 --- a/setup.py +++ b/setup.py @@ -76,20 +76,21 @@ ] setup( - author='MIT Data To AI Lab', - author_email='dailabmit@gmail.com', + author='DataCebo, Inc.', + author_email='info@sdv.dev', classifiers=[ 'Development Status :: 2 - Pre-Alpha', 'Intended Audience :: Developers', - 'License :: OSI Approved :: MIT License', + 'License :: Free for non-commercial use', 'Natural Language :: English', 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', + 'Topic :: Scientific/Engineering :: Artificial Intelligence', ], - description='Mixed-type multivariate time series modeling with generative adversarial networks.', + description='Create sequential synthetic data of mixed types using a GAN.', extras_require={ 'test': tests_require, 'dev': development_requires + tests_require, @@ -97,7 +98,7 @@ include_package_data=True, install_requires=install_requires, keywords='deepecho deepecho DeepEcho', - license='MIT license', + license='BSL-1.1', long_description=readme + '\n\n' + history, long_description_content_type='text/markdown', name='deepecho',