From 42c6b60e0ecd99b64ba7dff2008793c74512a42b Mon Sep 17 00:00:00 2001 From: Casper Welzel Andersen Date: Wed, 24 Apr 2019 21:51:09 +0200 Subject: [PATCH] Changes according to @giovannipizzi and @ltalirz Changed to relative links for files in repo. Updated reasoning point behind leaving out export version 0.1 file. Added `MANIFEST.in` to get all `*.aiida` files in the dist package. Changed the name to `aiida-export-migration-tests`. Note: Adding `MANIFEST.in` is not enough, one must also add `include_package_data=True` in the setup function in `setup.py` --- MANIFEST.in | 2 ++ README.md | 10 +++++----- .../__init__.py | 0 .../fixtures/export_v0.2.aiida | Bin .../fixtures/export_v0.3.aiida | Bin .../fixtures/export_v0.3_no_Nodes.aiida | Bin .../fixtures/export_v0.4.aiida | Bin .../tests/__init__.py | 0 .../tests/test_migration.py | 0 .../tests/test_v01_to_v02.py | 0 .../tests/test_v02_to_v03.py | 0 .../tests/test_v03_to_v04.py | 0 .../utils.py | 0 setup.py | 14 +++++++++++--- 14 files changed, 18 insertions(+), 8 deletions(-) create mode 100644 MANIFEST.in rename {aiida-export_migration-testing => aiida-export-migration-tests}/__init__.py (100%) rename {aiida-export_migration-testing => aiida-export-migration-tests}/fixtures/export_v0.2.aiida (100%) rename {aiida-export_migration-testing => aiida-export-migration-tests}/fixtures/export_v0.3.aiida (100%) rename {aiida-export_migration-testing => aiida-export-migration-tests}/fixtures/export_v0.3_no_Nodes.aiida (100%) rename {aiida-export_migration-testing => aiida-export-migration-tests}/fixtures/export_v0.4.aiida (100%) rename {aiida-export_migration-testing => aiida-export-migration-tests}/tests/__init__.py (100%) rename {aiida-export_migration-testing => aiida-export-migration-tests}/tests/test_migration.py (100%) rename {aiida-export_migration-testing => aiida-export-migration-tests}/tests/test_v01_to_v02.py (100%) rename {aiida-export_migration-testing => aiida-export-migration-tests}/tests/test_v02_to_v03.py (100%) rename {aiida-export_migration-testing => aiida-export-migration-tests}/tests/test_v03_to_v04.py (100%) rename {aiida-export_migration-testing => aiida-export-migration-tests}/utils.py (100%) diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 0000000..e6b4641 --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1,2 @@ +include aiida-export-migration-tests/fixtures/*.aiida +include .qm/*.py diff --git a/README.md b/README.md index 359ee88..f600d61 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ including when tests for the different export versions are first included. | This module | AiiDA | Export versions (when first included) | | ----------- | ----- | ------------------------------------- | -| 0.1.0 | [1.0.0](https://github.com/aiidateam/aiida_core/releases/tag/v1.0.0) | 0.1 -> 0.2 , 0.2 -> 0.3 , 0.3 -> 0.4 | +| 0.1.0 | [1.0.0](https://github.com/aiidateam/aiida_core/releases/tag/v1.0.0) | 0.1 -> 0.2 ; 0.2 -> 0.3 ; 0.3 -> 0.4 | ## Q&A @@ -63,7 +63,7 @@ PR [#2478](https://github.com/aiidateam/aiida_core/pull/2478)). \*Due to the following reasons, we decided **not** to invest an effort in making the representative archive migration for 0.1: -1. AiiDA 0.6.0.1 was never released on PyPi. +1. The earliest version released on PyPi is 0.8.0rc1 (22.03.2017). 1. The previous stable version (AiiDA 0.5.0) was not working in a virtual environment. 1. The migration from v0.1 to v0.2 is small and quite simple. If an export file should be found that cannot be properly migrated, due to this step, @@ -82,9 +82,9 @@ and correspond to the following export versions and | Export version | Workflow | Run workflow script | Quantum Mobile | | -------------- | -------- | ------------------- | -------------- | | ~~v0.1~~* | - | - | - | -| v0.2 | [wf.py](https://raw.githubusercontent.com/aiidateam/aiida-export_migration-testing/v0.1.0/.qm/wf.py) | [run_wf.py](https://raw.githubusercontent.com/aiidateam/aiida-export_migration-testing/v0.1.0/.qm/run_wf.py) | [historical_aiida_0.9.1](https://github.com/marvel-nccr/quantum-mobile/tree/historical_aiida_0.9.1) | -| v0.3 | [wf.py](https://raw.githubusercontent.com/aiidateam/aiida-export_migration-testing/v0.1.0/.qm/wf.py) | [run_wf.py](https://raw.githubusercontent.com/aiidateam/aiida-export_migration-testing/v0.1.0/.qm/run_wf.py) | [v19.03.0](https://github.com/marvel-nccr/quantum-mobile/releases/tag/19.03.0) | -| v0.4 | [wf_aiida_1.0.py](https://raw.githubusercontent.com/aiidateam/aiida-export_migration-testing/v0.1.0/.qm/wf_aiida_1.0.py) | [run_wf_aiida_1.0.py](https://raw.githubusercontent.com/aiidateam/aiida-export_migration-testing/v0.1.0/.qm/run_wf_aiida_1.0.py) | _in development_ | +| v0.2 | [wf.py](.qm/wf.py) | [run_wf.py](.qm/run_wf.py) | [historical_aiida_0.9.1](https://github.com/marvel-nccr/quantum-mobile/tree/historical_aiida_0.9.1) | +| v0.3 | [wf.py](.qm/wf.py) | [run_wf.py](.qm/run_wf.py) | [v19.03.0](https://github.com/marvel-nccr/quantum-mobile/releases/tag/19.03.0) | +| v0.4 | [wf_aiida_1.0.py](.qm/wf_aiida_1.0.py) | [run_wf_aiida_1.0.py](.qm/run_wf_aiida_1.0.py) | _in development_ | \*See section _Release notes#0.1.0 (April 2019)_. diff --git a/aiida-export_migration-testing/__init__.py b/aiida-export-migration-tests/__init__.py similarity index 100% rename from aiida-export_migration-testing/__init__.py rename to aiida-export-migration-tests/__init__.py diff --git a/aiida-export_migration-testing/fixtures/export_v0.2.aiida b/aiida-export-migration-tests/fixtures/export_v0.2.aiida similarity index 100% rename from aiida-export_migration-testing/fixtures/export_v0.2.aiida rename to aiida-export-migration-tests/fixtures/export_v0.2.aiida diff --git a/aiida-export_migration-testing/fixtures/export_v0.3.aiida b/aiida-export-migration-tests/fixtures/export_v0.3.aiida similarity index 100% rename from aiida-export_migration-testing/fixtures/export_v0.3.aiida rename to aiida-export-migration-tests/fixtures/export_v0.3.aiida diff --git a/aiida-export_migration-testing/fixtures/export_v0.3_no_Nodes.aiida b/aiida-export-migration-tests/fixtures/export_v0.3_no_Nodes.aiida similarity index 100% rename from aiida-export_migration-testing/fixtures/export_v0.3_no_Nodes.aiida rename to aiida-export-migration-tests/fixtures/export_v0.3_no_Nodes.aiida diff --git a/aiida-export_migration-testing/fixtures/export_v0.4.aiida b/aiida-export-migration-tests/fixtures/export_v0.4.aiida similarity index 100% rename from aiida-export_migration-testing/fixtures/export_v0.4.aiida rename to aiida-export-migration-tests/fixtures/export_v0.4.aiida diff --git a/aiida-export_migration-testing/tests/__init__.py b/aiida-export-migration-tests/tests/__init__.py similarity index 100% rename from aiida-export_migration-testing/tests/__init__.py rename to aiida-export-migration-tests/tests/__init__.py diff --git a/aiida-export_migration-testing/tests/test_migration.py b/aiida-export-migration-tests/tests/test_migration.py similarity index 100% rename from aiida-export_migration-testing/tests/test_migration.py rename to aiida-export-migration-tests/tests/test_migration.py diff --git a/aiida-export_migration-testing/tests/test_v01_to_v02.py b/aiida-export-migration-tests/tests/test_v01_to_v02.py similarity index 100% rename from aiida-export_migration-testing/tests/test_v01_to_v02.py rename to aiida-export-migration-tests/tests/test_v01_to_v02.py diff --git a/aiida-export_migration-testing/tests/test_v02_to_v03.py b/aiida-export-migration-tests/tests/test_v02_to_v03.py similarity index 100% rename from aiida-export_migration-testing/tests/test_v02_to_v03.py rename to aiida-export-migration-tests/tests/test_v02_to_v03.py diff --git a/aiida-export_migration-testing/tests/test_v03_to_v04.py b/aiida-export-migration-tests/tests/test_v03_to_v04.py similarity index 100% rename from aiida-export_migration-testing/tests/test_v03_to_v04.py rename to aiida-export-migration-tests/tests/test_v03_to_v04.py diff --git a/aiida-export_migration-testing/utils.py b/aiida-export-migration-tests/utils.py similarity index 100% rename from aiida-export_migration-testing/utils.py rename to aiida-export-migration-tests/utils.py diff --git a/setup.py b/setup.py index 55954b5..4356d4e 100644 --- a/setup.py +++ b/setup.py @@ -3,10 +3,18 @@ from __future__ import absolute_import from setuptools import setup, find_packages +with open("README.md", "r") as fh: + long_description = fh.read() + setup( - name="aiida-export_migration-testing", + name="aiida-export-migration-tests", version="0.1.0", + author="The AiiDA team", + author_email="developers@aiida.net", + description="Export migrations tests for AiiDA", + long_description=long_description, + long_description_content_type="text/markdown", + url="https://github.com/aiidateam/aiida-export-migration-tests", packages=find_packages(), license="MIT Licence", - author="The AiiDA team", - install_requires=["aiida-core>=1.0.0"]) + include_package_data=True)