Skip to content

Commit

Permalink
Push v 1.0.1 to pip
Browse files Browse the repository at this point in the history
  • Loading branch information
Kayla Iacovino committed Jun 14, 2021
1 parent 6846669 commit 41e7beb
Show file tree
Hide file tree
Showing 10 changed files with 15 additions and 16 deletions.
2 changes: 1 addition & 1 deletion VESIcal.egg-info/PKG-INFO
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: VESIcal
Version: 1.0.0
Version: 1.0.1
Summary: A generalized python library for calculating and plotting various things related to mixed volatile (H2O-CO2) solubility in silicate melts.
Home-page: https://github.com/kaylai/VESIcal
Author: Kayla Iacovino, Simon Matthews, Penny Wieser
Expand Down
2 changes: 1 addition & 1 deletion VESIcal/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
related to mixed volatile (H2O-CO2) solubility in silicate melts.
"""

__version__ = "1.0.0"
__version__ = "1.0.1"
__author__ = 'Kayla Iacovino, Simon Matthews, and Penny Wieser'

# ----------------- IMPORTS ----------------- #
Expand Down
Binary file renamed VESIcal_v1_0_0.zip → VESIcal_v101.zip
Binary file not shown.
2 changes: 1 addition & 1 deletion build/lib/VESIcal/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
related to mixed volatile (H2O-CO2) solubility in silicate melts.
"""

__version__ = "1.0.0"
__version__ = "1.0.1"
__author__ = 'Kayla Iacovino, Simon Matthews, and Penny Wieser'

# ----------------- IMPORTS ----------------- #
Expand Down
22 changes: 11 additions & 11 deletions build/lib/VESIcal/tasplot/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
# Filename: tasplot.py

############################################################################
#
# COPYRIGHT: (C) 2015 John A Stevenson / @volcan01010
Expand All @@ -27,25 +27,25 @@
class MissingModuleException(Exception):
pass


# Plot LeMaitre lines
def add_LeMaitre_fields(plot_axes, fontsize=8, color=(0.6, 0.6, 0.6)):
"""Add fields for geochemical classifications from LeMaitre et al (2002)
to pre-existing axes. If necessary, the axes object can be retrieved via
plt.gca() command. e.g.
ax1 = plt.gca()
add_LeMaitre_fields(ax1)
ax1.plot(silica, total_alkalis, 'o')
Fontsize and color options can be used to change from the defaults.
It may be necessary to follow the command with plt.draw() to update
the plot.
Le Maitre RW (2002) Igneous rocks : IUGS classification and glossary of
terms : recommendations of the International Union of Geological
Sciences Subcommission on the Systematics of igneous rocks, 2nd ed.
terms : recommendations of the International Union of Geological
Sciences Subcommission on the Systematics of igneous rocks, 2nd ed.
Cambridge University Press, Cambridge
"""

Expand All @@ -55,11 +55,11 @@ def add_LeMaitre_fields(plot_axes, fontsize=8, color=(0.6, 0.6, 0.6)):
raise MissingModuleException("""Matplotlib not imported.
Matplotlib is installed as part of many scientific packages and is
required to create plots.""")

# Check that plot_axis can plot
if 'plot' not in dir(plot_axes):
raise TypeError('plot_axes is not a matplotlib axes instance.')

# Prepare the field information
from collections import namedtuple
FieldLine = namedtuple('FieldLine', 'x1 y1 x2 y2')
Expand Down Expand Up @@ -108,4 +108,4 @@ def add_LeMaitre_fields(plot_axes, fontsize=8, color=(0.6, 0.6, 0.6)):
for name in names:
plot_axes.text(name.x, name.y, name.name, color=color, size=fontsize,
horizontalalignment='center', verticalalignment='top',
rotation=name.rotation, zorder=0)
rotation=name.rotation, zorder=0)
1 change: 0 additions & 1 deletion build/lib/VESIcal/vplot.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import numpy as np
import warnings as w
import matplotlib as mpl
mpl.use('TKAgg') # noqa E402
import matplotlib.pyplot as plt


Expand Down
Binary file removed dist/VESIcal-1.0.0.tar.gz
Binary file not shown.
Binary file not shown.
Binary file added dist/VESIcal-1.0.1.tar.gz
Binary file not shown.
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

setuptools.setup(
name="VESIcal",
version="1.0.0",
version="1.0.1",
author="Kayla Iacovino, Simon Matthews, Penny Wieser",
author_email="[email protected]",
description=("A generalized python library for calculating and plotting various things "
Expand Down

0 comments on commit 41e7beb

Please sign in to comment.