Skip to content

Commit

Permalink
Meta.yaml update for Conda
Browse files Browse the repository at this point in the history
+version bump: Pypi botched because type annotations aren't actually ignored on Windows 🙄
  • Loading branch information
charwick committed Jan 14, 2023
1 parent 789baf9 commit 12197d9
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 23 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ If you use Helipad in your own research, please cite as follows:
## Version History

* 1.5: Polar grid spatial models, miscellaneous spatial improvements
* [1.5](https://helipad.dev/2023/01/helipad-1-5/): Polar grid spatial models, various spatial improvements
* [1.4](https://helipad.dev/2022/07/helipad-1-4/): More consistent container API, localization, miscellaneous interface improvements
* [1.3](https://helipad.dev/2021/06/helipad-1-3/): Allow mixing time series and other plots, display networks on spatial maps, goods API improvements
* [1.2](https://helipad.dev/2021/02/helipad-1-2/): Extensible visualization API, events, performance profiling, Jupyterlab support
Expand Down
2 changes: 1 addition & 1 deletion helipad/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
from helipad.agent import Agent, baseAgent
from helipad import utility

__version__ = "1.5"
__version__ = "1.5.1"
8 changes: 4 additions & 4 deletions helipad/model.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class Helipad:
runInit = True #for multiple inheritance. Has to be a static property

def __init__(self, locale='en'):
#Have to do this first so that i18n() is available early.
#Have to do this first so that i18n is available early.
#Put it in an obscure variable and then use helpers.ï() so we don't conflict with the REPL console.
if not hasattr(self, 'breed'):
import builtins
Expand Down Expand Up @@ -615,10 +615,10 @@ def launchVisual(self):
#If we're running in cpanel-less mode, hook through a Tcl loop so it doesn't exit on pause
if not self.cpanel and not self.visual.isNull and not isNotebook():
from tkinter import Tcl
self.root = Tcl()
self.root.after(1, self.start)
root = Tcl()
root.after(1, self.start)
self.debugConsole()
self.root.mainloop()
root.mainloop()
else: self.start() #As long as we haven't already started

# Generates function decorators for hooks, reporters, etc.
Expand Down
32 changes: 16 additions & 16 deletions meta.yaml
Original file line number Diff line number Diff line change
@@ -1,42 +1,42 @@
{% set name = "helipad" %}
{% set version = "1.5" %}
{% set version = "1.5.1" %}

package:
name: "{{ name|lower }}"
version: "{{ version }}"
name: {{ name|lower }}
version: {{ version }}

source:
url: "https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz"
sha256: 449801c3c6ddd84f58a0ae653a9489e62e984384f1b4ec454bf5bef4452f26fb
url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/helipad-{{ version }}.tar.gz
sha256: 8ca9db33f7227e5e27d479cdca789825e0710ca15c2460e4662a9f11d44103ee

build:
noarch: python
script: {{ PYTHON }} -m pip install . -vv
number: 0
script: "{{ PYTHON }} -m pip install . -vv"

requirements:
host:
- matplotlib
- pandas
- networkx
- pip
- python >=3.7
- pip
run:
- matplotlib
- python >=3.7
- matplotlib-base
- pandas
- networkx
- python >=3.7

test:
imports:
- helipad
commands:
- pip check
requires:
- pip

about:
home: "https://helipad.dev"
home: https://helipad.dev
summary: An agent-based modeling framework for Python with a shallow learning curve and powerful visualization capabilities.
license: MIT
license_family: MIT
license_file:
summary: "An agent-based modeling framework for Python with a shallow learning curve and powerful visualization capabilities."
license_file: LICENSE
dev_url: https://github.com/charwick/helipad/
doc_url: https://helipad.dev/functions/

Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

[project]
name = "helipad"
version = "1.5"
version = "1.5.1"
authors = [
{ name="C Harwick", email="[email protected]" },
]
Expand Down

0 comments on commit 12197d9

Please sign in to comment.