Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename /scripts and update CONTRIBUTING.md #161

Merged
merged 11 commits into from
Nov 30, 2024
+64 −19
Merged

Rename /scripts and update CONTRIBUTING.md #161

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
0d09494
Rename /scripts directory and add detailed installation to
jcornall Nov 25, 2024
7e9b30f
Update CHANGELOG.md
jcornall Nov 25, 2024
83adcb9
Add /recipe and eqt_env.yml to branch
jcornall Nov 26, 2024
abef54b
Update mamba installation link
jcornall Nov 26, 2024
4cf733b
Remove intel channel from recipe, amend CHANGELOG.md
jcornall Nov 27, 2024
96e4a4c
Limit Python version to <3.12 in conda recipe
jcornall Nov 29, 2024
6f7975a
Update CHANGELOG.md
jcornall Nov 29, 2024
4022e3b
Update CONTRIBUTING.md
jcornall Nov 29, 2024
2f16202
Merge branch 'main' into update-recipe
jcornall Nov 29, 2024
8c0c25f
Amend formatting of Python version line in conda recipe
jcornall Nov 29, 2024
51f639f
Merge branch 'update-recipe' of github.com:TomographicImaging/eqt int…
jcornall Nov 29, 2024
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
7 changes: 3 additions & 4 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# Version 1.0.2
- Rename /scripts directory to /recipe
- Add additional channel to list of channels in eqt_env.yml
- Update CONTRIBUTING.md with detailed installation instructions
# Version x.x.x
- Rename /scripts directory to /recipe (#161)
- Update CONTRIBUTING.md with detailed installation instructions (#161)

# Version 1.0.1
- Add NoBorderScrollArea, example and tests (#155)
Expand Down
3 changes: 1 addition & 2 deletions recipe/eqt_env.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
name: eqt_env
channels:
- conda-forge
- https://software.repos.intel.com/python/conda
dependencies:
- python
jcornall marked this conversation as resolved.
Show resolved Hide resolved
- pip
- pyside2
- qdarkstyle
- qdarkstyle