Skip to content

Commit 04f0dbd

Browse files
authored
Cleanup (#59)
1 parent a246566 commit 04f0dbd

File tree

5 files changed

+25
-111
lines changed

5 files changed

+25
-111
lines changed

.github/workflows/tests_comps.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Run tests
1+
name: Run COMPS tests
22

33
on:
44
pull_request:

.github/workflows/tests_unit_container.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Run tests
1+
name: Run local tests
22

33
on:
44
pull_request:

README.md

Lines changed: 17 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -1,106 +1,37 @@
1-
![Staging: emodpy](https://github.com/InstituteforDiseaseModeling/emodpy-idmtools/workflows/Staging:%20emodpy/badge.svg)
2-
3-
41
# emodpy
52

6-
Documentation available at https://emod-hub.github.io/emodpy/
7-
8-
<!-- START doctoc generated TOC please keep comment here to allow auto update -->
9-
<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
10-
**Table of Contents**
11-
12-
- [User Installation](#user-installation)
13-
- [Pre-requisites](#pre-requisites)
14-
- [Development Environment Setup](#development-environment-setup)
15-
- [First Time Setup](#first-time-setup)
16-
- [Development Tips](#development-tips)
17-
- [To run examples or tests](#to-run-examples-or-tests)
18-
- [Building docs](#building-docs)
19-
- [Community](#community)
20-
- [Disclaimer](#disclaimer)
21-
22-
<!-- END doctoc generated TOC please keep comment here to allow auto update -->
23-
24-
25-
# User Installation
26-
27-
```bash
28-
pip install emodpy --extra-index-url=https://packages.idmod.org/api/pypi/pypi-production/simple
29-
```
30-
31-
## Pre-requisites
32-
- Python 3.9 x64
33-
34-
35-
# Development Environment Setup
36-
37-
When setting up your environment for the first time, you can use the following instructions
38-
39-
## First Time Setup
40-
1) Clone the repository:
41-
```bash
42-
> git clone https://github.com/EMOD-Hub/emodpy.git
43-
```
44-
2) Create a virtualenv. On Windows, please use venv to create the environment
45-
`python -m venv idmtools`
46-
On Unix(Mac/Linux) you can use venv or virtualenv
47-
3) Activate the virtualenv
48-
4) If you are on windows, run `pip install py-make --upgrade --force-reinstall`
49-
5) Then run `python ./.dev_scripts/bootstrap.py`. This will install all the tools.
50-
51-
## Development Tips
52-
53-
There is a Makefile file available for most common development tasks. Here is a list of commands
54-
```bash
55-
clean - Clean up temproary files
56-
lint - Lint package and tests
57-
test - Run All tests
58-
coverage - Run tests and generate coverage report that is shown in browser
59-
```
60-
On Windows, you can use `pymake` instead of `make`
61-
62-
## To run examples or tests
3+
[![Build docs and deploy to GH Pages](https://github.com/EMOD-Hub/emodpy/actions/workflows/mkdocs_deploy.yml/badge.svg)](https://github.com/EMOD-Hub/emodpy/actions/workflows/mkdocs_deploy.yml)
4+
[![Lint](https://github.com/EMOD-Hub/emodpy/actions/workflows/lint.yml/badge.svg)](https://github.com/EMOD-Hub/emodpy/actions/workflows/lint.yml)
5+
[![Test and update version](https://github.com/EMOD-Hub/emodpy/actions/workflows/test_and_bump_version.yml/badge.svg)](https://github.com/EMOD-Hub/emodpy/actions/workflows/test_and_bump_version.yml)
636

64-
First, install idmtools packages including emodpy package from idm artifactory
7+
## Python Version
658

66-
staging artifactory with nightly build packages:
67-
```bash
68-
pip install idmtools[idm] --index-url=https://email:password@packages.idmod.org/api/pypi/pypi-staging/simple
69-
OR
70-
pip install idmtools[full] --index-url=https://email:password@packages.idmod.org/api/pypi/pypi-staging/simple
71-
```
72-
[idm] option will install all idmtools packages except idmtools_platform_local package
9+
Python 3.13 is the recommended and supported version.
7310

74-
[full] option will install all idmtools packages including idmtools_platform_local package
11+
## Documentation
7512

76-
email:password is your company login credentials. password should be encoded for specially characters
13+
Documentation available at https://emod-hub.github.io/emodpy/.
7714

78-
production artifactory with latest release packages:
79-
```bash
80-
pip install idmtools[idm] --extra-index-url=https://packages.idmod.org/api/pypi/pypi-production/simple
81-
OR
82-
pip install idmtools[full] --extra-index-url=https://packages.idmod.org/api/pypi/pypi-production/simple
83-
```
84-
To run integration tests or examples, you also need to install idmtools-test package
85-
```bash
86-
pip install idmtools-test --extra-index-url=https://email:password@packages.idmod.org/api/pypi/pypi-staging/simple
87-
OR
88-
pip install idmtools-test --extra-index-url=https://packages.idmod.org/api/pypi/pypi-production/simple
89-
```
15+
To build the documentation locally, do the following:
9016

91-
## Building docs
17+
1. Create and activate a venv.
18+
2. Navigate to the root directory of the repo.
19+
```
20+
python -m pip install .[docs]
21+
```
9222
93-
Install all necessary documentation tools using ``pip install .[docs] --extra-index-url=https://packages.idmod.org/api/pypi/pypi-production/simple`` and run the command ``mkdocs build``. After changing docstrings, reinstall emodpy to pick up the latest changes in the documentation build.
23+
## Running tests
9424
25+
Please see the documentation for [testing](/tests/README.md).
9526
96-
# Community
27+
## Community
9728
The EMOD Community is made up of researchers and software developers, primarily focused on malaria and HIV research.
9829
We value mutual respect, openness, and a collaborative spirit. If these values resonate with you, we invite you to join our EMOD Slack Community by completing this form:
9930
10031
https://forms.office.com/r/sjncGvBjvZ
10132
10233
103-
# Disclaimer
34+
## Disclaimer
10435
10536
The code in this repository was developed by IDM and other collaborators to support our joint research on flexible agent-based modeling.
10637
We've made it publicly available under the MIT License to provide others with a better understanding of our research and an opportunity to build upon it for their own work. We make no representations that the code works as intended or that we will provide support, address issues that are found, or accept pull requests.

pyproject.toml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,6 @@ docs = [
4444
lint = [
4545
"flake8",
4646
]
47-
packaging = [
48-
"build",
49-
"twine",
50-
"bump2version",
51-
]
5247
test = [
5348
"emod-common",
5449
"emod-generic",

tests/README.md

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,11 @@
1-
<!-- START doctoc generated TOC please keep comment here to allow auto update -->
2-
<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
3-
**Table of Contents**
1+
## Installation
42

5-
- [run emodpy tests locally](#run-emodpy-tests-locally)
3+
To run the tests, you need to install extra dependencies. Please use the following command in the root directory:
64

7-
<!-- END doctoc generated TOC please keep comment here to allow auto update -->
5+
`$ python -m pip install -e .[test]`
86

9-
# run emodpy tests locally
7+
## Running the Tests
108

11-
How to run these tests locally after you have emodpy installed in a virtual environment.
9+
Run the tests using the following command from the root directory of the project:
1210

13-
1. Active your virtual environment
14-
15-
2. Install testing requirements
16-
```bash
17-
pip install -r tests/requirements.txt --extra-index-url=https://packages.idmod.org/api/pypi/pypi-production/simple
18-
```
19-
20-
3. run emod tests
21-
```bash
22-
pytest -v -m emod
23-
```
11+
`$ python -m pytest -v tests/`

0 commit comments

Comments
 (0)