Skip to content

Commit 45d9cbf

Browse files
moved paper and change action
1 parent aa23884 commit 45d9cbf

6 files changed

Lines changed: 80 additions & 37 deletions

File tree

.github/workflows/build_pdf.yml

Lines changed: 0 additions & 20 deletions
This file was deleted.

.github/workflows/draft-pdf.yml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
name: Draft PDF
2+
on: [push]
3+
4+
jobs:
5+
paper:
6+
runs-on: ubuntu-latest
7+
name: Paper Draft
8+
steps:
9+
- name: Checkout
10+
uses: actions/checkout@v4
11+
- name: Build draft PDF
12+
uses: openjournals/openjournals-draft-action@master
13+
with:
14+
journal: joss
15+
# This should be the path to the paper within your repo.
16+
paper-path: paper/paper.md
17+
- name: Upload
18+
uses: actions/upload-artifact@v4
19+
with:
20+
name: paper
21+
# This is the output path where Pandoc will write the compiled
22+
# PDF. Note, this should be the same directory as the input
23+
# paper.md
24+
path: paper.pdf

CONTRIBUTING.md

Lines changed: 53 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,60 @@
11
# Contributing to PICA
22

3-
Thank you for your interest in PICA (Python-based Instrument Control and Automation)
4-
The UGC-DAE Consortium for Scientific Research has the overarching objective of facilitating researchers by providing convenient access to a wide range of advanced research facilities. In alignment with this mission, the present software has been developed to serve a similar purpose.
3+
First off, thank you for considering contributing to PICA! It's people like you that make PICA such a great tool.
54

6-
Originally, this project was conceived and implemented for our Advanced Transport Measurement System. We are now extending its scope beyond this specific system, with the intention of establishing a general software framework upon which users can contribute and integrate additional modules. All contributed modules are expected to be rigorously tested on the corresponding experimental instruments to ensure reliability and scientific validity.
5+
## Where do I go from here?
76

8-
We welcome requests for new features and are open to collaboration in developing modules tailored to the specific requirements of individual users. Feedback, contributions, and constructive criticism from both the scientific and software development communities are explicitly encouraged, as they are essential for the continuous improvement and robustness of this software platform.
7+
If you've noticed a bug or have a feature request, [make one](https://github.com/Ketan-Anand/PICA-Python-Instrument-Control-and-Automation/issues/new)! It's generally best if you get confirmation of your bug or approval for your feature request this way before starting to code.
98

9+
### Fork & create a branch
1010

11-
## How to Report Bugs
12-
If you encounter an error while running a measurement:
13-
1. Go to the [Issues tab](https://github.com/prathameshnium/PICA-Python-Instrument-Control-and-Automation/issues).
14-
2. Click "New Issue".
15-
3. Include the error message from the PICA console and which instrument you were using (e.g., Keithley 2400).
11+
If this is something you think you can fix, then [fork PICA](https://github.com/Ketan-Anand/PICA-Python-Instrument-Control-and-Automation/fork) and create a branch with a descriptive name.
1612

17-
## How to Suggest Features
18-
If you have a script for a new instrument (e.g., a lock-in amplifier) that you would like to include:
19-
1. Fork this repository.
20-
2. Add your script to a new folder in pica (e.g., `SRS_830/`).
21-
3. Submit a Pull Request (PR) describing what the instrument does.
13+
A good branch name would be (where issue #325 is the ticket you're working on):
14+
15+
```sh
16+
git checkout -b 325-add-japanese-translations
17+
```
18+
19+
### Get the test suite running
20+
21+
Make sure you're running the test suite locally. It's a good idea to do this before you start making changes to ensure that everything is working correctly.
22+
23+
### Implement your fix or feature
24+
25+
At this point, you're ready to make your changes! Feel free to ask for help; everyone is a beginner at first :smile_cat:
26+
27+
### Make a Pull Request
28+
29+
At this point, you should switch back to your master branch and make sure it's up to date with the latest upstream version of PICA.
30+
31+
```sh
32+
git remote add upstream git@github.com:Ketan-Anand/PICA-Python-Instrument-Control-and-Automation.git
33+
git checkout master
34+
git pull upstream master
35+
```
36+
37+
Then update your feature branch from your local copy of master, and push it!
38+
39+
```sh
40+
git checkout 325-add-japanese-translations
41+
git rebase master
42+
git push --force-with-lease origin 325-add-japanese-translations
43+
```
44+
45+
Finally, go to GitHub and [make a Pull Request](https://github.com/Ketan-Anand/PICA-Python-Instrument-Control-and-Automation/compare)
46+
47+
### Keeping your Pull Request updated
48+
49+
If a maintainer asks you to "rebase" your PR, they're saying that a lot of code has changed, and that you need to update your branch so it's easier to merge.
50+
51+
To learn more about rebasing and merging, check out this guide from Atlassian:
52+
[https://www.atlassian.com/git/tutorials/merging-vs-rebasing](https://www.atlassian.com/git/tutorials/merging-vs-rebasing)
53+
54+
## How to get in touch
55+
56+
You can reach out to the maintainers of PICA by creating an issue.
57+
58+
## Code of Conduct
59+
60+
Everyone interacting in the PICA project's codebases, issue trackers, chat rooms, and mailing lists is expected to follow the [PICA Code of Conduct](CODE_OF_CONDUCT.md).

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ PICA is now structured as a standard Python package. Follow these steps to insta
137137
pip install -e .
138138
```
139139

140-
## ��️ Running the Software
140+
## Running the Software
141141

142142
You can now run PICA in two modes: the standard Graphical User Interface (GUI) or the new Command Line Interface (CLI) for headless operation.
143143

@@ -155,7 +155,7 @@ You can now run PICA in two modes: the standard Graphical User Interface (GUI) o
155155

156156
---
157157

158-
## �� Running Tests
158+
## Running Tests
159159

160160
This repository includes a robust test suite using `pytest`. It mocks hardware interactions and GUI components, allowing the logic to be verified in a headless environment (CI).
161161

@@ -226,7 +226,7 @@ This period marked the transition to the **GUI-Backend isolated architecture**.
226226
227227
---
228228
229-
## �� Resources & Documentation
229+
## Resources & Documentation
230230
231231
* **User Manual:** Detailed setup and troubleshooting guides are available in [docs/User_Manual.md](docs/User_Manual.md).
232232
* **Instrument Manuals:** Original PDF manuals for the supported hardware are located in `assets/Manuals/`.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)