Skip to content

Commit

Permalink
Follow the Pycopy MicroPython fork, standard library wise
Browse files Browse the repository at this point in the history
  • Loading branch information
amotl committed Jul 15, 2019
1 parent 7c84aa6 commit d546cab
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 13 deletions.
1 change: 1 addition & 0 deletions CHANGES.rst
Expand Up @@ -35,6 +35,7 @@ Development
- Lazily import "ButtonManager" for trimming #11
- Improve MAC address parsing and formatting
- Improve MAC address normalization by also removing dashes and dots
- Follow the Pycopy MicroPython fork, standard library wise


2019-06-22 0.5.1
Expand Down
10 changes: 5 additions & 5 deletions Makefile
Expand Up @@ -14,25 +14,25 @@ download-requirements:
$(eval fetch := wget --quiet --no-clobber --directory-prefix)

# Install "upip", the PyPI package manager for MicroPython.
$(pip3) install micropython-cpython-upip
$(pip3) install pycopy-cpython-upip

# Install all required packages listed in file "requirements-mpy.txt".
$(python3) -m upip install -p $(target_dir) -r requirements-mpy.txt

# Install "micropython-urllib.parse" without "micropython-re-pcre"
# to avoid collision with libraries shipped as Pycom builtins.
mkdir -p $(target_dir)/urllib
$(fetch) $(target_dir)/urllib https://raw.githubusercontent.com/pfalcon/micropython-lib/5f619c88/urllib.parse/urllib/parse.py
$(fetch) $(target_dir)/urllib https://raw.githubusercontent.com/pfalcon/pycopy-lib/52d356b5/urllib.parse/urllib/parse.py
touch $(target_dir)/urllib/__init__.py

# Install "micropython-base64" without 'micropython-binascii', 'micropython-re-pcre', 'micropython-struct'
$(fetch) $(target_dir) https://raw.githubusercontent.com/pfalcon/micropython-lib/5f619c88/base64/base64.py
$(fetch) $(target_dir) https://raw.githubusercontent.com/pfalcon/pycopy-lib/52d356b5/base64/base64.py

# Install "micropython-logging" without "micropython-os"
# to avoid collision with libraries shipped as Pycom builtins.
mkdir -p $(target_dir)/logging
$(fetch) $(target_dir)/logging https://raw.githubusercontent.com/pfalcon/micropython-lib/5f619c88/logging/logging/__init__.py
$(fetch) $(target_dir)/logging https://raw.githubusercontent.com/pfalcon/micropython-lib/5f619c88/logging/logging/handlers.py
$(fetch) $(target_dir)/logging https://raw.githubusercontent.com/pfalcon/pycopy-lib/52d356b5/logging/logging/__init__.py
$(fetch) $(target_dir)/logging https://raw.githubusercontent.com/pfalcon/pycopy-lib/52d356b5/logging/logging/handlers.py

# Install Pycom "mqtt.py"
$(fetch) $(target_dir) https://raw.githubusercontent.com/pycom/pycom-libraries/6544105e/lib/mqtt/mqtt.py
Expand Down
16 changes: 8 additions & 8 deletions requirements-mpy.txt
@@ -1,9 +1,9 @@
micropython-copy
micropython-types
micropython-collections
micropython-collections.defaultdict
micropython-urequests
pycopy-copy
pycopy-types
pycopy-collections
pycopy-collections.defaultdict
pycopy-urequests
# Apply cherrypick-style installation for some packages to ignore dependencies
#micropython-urllib.parse
#micropython-base64
#micropython-logging
#pycopy-urllib.parse
#pycopy-base64
#pycopy-logging

0 comments on commit d546cab

Please sign in to comment.