Contributions to PyPop are welcome, and they are greatly appreciated! Every little bit helps, and credit will always be given.
When reporting a bug please use one of the provided issue templates if applicable, otherwise just start a blank issue and describe your situation. Here is a checklist:
Check previous issues. Ensure the bug was not already reported by searching on GitHub under Issues.
Provide complete self-contained examples. If you're unable to find an open issue addressing the problem, open a new one. Be sure to include a title and clear description, as much relevant information as possible, and a code sample or an executable test case (including any input files) demonstrating the expected behavior that is not occurring.
Use templates. If possible, use the relevant bug report templates to create the issue. For a standard bug report (including installation issues), please use this: bug report template, for feature requests or documentation issues, see below.
Provide full commands and errors as plaintext, not screenshots. When you are including the output of an error in your bug report (whether an installation error, a build error, an error running
pypop
or an error building docs), please cut-and-paste from your console application or terminal, the entire set of commands leading up to the error, along with the complete error output as a single plaintext output. E.g. here is an example error from runningpypop
on a badly formed.ini
file:$ pypop -c minimal.ini USAFEL-UchiTelle-small.pop Traceback (most recent call last): File "/home/user/.conda/envs/pypop/bin/pypop", line 8, in <module> sys.exit(main()) File "/home/user/.conda/envs/pypop/lib/python3.10/site-packages/PyPop/pypop.py", line 250, in main config = getConfigInstance(configFilename, altpath) File "/home/user/.conda/envs/pypop/lib/python3.10/site-packages/PyPop/Main.py", line 62, in getConfigInstance config.read(configFilename) File "/home/user/.conda/envs/pypop/lib/python3.10/configparser.py", line 698, in read self._read(fp, filename) File "/home/user/.conda/envs/pypop/lib/python3.10/configparser.py", line 1086, in _read raise MissingSectionHeaderError(fpname, lineno, line) configparser.MissingSectionHeaderError: File contains no section headers. file: 'minimal.ini', line: 4 ' j[General]\n'
Please do not just post screenshots of commands and error output. It's OK if you want to also include a screenshot as supplement, but be sure you also include the commands and output as plaintext as well. (If the output is too long for including inline as a comment on the issue, you can save it in a file, and drag-and-drop it into an issue comment).
Include environment. When reporting bugs, especially during installation, please run the following and include the output of:
echo $CPATH echo $LIBRARY_PATH echo $PATH which python
If you are running on MacOS, and you used the MacPorts installation method, please also run and include the output of:
port installed
Keep each issue focused on one specific problem. Each issue should be focused on one problem. Don't use an issue for open-ended discussion, or as a place to collect all issues with pypop you run into. If, during the comments, you discover another bug, unrelated to the current issue, please open up a new issue and reference it in the current issue.
Run the test suite. In many cases, especially if you are investigating a new platform (e.g. new architecture) developers may ask you run the full test suite via
pytest
, see run unit tests with pytest. in "verbose" mode (i.e.pytest -v
). If you do this, please supply the output of the resulting temporary directories on your issue (see the unit test section for more details). Note that you will likely need to clone the main repository as the unit tests are not distributed with the binary wheels.
pypop could always use more documentation, whether as part of the official docs, in docstrings, or even on the web in blog posts, articles, and such. Write us a documentation issue describing what you would like to see improved in here.
If you are able to contribute directly (e.g., via a pull request), please read our website contribution guide.
The best way to send feedback is to file an issue using the feature template.
If you are proposing a feature:
- Explain in detail how it would work.
- Keep the scope as narrow as possible, to make it easier to implement.
- Remember that this is a volunteer-driven project, and that code contributions are welcome
To contribute new code that implement a feature, or fix a bug, this section provides a step-by-step guide to getting you set-up. The main steps are:
- forking the repository (or "repo")
- cloning the main repo on to your local machine
- making a new branch
- installing a development version on your machine
- updating your branch when "upstream" (the main repository) has changes to include those changes in your local branch
- updating
AUTHORS.rst
- checking unit tests pass
- making a pull request (including a description of your changes
suitable for inclusion in
NEWS.md
)
Fork this repository before contributing. Forks creates a cleaner representation of the contributions to the project.
Next, clone the main repository to your local machine:
git clone https://github.com/alexlancaster/pypop.git
cd pypop
Add your fork as an upstream repository:
git remote add myfork git://github.com/YOUR-USERNAME/pypop.git
git fetch myfork
From the main
branch create a new branch where to develop the new code.
git checkout main
git checkout -b new_branch
Note the main
branch is from the main repository.
Now you are ready to make your changes. First, you need to build
pypop
locally on your machine, and ensure it works, see the
separate section on building and installing a development version.
Once you have done the installation and have verified that it works, you can start to develop the feature, or make the bug fix, and keep regular pushes to your fork with comprehensible commit messages.
git status
git add # (the files you want)
git commit # (add a nice commit message)
git push myfork new_branch
While you are developing, you can execute pytest
as needed to run
your unit tests. See run unit tests with pytest.
You should keep your branch in sync with the upstream main
branch. For that:
git checkout main # return to the main branch
git pull # retrieve the latest source from the main repository
git checkout new_branch # return to your devel branch
git merge --no-ff main # merge the new code to your branch
At this point you may need to solve merge conflicts if they exist. If you don't know how to do this, I suggest you start by reading the official docs
You can push to your fork now if you wish:
git push myfork new_branch
And, continue doing your developments are previously discussed.
Also add your name to the author table at AUTHORS.rst
, so you
will also be included in the periodic Zenodo software releases (see
also the section on Crediting contributors).
Once you have done your initial installation, you should first check
that the build worked, by running the test suite, via pytest
:
pytest tests
If pytest
is not already installed, you can install via:
pip install pytest
If you run into errors during your initial installationg, please first
carefully repeat and/or check your installation. If you still get
errors, file a bug, and include the output of pytest
run in
verbose mode and capturing the output
pytest -s -v tests
Preserving output from unit tests
Supplying the -v
verbose option will preserve the run-time
output of unit tests that write files to disk in temporary
directories unique for each run (by default these directories are
created for the duration of the unit tests and then are deleted
after the test is run). The format of the output directories is
`run_test_<test-name>_<unique_id>
, e.g. the directories created
will look similar to the following:
run_test_AlleleColon_HardyWeinberg_u3dnf99y
run_test_USAFEL_49h_exhg
You should also continuously run pytest
as you are developing your
code, to ensure that you don't inadvertently break anything.
Also before creating a Pull Request from your branch, check that all the tests pass correctly, using the above.
These are exactly the same tests that will be performed online via Github Actions continuous integration (CI). This project follows CI good practices (let us know if something can be improved).
Once you are finished, create a pull request to the main repository and engage with the developers.
When you create the pull request in the initial submission box, you should create a description of your changes with an explanatory bullet list of the contributions. Please note if any of your changes will break existing behaviour or anything else that would be important for an end-user to know. This description should be in Markdown format. Here is an example:
### New features
- here goes my new additions, explain them shortly and well
- this feature will require an an update to your `.ini` file
This will be used to populate the Release Notes and eventually be
included in the NEWS.md
file.
If you need some code review or feedback while you're developing the code, you can also make a pull request, even if you're not fully finished.
However, before submitting a Pull Request, verify your development branch passes all tests as described above . If you are developing new code you should also implement new test cases.
Pull Request checklist
Before requesting a finale merge, you should:
- Make sure your PR passes all
pytest
tests. - Add unit tests if you are developing new features
- Update documentation when there's new API, functionality etc.
- In the submission for the PR, include a description of the changes,
in markdown format, suitable for eventual inclusion in
NEWS.md
. - Add yourself to
AUTHORS.rst
.
Once you have setup your branch as described in making a code contribution, above, you are ready for the four main steps of the developer installation:
- install a build environment
- build
- run tests
Note
Note that you if you need to install PyPop from source, but do not intend to contribute code, you can skip creating your own forking and making an additional branch, and clone the main upstream repository directly:
git clone https://github.com/alexlancaster/pypop.git
cd pypop
For most developers, we recommend using the miniconda approach described below.
To install the build environment, you should choose either conda
or
system packages. Once you have chosen and installed the build
environment, you should follow the instructions related to the option
you chose here in all subsequent steps.
Visit https://docs.conda.io/en/latest/miniconda.html to download the miniconda installer for your platform, and follow the instructions to install.
In principle, the rest of the PyPop miniconda installation process should work on any platform that is supported by miniconda, but only Linux and MacOS have been tested in standalone mode, at this time.
Once miniconda is installed, create a new conda environment, using the following commands:
conda create -n pypop3 gsl swig python=3
This will download and create a self-contained build-environment that uses of Python to the system-installed one, along with other requirements. You will need to use this this environment for the build, installation and running of PyPop. The conda environment name, above,
pypop3
, can be replaced with your own name.When installing on MacOS, before installing
conda
, you should first to ensure that the Apple Command Line Developer Tools (XCode) are installed, so you have the compiler (clang
, the drop-in replacement forgcc
),git
etc.conda
is unable to include the full development environment forclang
as a conda package for legal reasons.Activate the environment, and set environments variables needed for compilation:
conda activate pypop3 conda env config vars set CPATH=${CONDA_PREFIX}/include:${CPATH} conda env config vars set LIBRARY_PATH=${CONDA_PREFIX}/lib:${LIBRARY_PATH} conda env config vars set LD_LIBRARY_PATH=${CONDA_PREFIX}/lib:${LD_LIBRARY_PATH}
To ensure that the environment variables are saved, reactivate the environment:
conda activate pypop3
Skip ahead to Build PyPop.
Ensure Python 3 version of
pip
is installed:python3 -m ensurepip --user --no-default-pip
Note the use of the
python3
- you may find this to be necessary on systems which parallel-install both Python 2 and 3, which is typically the case. On newer systems you may find thatpython
andpip
are, by default, the Python 3 version of those tools.Install packages system-wide:
Fedora/Centos/RHEL
sudo dnf install git swig gsl-devel python3-devel
Ubuntu
sudo apt install git swig libgsl-dev python-setuptools
Install the developer command-line tools: https://developer.apple.com/downloads/ (includes
git
,gcc
). (Note that you may have to sign-in/create a developer account with Apple using your Apple ID to access this link.). You may also be able to install via the terminal and skip the above step by runningxcode-select –-install
(but first check to see if you already have a version installed, see https://mac.install.guide/commandlinetools/4.html for more details).Visit https://www.macports.org and follow the instructions there to install the latest version of MacPorts for your version of MacOS X.
Set environment variables to use macports version of Python and other packages, packages add the following to
~/.bash_profile
export PATH=/opt/local/bin:$PATH export LIBRARY_PATH=/opt/local/lib/:$LIBRARY_PATH export CPATH=/opt/local/include:$CPATH
Rerun your bash shell login in order to make these new exports active in your environment. At the command line type:
exec bash -login
Install dependencies via MacPorts and set Python version to use (FIXME: currently untested!)
sudo port install swig-python gsl py39-numpy py39-lxml py39-setuptools py39-pip py39-pytest sudo port select --set python python39 sudo port select --set pip pip39
Check that the MacPorts version of Python is active by typing:
which python
, if it is working correctly you should see/opt/local/bin/python
.
(Currently untested in standalone-mode)
You should choose either of the following two approaches. Don’t try to mix-and-match the two. The build-and-install approach is only recommended if don’t plan to make any modifications to the code locally.
Once you have setup your environment and cloned the repo, you can use
the following one-liner to examine the setup.py
and pull all the
required dependencies from pypi.org
and build and install the
package.
Note that if you use this method and install the package, it will be
available to run anywhere on your system, by running pypop
.
If you use this installation method, changes you make to the code, locally, or via subsequentgit pull
requests will not be available in the installed version until you repeat thepip install
command.
if you installed the conda development environment, use:
pip install .[test]
(the
[test]
keyword is included to make sure that any package requirements for the test suite are installed as well).if you installed a system-wide environment, the process is slightly different, because we install into the user’s
$HOME/.local
rather than the conda environment:pip install --user .[test]
PyPop is ready-to-use, you should run unit tests with pytest.
if you later decide you want to switch to using the developer approach, below, follow the cleaning up build before starting.
Installing in "developer" or "edit" mode
should be used by developers, or anyone who wants to make changes to
PyPop code. It is almost identical to the regular installation above
(e.g. it will pull down all required dependencies automatically), but
instead you will add the --editable
option (-e
is the short
version) to the pip install
command. In edit mode, any changes you
make in your local code will be reflected in the installed version.
conda
pip install --editable .[test]
system-wide
pip install --user --editable .[test]
The scripts
pypop
andpopmeta
will operate the same way, and any changes in the underlying Python.py
files will be picked up by the scripts.
To clean up, first uninstall PyPop (whether you installed in editable mode or not):
pip uninstall pypop-genomics
In addition, to clean-up any compiled files and force a recompilation
from scratch, run the clean
command:
./setup clean --all
Packages that are released to PyPI, are also available via the releases on the GitHub release page:
https://github.com/alexlancaster/pypop/releases
Warning
We recommend installing binary packages using the main PyPI repository, not via the GitHub release packages. However from time to time, we also sometimes make binary packages that are not necessarily also released via PyPI. In addition, if PyPI is unavailable, you may want to install directly from the GitHub release. These instructions will help you do that.
Installing these packages is similar to installing via PyPI, except that you need to explicitly provide a URL to the release page.
First, visit the release page, and choose the release version you wish to install (usually the most recent), and note the release tag (e.g.
v1.0.0
).Release version numbers
Note that version of the release is slightly different to the
git
tag. This is because thegit
tag follows Semantic Versioning, which Python internally normalizes and abbreviates. So the release with thegit
tagv1.0.0
is actually version1.0.0
of the |pkgname| package, and the version thatpip
"sees" (the difference is more notable with prereleases which might have agit
tag ofv1.0.0-rc2
but the PyPI version will be1.0.0rc2
).Next, use
pip
to install the package by running a command of the form (this will select and install the correct wheel for your Python version and operating system automatically):pip install pypop-genomics -f https://github.com/alexlancaster/pypop/releases/expanded_assets/<TAG_NAME>
where <TAG_NAME> is replaced with a specific tag, e.g. for the example given above, you would run:
pip install pypop-genomics -f https://github.com/alexlancaster/pypop/releases/expanded_assets/v1.0.0
You can also manually download the specific wheel from the github release webpage and install directly, e.g.:
pip install pypop_genomics-1.0.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl
Interested in maintaining the PyPop website and/or documentation, such as the PyPop User Guide? Here are ways to help.
All the documentation (including the website homepage) are maintained in
this directory (and subdirectories) as
reStructuredText
(.rst
) documents. reStructuredText is very similar to GitHub
markdown (.md
) and should be fairly self-explanatory to edit
(especially for pure text changes). From the .rst “source” files which
are maintained here on github, we use
sphinx to generate (aka
“compile”) the HTML for both the pypop.org user guide and and PDF (via
LaTeX) output. We have setup a GitHub action, so that as soon as a
documentation source file is changed, it will automatically recompile
all the documentation, update the gh-pages
branch (which is synced
to the GitHub pages) and update the files on the website.
Here’s an overview of the process:
.rst files -> sphinx -> HTML / PDF -> push to gh-pages branch -> publish on pypop.org
This means that any changes to the source will automatically update both website home page the documentation.
Once any changes are pushed to a branch (as described below), the GitHub action will automatically rebuild the website, and the results will be synced to a “staging” version of the website at:
Here’s an overview of the source files for the website/documentation
located in the website
subdirectory at the time of writing. Note
that some of the documentation and website files, use the
include::
directive to include some "top-level" files, located
outside website
like README.rst
and CONTRIBUTING.rst
:
index.rst
(this is the source for the homepage at http://pypop.org/)conf.py
(Sphinx configuration file - project name and other global settings are stored here)docs
(directory containing the source for the PyPop User Guide, which will eventually live at http://pypop.org/docs).index.rst
(source for the top-level of the PyPop User Guide)guide-chapter-install.rst
(pulls in parts of the top-levelREADME.rst
)guide-chapter-usage.rst
guide-chapter-instructions.rst
guide-chapter-contributing.rst
(pulls in top-levelCONTRIBUTING.rst
that contains the source of the text that you are reading right now)guide-chapter-changes.rst
(pulls in top-levelNEWS.md
andAUTHORS.rst
)licenses.rst
(pulls in top-levelLICENSE
)biblio.rst
pypop.bib
(BibTeX source file for bibliography)
html_root
(any files or directories commited in this directory will appear at the top-level of the website)psb-pypop.pdf
(e.g. this resides at http://pypop.org/psb-pypop.pdf)tissue-antigens-lancaster-2007.pdf
PyPopLinux-0.7.0.tar.gz
(old binaries - will be removed soon)PyPopWin32-0.7.0.zip
popdata
(directory - Suppl. data for Solberg et. al 2018 - http://pypop.org/popdata/)
reference
(directory containing the old DocBook-based documentation, preserved to allow for unconverted files to be converted later, this directory is ignored by the build process)
For small typo fixes, moderate copyedits at the paragraph level (e.g. adding or modifying paragraphs with little or no embedded markup), you can make changes directly on the github website.
- navigate to the
.rst
file you want to modify in the GitHub code directory, you’ll see a preview of how most of the.rst
will be rendered - hover over the edit button - you’ll see an “Edit the file in a fork in your project” (if you are already a project collaborator, you may also have the optional of creating a branch directly in the main repository).
- click it and it will open up a window where you can make your changes
- make your edits (it’s a good idea to look at the preview tab periodically as you make modifications)
- once you’ve finished with the modifications, click “Commit changes”
- put in an a commit message, and click “Propose changes”
- this will automatically create a new branch in your local fork, and you can immediately open up a pull-request by clicking “Create pull request”
- open up a pull-request and submit - new documentation will be automatically built and reviewed. if all is good, it will be merged by the maintainer and made live on the site.
For larger structural changes involving restructuring documentation or
other major changes across multiple .rst
files, it is highly
recommended that you should make all changes in your own local fork,
by cloning the repository on your computer and then building the
documentation locally. Here’s an overview of how to do that:
The commands in the "Sphinx build" section of the workflow .github/workflows/documentation.yaml which are used to run the GitHub Action that builds the documentation when it it deployed, is the best source for the most update-to-date commands to run, and should be consulted if the instructions in this document become out of date.
install sphinx and sphinx extensions
pip install setuptools_scm sphinx piccolo-theme sphinx_rtd_theme myst_parser rst2pdf sphinx_togglebutton sphinx-argparse sphinx_copybutton sphinxcontrib-bibtex
make a fork of pypop if you haven't already (see previous section)
clone the fork and add your fork as an upstream repository on your local computer, and make a new branch. Note that you do not have to build the PyPop software first in order to build the documentation, you can build them separately.
make your changes to your
.rst
files and/orconf.py
build the HTML documentation:
sphinx-build website _build
view the local documention: you can open up browser and navigate to the
index.html
in the top-level of the newly-created_build
directoryuse
git commit
to commit your changes to your local fork.open up a pull-request against the upstream repository
Building the PDF for the PyPop User Guide is a bit more involved, as you will need to have various TeX packages installed.
install the LaTeX packages (these are packages needed for Ubuntu, they may be different on your distribution):
sudo apt-get install -y latexmk texlive-latex-recommended texlive-latex-extra texlive-fonts-recommended texlive-fonts-extra texlive-luatex texlive-xetex
build the LaTeX and then compile the PDF:
sphinx-build -b latex website _latexbuild make -C _latexbuild
the user guide will be generated in
_latexbuild/pypop-guide.pdf
Note
These guidelines were heavily adapted from similar guidelines
in the PyGMT
project.
We define contributions in a broad way: including both writing code as well as documentation, and reviewing issues and PRs etc. Here are some ways we credit contributors:
Anyone who has contributed a pull request to the project is welcome to
add themselves (or request to be added) to AUTHORS.rst
, which is
part of the repository and included with with distributions.
Every time we make a release, everyone who has made a commit to the
repository since the previous release will be mentioned in either the
NEWS.md
or in the GitHub Release Notes.
Anyone who has contributed to the repository (i.e., appears on git log
) will be invited to be an author on the Zenodo archive of new releases.
To be included as an author, you must add the following to the AUTHORS.rst
file of the repository:
- Full name (and optional link to your website or GitHub page)
- ORCID (optional)
- Affiliation (optional)
The order of authors is generally defined by the number of commits to
the repository (git shortlog -sne
). The order can also be changed
on a case-by-case basis, such as contributions to PyPop project that
due not relate to commit numbers, such as writing grants/proposals,
and other programming efforts (including reviewing PRs).
If you have contributed and do not wish to be included in Zenodo
archives, either don't add yourself to AUTHORS.rst
, or open an issue
or file a PR that:
- Removes yourself from
AUTHORS.rst
, or; - Indicates next to your name on
AUTHORS.rst
that you do not wish to be included with something like(not included in Zenodo)
.
Note that authors included in the Zenodo archive will also have their
name listed in the CITATION.cff
file. This is a machine (and
human) readable file that enables citation of PyPop
easily.
From time to time we may write academic papers for PyPop, e.g., for major changes or significant new components of the package.
To be included as an author on the paper, you must have
- either made multiple and regular contributions to the PyPop repository; or, have made other non-coding contributions (or both);
- have participated in the writing and reviewing of the paper.
- added your full name, affiliation, and (optionally) ORCID to the paper.
- written and/or read and review the manuscript in a timely manner and provide comments on the paper