Skip to content

Commit 05ec79e

Browse files
committed
update for pypi description
1 parent 1be6a76 commit 05ec79e

File tree

7 files changed

+44
-24
lines changed

7 files changed

+44
-24
lines changed

CHANGELOG.md

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
11
# Change Log
22
All notable changes to this project will be documented in this file.
33

4-
The format is based on [Keep a Changelog](http://keepachangelog.com/)
4+
The format is based on [Keep a Changelog](http://keepachangelog.com/)
55
and this project adheres to [Semantic Versioning](http://semver.org/).
66

7+
## 2.5.1 - 2022-03-04
8+
9+
### Changed
10+
- updated pypi documentation
11+
712
## 2.5.0 - 2022-03-04
813

914
### Fixed
@@ -49,13 +54,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
4954
## 2.3.2 - 2020-09-24
5055

5156
### Fixed
52-
- When rabbitmq restarts the extractor would not stop and restart, resulting
57+
- When rabbitmq restarts the extractor would not stop and restart, resulting
5358
in the extractor no longer receiving any messages. #17
5459

5560
### Added
5661
- Can specify url to use for extractor downloads, this is helpful for instances
5762
that have access to the internal URL for clowder, for example in docker/kubernetes.
58-
63+
5964
### Removed
6065
- Removed ability to run multiple connectors in the same python process. If
6166
parallelism is needed, use multiple processes (or containers).
@@ -141,7 +146,7 @@ install pyclowder.
141146

142147
### Fixed
143148
- Error decoding json body from Clowder when filename had special characters
144-
[CATSPYC-18] (https://opensource.ncsa.illinois.edu/jira/browse/CATSPYC-18)
149+
[CATSPYC-18] (https://opensource.ncsa.illinois.edu/jira/browse/CATSPYC-18)
145150
- RABBITMQ_QUEUE variable/flag was ignored when set and would connect
146151
to default queue.
147152

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ create new extractors.
1515
Install using pip (for most recent versions see: https://pypi.org/project/pyclowder/):
1616

1717
```
18-
pip install pyclowder==2.5.0
18+
pip install pyclowder==2.5.1
1919
```
2020

2121
Install pyClowder on your system by cloning this repo:

description.rst

Lines changed: 29 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,39 @@
1-
This package provides standard functions for interacting with the
2-
Clowder open source data management system. Clowder is designed
3-
to allow researchers to build customized catalogs in the clouds
4-
to help you manage research data.
1+
This package provides standard functions for interacting with the Clowder
2+
open source data management system. Clowder is designed to allow researchers
3+
to build customized catalogs in the clouds to help you manage research data.
4+
5+
One of the most interesting aspects of Clowder is the ability to extract
6+
metadata from any file. This ability is created using extractors. To make it
7+
easy to create these extractors in python we have created a module called
8+
clowder. Besides wrapping often used api calls in convenient python calls, we
9+
have also added some code to make it easy to create new extractors.
510

611
Installation
712
------------
813

9-
The easiest way install pyclowder is using pip and pulling from PyPI.
10-
Use the following command to install::
14+
Install using pip (for most recent versions see: https://pypi.org/project/pyclowder/):
15+
16+
```
17+
pip install pyclowder==2.5.1
18+
```
1119

12-
pip install pyclowder
20+
Install pyClowder on your system by cloning this repo:
1321

14-
Because this system is still under rapid development, you may want to
15-
install by cloning the repo using the following commands::
22+
```
23+
git clone https://github.com/clowder-framework/pyclowder.git
24+
cd pyclowder
25+
pip install -r requirements.txt
26+
python setup.py install
27+
```
1628

17-
git clone https://opensource.ncsa.illinois.edu/bitbucket/scm/cats/pyclowder.git
18-
cd pyclowder
19-
pip install -r requirements.txt
20-
python setup.py install
29+
or directly from GitHub:
2130

22-
Or you can install directly from NCSA's Bitbucket::
31+
```
32+
pip install -r https://raw.githubusercontent.com/clowder-framework/pyclowder/master/requirements.txt git+https://github.com/clowder-framework/pyclowder.git
33+
```
2334

24-
pip install -r https://opensource.ncsa.illinois.edu/bitbucket/projects/CATS/repos/pyclowder/raw/requirements.txt git+https://opensource.ncsa.illinois.edu/bitbucket/scm/cats/pyclowder.git
35+
Quickstart example
36+
------------------
2537

38+
See the [README](https://github.com/clowder-framework/pyclowder/tree/master/sample-extractors/wordcount#readme)
39+
in `sample-extractors/wordcount`. Using Docker, no install is required.

docs/source/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
# The short X.Y version.
6060
version = u'2.5'
6161
# The full version, including alpha/beta/rc tags.
62-
release = u'2.5.0'
62+
release = u'2.5.1'
6363

6464
# The language for content autogenerated by Sphinx. Refer to documentation
6565
# for a list of supported languages.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
pyclowder==2.5.0
1+
pyclowder==2.5.1

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
setup(
1010
name='pyclowder',
11-
version='2.5.0',
11+
version='2.5.1',
1212
description='Python SDK for the Clowder Data Management System',
1313
long_description=long_description,
1414

version.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
#!/bin/bash
22

3-
VERSION=${1:-2.5.0}
3+
VERSION=${1:-2.5.1}
44

55
MAJOR=${VERSION%.*}
66

77
sed -i~ "s/## unreleased.*/## ${VERSION} - $(date +'%Y-%m-%d')/i" CHANGELOG.md
88
sed -i~ "s/pyclowder==.*/pyclowder==${VERSION}/" README.md
9+
sed -i~ "s/pyclowder==.*/pyclowder==${VERSION}/" description.rst
910
sed -i~ "s/pyclowder==.*/pyclowder==${VERSION}/" sample-extractors/wordcount/requirements.txt
1011
sed -i~ -e "s/release = u'.*'/release = u'${VERSION}'/" -e "s/version = u'.*'/version = u'${MAJOR}'/" docs/source/conf.py
1112
sed -i~ "s/version='.*'/version='${VERSION}'/" setup.py

0 commit comments

Comments
 (0)