Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
  • Loading branch information
s-raza+S20-Win authored and s-raza+S20-Win committed May 18, 2022
2 parents 60560b9 + 3573f86 commit 3e1a3bf
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 5 deletions.
14 changes: 13 additions & 1 deletion CHANGES.rst
Original file line number Diff line number Diff line change
@@ -1,9 +1,21 @@
**2022-05-18**

*Version 1.1.2*

- Fix missing entry in changelog for v1.1.1

**2022-05-18**

*Version 1.1.1*

- Fix broken link in documentation

**2022-05-18**

*Version 1.1.0*

- Read CSV files from a FTP location.
`read more <https://csvio.readthedocs.io/en/latest/remote_rw/ftp/csvio.ftp_reader.rst>`_.
`read more <https://csvio.readthedocs.io/en/latest/remote_rw/ftp/csvio.ftp_reader.html>`_.
- Test FTP reader using Docker fixtures, using a live FTP server.
- Refactor documentation.

Expand Down
2 changes: 1 addition & 1 deletion csvio/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
__version__ = "1.1.0"
__version__ = "1.1.2"
from .csvreader import CSVReader
from .csvwriter import CSVWriter
2 changes: 1 addition & 1 deletion docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
author = "Salman Raza"

# The full version, including alpha/beta/rc tags
release = "1.1.0"
release = "1.1.2"


# -- General configuration ---------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "csvio"
version = "1.1.0"
version = "1.1.2"
description = "CSV Wrapper for conveniently processing csv files"
authors = ["Salman Raza <raza.salman@gmail.com>"]
license = "MIT"
Expand Down
2 changes: 1 addition & 1 deletion tests/test_csvio.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@


def test_version():
assert __version__ == "1.1.0"
assert __version__ == "1.1.2"

0 comments on commit 3e1a3bf

Please sign in to comment.