From 11028041680e1f8e5595fed67df9f8ba31e95d9e Mon Sep 17 00:00:00 2001 From: Cosmo Date: Thu, 10 Sep 2020 17:43:39 +0100 Subject: [PATCH 1/3] Adding installation instruction for python dataclasses for Python 3.6 --- setup.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index cf66d55c..6901a1e2 100644 --- a/setup.py +++ b/setup.py @@ -51,5 +51,8 @@ def extract_version(filename: str): url="https://github.com/UC-Davis-molecular-computing/scadnano-python-package", long_description=long_description, long_description_content_type='text/markdown; variant=GFM', - requires=['xlwt'] - ) + requires=['xlwt'], + install_requires=[ + 'dataclasses>=0.6;python_version<"3.7"' + ] +) From 1999445cc1e09db2e15fb43a3b7763ef242109db Mon Sep 17 00:00:00 2001 From: Cosmo Date: Fri, 11 Sep 2020 10:35:25 +0100 Subject: [PATCH 2/3] Require python 3.6 min --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index 6901a1e2..5089e5b2 100644 --- a/setup.py +++ b/setup.py @@ -51,6 +51,7 @@ def extract_version(filename: str): url="https://github.com/UC-Davis-molecular-computing/scadnano-python-package", long_description=long_description, long_description_content_type='text/markdown; variant=GFM', + python_requires='>=3.6', requires=['xlwt'], install_requires=[ 'dataclasses>=0.6;python_version<"3.7"' From 2061a9fb7e67e99e8c98f5e601a65d4744111375 Mon Sep 17 00:00:00 2001 From: David Doty Date: Fri, 11 Sep 2020 08:31:14 -0700 Subject: [PATCH 3/3] added instructions about commit messages to CONTRIBUTING; bumped version --- CONTRIBUTING.md | 10 ++++++---- scadnano/scadnano.py | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 273815d7..e4674e0f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -100,13 +100,15 @@ For any more significant change that is made (e.g., closing an issue, adding a n 6. Run unit tests and ensure they pass. -7. Create a pull request (PR). **WARNING:** by default, it will want to merge into the `master` branch. Change the destination branch to `dev`. +7. Commit the changes. In the commit message, reference the issue using the phrase "fixes #123" or "closes #123" (see [here](https://docs.github.com/en/enterprise/2.16/user/github/managing-your-work-on-github/closing-issues-using-keywords)). Also, in the commit message, describe the issue that was fixed (one easy way is to copy the title of the issue); this message will show up in automatically generated release notes, so this is part of the official documentation of what changed. -8. Wait for all checks to complete (see next section), and then merge the changes from the new branch into `dev`. This will typically require someone else to review the code first and possibly request changes. +8. Create a pull request (PR). **WARNING:** by default, it will want to merge into the `master` branch. Change the destination branch to `dev`. -9. After merging, it will say that the branch you just merged from can be safely deleted. Delete the branch. +9. Wait for all checks to complete (see next section), and then merge the changes from the new branch into `dev`. This will typically require someone else to review the code first and possibly request changes. -10. Locally, remember to switch back to the `dev` branch and pull it. (Although you added those changes locally, they revert back once you switch to your local `dev` branch, which needs to be synced with the remote repo for you to see the changes that were just merged from the now-deleted temporary branch.) +10. After merging, it will say that the branch you just merged from can be safely deleted. Delete the branch. + +11. Locally, remember to switch back to the `dev` branch and pull it. (Although you added those changes locally, they revert back once you switch to your local `dev` branch, which needs to be synced with the remote repo for you to see the changes that were just merged from the now-deleted temporary branch.) diff --git a/scadnano/scadnano.py b/scadnano/scadnano.py index f3911efb..07f321aa 100644 --- a/scadnano/scadnano.py +++ b/scadnano/scadnano.py @@ -44,7 +44,7 @@ # commented out for now to support Py3.6, which does not support this feature # from __future__ import annotations -__version__ = "0.12.1" # version line; WARNING: do not remove or change this line or comment +__version__ = "0.12.2" # version line; WARNING: do not remove or change this line or comment import dataclasses from abc import abstractmethod, ABC