Skip to content

Commit

Permalink
Merge pull request #11 from q-optimize/bugfix/1.1.1
Browse files Browse the repository at this point in the history
Bugfix/1.1.1
* Typos in version names
* `gast` and `tensorflow` conflict due to `pip` resolver issues on Windows
* Missing Templates for PRs and Issues
* Missing `rich` in `requirements.txt`
  • Loading branch information
lazyoracle committed Jan 13, 2021
2 parents 103762f + b925e19 commit ef95330
Show file tree
Hide file tree
Showing 5 changed files with 63 additions and 2 deletions.
38 changes: 38 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: ''
assignees: ''

---

**Describe the bug**
A clear and concise description of what the bug is.

**To Reproduce**
Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error

**Expected behavior**
A clear and concise description of what you expected to happen.

**Screenshots**
If applicable, add screenshots to help explain your problem.

**Desktop (please complete the following information):**
- OS: [e.g. iOS]
- Browser [e.g. chrome, safari]
- Version [e.g. 22]

**Smartphone (please complete the following information):**
- Device: [e.g. iPhone6]
- OS: [e.g. iOS8.1]
- Browser [e.g. stock browser, safari]
- Version [e.g. 22]

**Additional context**
Add any other context about the problem here.
20 changes: 20 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: ''
assignees: ''

---

**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

**Describe the solution you'd like**
A clear and concise description of what you want to happen.

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.

**Additional context**
Add any other context or screenshots about the feature request here.
2 changes: 1 addition & 1 deletion c3/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.2dev"
__version__ = "1.1.1"
1 change: 1 addition & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ pytz==2020.1
PyYAML==5.3.1
radon==4.3.2
requests-oauthlib==1.3.0
rich==9.2.0
rsa==4.6
scipy==1.5.2
six==1.15.0
Expand Down
4 changes: 3 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@

setup(
name="c3-toolset",
version="1.1",
version="1.1.1",
description="Toolset for control, calibration and characterization of physical systems",
url="http://www.q-optimize.org",
author="q-optimize",
author_email="c3@q-optimize.org",
include_package_data=True,
packages=[
Expand Down Expand Up @@ -37,6 +38,7 @@
"cma==3.0.3",
"cython",
"ipython==7.15.0",
"gast==0.3.3",
"hjson==3.0.2",
"rich==9.2.0",
"numpy==1.18.5",
Expand Down

0 comments on commit ef95330

Please sign in to comment.